# HG changeset patch
# User Vince Kraemer <vkraemer@netbeans.org>
# Date 1208801877 25200
# Node ID cc6e06782fe0f561e57cca3a58555570e3bcc2dc
# Parent  9182f5c33fcfb722de27719593c20c2c66a0a9ee
allow user to debug both sides of an app-client calls ejb situation...

diff -r 9182f5c33fcf -r cc6e06782fe0 j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java
--- a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java	Mon Apr 21 08:52:44 2008 -0700
+++ b/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java	Mon Apr 21 11:17:57 2008 -0700
@@ -112,16 +112,20 @@ public class Deploy extends Task impleme
                     String h = sdi.getHost();
                     String transport = sdi.getTransport();
                     String address = "";   //NOI18N
+                    String addressClient = ""; // NOI18N
 
                     if (transport.equals(ServerDebugInfo.TRANSPORT_SHMEM)) {
                         address = sdi.getShmemName();
+                        addressClient = address+"Client"; // NOI18N
                     } else {
                         address = Integer.toString(sdi.getPort());
+                        address = Integer.toString(sdi.getPort()+1);
                     }
 
                     getProject().setProperty("jpda.transport", transport);
                     getProject().setProperty("jpda.host", h);
                     getProject().setProperty("jpda.address", address);
+                    getProject().setProperty("jpda.address.client", address);
                 }
             } catch (Exception ex) {
                 throw new BuildException(ex);
diff -r 9182f5c33fcf -r cc6e06782fe0 j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientActionProvider.java
--- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientActionProvider.java	Mon Apr 21 08:52:44 2008 -0700
+++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientActionProvider.java	Mon Apr 21 11:17:57 2008 -0700
@@ -353,16 +353,16 @@ class AppClientActionProvider implements
             }
             
             //see issue 83056
