Index: plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java =================================================================== --- plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java (revision 226299) +++ plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java (working copy) @@ -20,10 +20,10 @@ package org.apache.derby.ui.launch; -import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate; +import org.eclipse.jdt.launching.JavaLaunchDelegate; public class StopDerbyServerLaunchConfigurationDelegate extends - JavaLocalApplicationLaunchConfigurationDelegate { + JavaLaunchDelegate { } Index: plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java =================================================================== --- plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java (revision 226299) +++ plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java (working copy) @@ -20,10 +20,10 @@ package org.apache.derby.ui.launch; -import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate; +import org.eclipse.jdt.launching.JavaLaunchDelegate; public class IJDerbyLaunchConfigurationDelegate extends - JavaLocalApplicationLaunchConfigurationDelegate { + JavaLaunchDelegate { } Index: plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java =================================================================== --- plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java (revision 226299) +++ plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java (working copy) @@ -20,10 +20,9 @@ package org.apache.derby.ui.launch; -import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate; +import org.eclipse.jdt.launching.JavaLaunchDelegate; - public class StartDerbyServerLaunchConfigurationDelegate extends - JavaLocalApplicationLaunchConfigurationDelegate { - + JavaLaunchDelegate { + } Index: plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java =================================================================== --- plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java (revision 226299) +++ plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java (working copy) @@ -20,10 +20,10 @@ package org.apache.derby.ui.launch; -import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate; +import org.eclipse.jdt.launching.JavaLaunchDelegate; public class SysInfoDerbyLaunchConfigurationDelegate extends - JavaLocalApplicationLaunchConfigurationDelegate { + JavaLaunchDelegate { } Index: plugins/eclipse/org.apache.derby.ui/plugin.xml =================================================================== --- plugins/eclipse/org.apache.derby.ui/plugin.xml (revision 226299) +++ plugins/eclipse/org.apache.derby.ui/plugin.xml (working copy) @@ -3,7 +3,7 @@ @@ -380,7 +380,7 @@ public="false" name="IJ" id="org.apache.derby.ui.ijDerbyLaunchConfigurationType" - modes="run, debug"/> + modes="run, debug"/> Index: plugins/eclipse/org.apache.derby.plugin.doc/plugin.xml =================================================================== --- plugins/eclipse/org.apache.derby.plugin.doc/plugin.xml (revision 226299) +++ plugins/eclipse/org.apache.derby.plugin.doc/plugin.xml (working copy) @@ -3,7 +3,7 @@