Fix -Dkaraf.debug

The debug setup needs to come after the main distribution
configuration. This patch moves it to the end, instead of the
commented code which used to enable remote debugging.

Change-Id: I7fbeecf8e1a2063fb1f75c3e2b07df7f73c2f1e1
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
index f568fe0c57b7320e161f8c83e9e102ea16e0adde..e770f542aaa6935bbcd77b8b4a9890bb46bbb001 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
@@ -57,8 +57,6 @@ public class ITNeutronE2E {
             // Provision and launch a container based on a distribution of Karaf (Apache ServiceMix).
             // FIXME: need to *NOT* hardcode the version here - it breaks on
             // version bumps
-            when(Boolean.getBoolean(KARAF_DEBUG_PROP))
-                    .useOptions(KarafDistributionOption.debugConfiguration(KARAF_DEBUG_PORT, true)),
             karafDistributionConfiguration()
                 .frameworkUrl(
                     maven()
@@ -84,7 +82,8 @@ public class ITNeutronE2E {
        // Remember that the test executes in another process.  If you want to debug it, you need
        // to tell Pax Exam to launch that process with debugging enabled.  Launching the test class itself with
        // debugging enabled (for example in Eclipse) will not get you the desired results.
-       //   debugConfiguration("5000", true),
+            when(Boolean.getBoolean(KARAF_DEBUG_PROP))
+                    .useOptions(KarafDistributionOption.debugConfiguration(KARAF_DEBUG_PORT, true)),
        };
     }