-            if (command.equals(COMMAND_DEBUG)) {
-                NotifyDescriptor nd = new NotifyDescriptor.Message(NbBundle.getMessage(AppClientActionProvider.class, "MSG_Server_State_Question"), NotifyDescriptor.QUESTION_MESSAGE);
-                nd.setOptionType(NotifyDescriptor.YES_NO_OPTION);
-                nd.setOptions(new Object[] {NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
-                if (DialogDisplayer.getDefault().notify(nd) == NotifyDescriptor.YES_OPTION) {
-                    nd = new NotifyDescriptor.Message(NbBundle.getMessage(AppClientActionProvider.class, "MSG_Server_State"), NotifyDescriptor.INFORMATION_MESSAGE);
-                    Object o = DialogDisplayer.getDefault().notify(nd);
-                    return null;
-                }
-            }
+//            if (command.equals(COMMAND_DEBUG)) {
+//                NotifyDescriptor nd = new NotifyDescriptor.Message(NbBundle.getMessage(AppClientActionProvider.class, "MSG_Server_State_Question"), NotifyDescriptor.QUESTION_MESSAGE);
+//                nd.setOptionType(NotifyDescriptor.YES_NO_OPTION);
+//                nd.setOptions(new Object[] {NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
+//                if (DialogDisplayer.getDefault().notify(nd) == NotifyDescriptor.YES_OPTION) {
+//                    nd = new NotifyDescriptor.Message(NbBundle.getMessage(AppClientActionProvider.class, "MSG_Server_State"), NotifyDescriptor.INFORMATION_MESSAGE);
+//                    Object o = DialogDisplayer.getDefault().notify(nd);
+//                    return null;
+//                }
+//            }
             
             // check project's main class
             String mainClass = ep.get("main.class"); // NOI18N
diff -r 9182f5c33fcf -r cc6e06782fe0 j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
--- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl	Mon Apr 21 08:52:44 2008 -0700
+++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl	Mon Apr 21 11:17:57 2008 -0700
@@ -461,7 +461,7 @@ or ant -Dj2ee.platform.classpath=&lt;ser
                     </attribute>
                     <sequential>
                         <!--<nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{{name}}">-->
-                        <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{{name}}" stopclassname="@{{stopclassname}}">
+                        <nbjpdastart transport="dt_socket" addressproperty="jpda.address.client" name="@{{name}}" stopclassname="@{{stopclassname}}">
                             <classpath>
                                 <path path="@{{classpath}}"/>
                             </classpath>
@@ -552,7 +552,7 @@ or ant -Dj2ee.platform.classpath=&lt;ser
                                 </bootclasspath>
                             </xsl:if>
                             <jvmarg line="${{debug-args-line}}"/>
-                            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${{jpda.address}}"/>
+                            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${{jpda.address.client}}"/>
                             <jvmarg line="${{run.jvmargs.param}}"/>
                             <classpath>
                                 <path path="@{{classpath}}"/>
@@ -599,7 +599,7 @@ or ant -Dj2ee.platform.classpath=&lt;ser
                                 </xsl:if>
                                 <jvmarg line="${{j2ee.appclient.tool.jvmoptions}}"/>
                                 <jvmarg line="${{debug-args-line}}"/>
-                                <jvmarg value="-Xrunjdwp:transport=${{jpda.transport}},server=y,address=${{jpda.address}},suspend=y"/>
+                                <jvmarg value="-Xrunjdwp:transport=${{jpda.transport}},server=y,address=${{jpda.address.client}},suspend=y"/>
                                 <jvmarg line="${{run.jvmargs.param}}"/>
                                 <arg line="@{{args}}"/>
                                 <classpath>
@@ -612,7 +612,7 @@ or ant -Dj2ee.platform.classpath=&lt;ser
                                 </syspropertyset>
                                 <customize/>
                             </java>
-                            <nbjpdaconnect name="${{name}}" host="${{jpda.host}}" address="${{jpda.address}}" transport="${{jpda.transport}}">
+                            <nbjpdaconnect name="${{name}}" host="${{jpda.host}}" address="${{jpda.address.client}}" transport="${{jpda.transport}}">
                                 <classpath>
                                     <path path="${{javac.classpath}}:${{j2ee.platform.classpath}}:${{j2ee.appclient.tool.runtime}}"/>
                                     <path path="@{{classpath}}"/>
@@ -1145,10 +1145,19 @@ or ant -Dj2ee.platform.classpath=&lt;ser
                 <nbjpdaappreloaded />
             </target>
             
+            <target name="run-deploy-debug">
+                <xsl:attribute name="depends">init,compile,dist,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb-debug,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy</xsl:attribute>
+                <nbjpdaappreloaded />
+            </target>
+
             <target name="-run-deploy-nb" if="netbeans.home">
                 <nbdeploy debugmode="false" clientUrlPart="${{client.urlPart}}" forceRedeploy="${{forceRedeploy}}"/>
             </target>
             
+            <target name="-run-deploy-nb-debug" if="netbeans.home">
+                <nbdeploy debugmode="true" clientUrlPart="${{client.urlPart}}" forceRedeploy="${{forceRedeploy}}"/>
+            </target>
+
             <target name="-init-deploy-ant" unless="netbeans.home">
                 <property name="deploy.ant.archive" value="${{dist.jar}}"/>
                 <property name="deploy.ant.resource.dir" value="${{resource.dir}}"/>
@@ -1284,7 +1293,7 @@ or ant -Dj2ee.platform.classpath=&lt;ser
             
             <target name="debug">
                 <xsl:attribute name="if">netbeans.home</xsl:attribute>
-                <xsl:attribute name="depends">init,compile,run-deploy,debug-tool,debug-jar</xsl:attribute>
+                <xsl:attribute name="depends">init,compile,run-deploy-debug,debug-tool,debug-jar</xsl:attribute>
                 <xsl:attribute name="description">Debug project in IDE.</xsl:attribute>
             </target>
             
diff -r 9182f5c33fcf -r cc6e06782fe0 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java
--- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java	Mon Apr 21 08:52:44 2008 -0700
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java	Mon Apr 21 11:17:57 2008 -0700
@@ -212,17 +212,17 @@ public class EarActionProvider implement
             }
             
             //see issue 83056
-            if (project.evaluator().getProperty("app.client") != null) { //MOI18N
-                NotifyDescriptor nd;
-                nd = new NotifyDescriptor.Message(NbBundle.getMessage(EarActionProvider.class, "MSG_Server_State_Question"), NotifyDescriptor.QUESTION_MESSAGE);
-                nd.setOptionType(NotifyDescriptor.YES_NO_OPTION);
-                nd.setOptions(new Object[] {NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
-                if (DialogDisplayer.getDefault().notify(nd) == NotifyDescriptor.YES_OPTION) {
-                    nd = new NotifyDescriptor.Message(NbBundle.getMessage(EarActionProvider.class, "MSG_Server_State"), NotifyDescriptor.INFORMATION_MESSAGE);
-                    Object o = DialogDisplayer.getDefault().notify(nd);
-                    return null;
-                }
-            }
+//            if (project.evaluator().getProperty("app.client") != null) { //MOI18N
+//                NotifyDescriptor nd;
+//                nd = new NotifyDescriptor.Message(NbBundle.getMessage(EarActionProvider.class, "MSG_Server_State_Question"), NotifyDescriptor.QUESTION_MESSAGE);
+//                nd.setOptionType(NotifyDescriptor.YES_NO_OPTION);
+//                nd.setOptions(new Object[] {NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
+//                if (DialogDisplayer.getDefault().notify(nd) == NotifyDescriptor.YES_OPTION) {
+//                    nd = new NotifyDescriptor.Message(NbBundle.getMessage(EarActionProvider.class, "MSG_Server_State"), NotifyDescriptor.INFORMATION_MESSAGE);
+//                    Object o = DialogDisplayer.getDefault().notify(nd);
+//                    return null;
+//                }
+//            }
             
             if (isDebugged()) {
                 p.setProperty("is.debugged", "true"); // NOI18N
diff -r 9182f5c33fcf -r cc6e06782fe0 j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl
--- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl	Mon Apr 21 08:52:44 2008 -0700
+++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl	Mon Apr 21 11:17:57 2008 -0700
@@ -771,7 +771,7 @@ to simulate
                                 </xsl:if>
                                 <jvmarg line="${{j2ee.appclient.tool.jvmoptions}}"/>
                                 <jvmarg line="${{debug-args-line}}"/>
-                                <jvmarg value="-Xrunjdwp:transport=${{jpda.transport}},server=y,address=${{jpda.address}},suspend=y"/>
+                                <jvmarg value="-Xrunjdwp:transport=${{jpda.transport}},server=y,address=${{jpda.address.client}},suspend=y"/>
                                 <jvmarg line="${{j2ee.appclient.jvmoptions.param}}"/>
                                 <arg line="@{{args}}"/>
                                 <classpath>
@@ -784,7 +784,7 @@ to simulate
                                 </syspropertyset>
                                 <customize/>
                             </java>
-                            <nbjpdaconnect name="${{name}}" host="${{jpda.host}}" address="${{jpda.address}}" transport="${{jpda.transport}}">
+                            <nbjpdaconnect name="${{name}}" host="${{jpda.host}}" address="${{jpda.address.client}}" transport="${{jpda.transport}}">
                                 <classpath>
                                     <path path="${{j2ee.platform.classpath}}:${{j2ee.appclient.tool.runtime}}"/>
                                     <path path="@{{classpath}}"/>
@@ -796,7 +796,7 @@ to simulate
                         </parallel>
                     </sequential>
                 </macrodef>
-            <nbdeploy debugmode="false" clientUrlPart="${{client.urlPart}}" clientModuleUri="${{client.module.uri}}"/>
+            <nbdeploy debugmode="true" clientUrlPart="${{client.urlPart}}" clientModuleUri="${{client.module.uri}}"/>
             <antcall target="debug-${{app.client}}"/>
         </target>
         <xsl:variable name="references" select="/p:project/p:configuration/projdeps:references"/>