diff --git a/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/fragment.xml b/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/fragment.xml index 6e119f7386e34d2eda34bf61e02f6555ed78bd96..fdd676e4d695dd7af454620e533e3e2bacb5c094 100644 --- a/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/fragment.xml +++ b/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/fragment.xml @@ -31,6 +31,10 @@ icon="icons/newuaal_clss.png" id="org.universaal.uaalpax.menu.newRunConfig" style="push"> + <commandParameter + id="org.universaal.uaalpax.commandparameters.runDebugMode" + name="Run/Debung mode"> + </commandParameter> </command> </menuContribution> </extension> diff --git a/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/src/main/java/org/universaal/uaalpax/handlers/NewRunConfigHandler.java b/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/src/main/java/org/universaal/uaalpax/handlers/NewRunConfigHandler.java index 50276efa6e3d2db5030ca8c3fda37a48334e9648..f1c7d14efa66c7c6dd5534bfd9ef6571af837f88 100644 --- a/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/src/main/java/org/universaal/uaalpax/handlers/NewRunConfigHandler.java +++ b/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/src/main/java/org/universaal/uaalpax/handlers/NewRunConfigHandler.java @@ -45,11 +45,13 @@ import org.universaal.uaalpax.ui.dialogs.NewRunconfigDialog; public class NewRunConfigHandler extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { - createNewLaunchConfiguration(HandlerUtil.getActiveWorkbenchWindow(event).getShell()); + String mode = event.getParameter("org.universaal.uaalpax.commandparameters.runDebugMode"); + boolean debug = (mode != null && mode.toLowerCase().equals("debug")); + createNewLaunchConfiguration(HandlerUtil.getActiveWorkbenchWindow(event).getShell(), debug); return null; } - private void createNewLaunchConfiguration(Shell shell) { + private void createNewLaunchConfiguration(Shell shell, boolean debug) { ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType type = manager.getLaunchConfigurationType("org.eclipse.pde.ui.EquinoxLauncher"); @@ -124,7 +126,7 @@ public class NewRunConfigHandler extends AbstractHandler { // IStructuredSelection selection = new StructuredSelection(configuration); DebugUITools.openLaunchConfigurationDialog(shell, configuration, DebugUIPlugin.getDefault() - .getLaunchConfigurationManager().getLaunchGroup(type, ILaunchManager.RUN_MODE).getIdentifier(), + .getLaunchConfigurationManager().getLaunchGroup(type, debug? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE).getIdentifier(), null); // TODO diff --git a/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/versions/2.0.0.xml b/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/versions/2.0.0.xml index cfef6f63dda0b5daa02e8eb6866a2aca9b9c50b9..c79e9de0f1cac4aedb23ccde7f26307f68b8c9b5 100644 --- a/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/versions/2.0.0.xml +++ b/uAALPaxTab/pax-runner-uaal/pax-runner-uaal-ui/versions/2.0.0.xml @@ -2,6 +2,9 @@ <version> <middleware> <bundleset> + <bundle level="1">wrap:mvn:javax.xml.stream/stax-api/1.0-2</bundle> + <bundle level="1">wrap:mvn:javax.activation/activation/1.1</bundle> + <bundle level="1">wrap:mvn:javax.xml.bind/jaxb-api/2.1</bundle> <bundle level="2">mvn:org.universAAL.middleware/mw.schemas/2.0.0</bundle> <bundle level="3">mvn:org.universAAL.middleware/mw.interfaces.osgi/2.0.0</bundle> <bundle level="4">wrap:mvn:org.json/json/20090211</bundle> @@ -21,6 +24,7 @@ <bundle level="18">mvn:org.universAAL.middleware/mw.data.representation.osgi/2.0.0</bundle> <bundle level="19">mvn:org.jgroups/jgroups/3.3.0.Alpha1</bundle> <bundle level="20">mvn:org.universAAL.middleware/mw.modules.communication.osgi/2.0.0</bundle> + <bundle level="20">wrap:mvn:org.bouncycastle/jce.jdk13/144</bundle> <bundle level="21">mvn:org.universAAL.middleware/mw.connectors.communication.jgroups.osgi/2.0.0</bundle> <bundle level="22">wrap:mvn:ch.ethz.iks.slp/jslp-osgi/1.0.2.RC5</bundle> <bundle level="23">mvn:org.universAAL.middleware/mw.brokers.control.osgi/2.0.0</bundle> @@ -42,14 +46,14 @@ <features> <bundleset name="UI bus"> - <bundle>mvn:org.universAAL.ui/ui.dm/1.3.3-SNAPSHOT</bundle> + <bundle>mvn:org.universAAL.ui/ui.dm/1.3.4-SNAPSHOT</bundle> <bundle>mvn:org.universAAL.ontology/ont.profile.ui.mainmenu/2.0.0</bundle> <bundle>mvn:org.universAAL.ontology/ont.profile.userid/2.0.0</bundle> <bundle>mvn:org.universAAL.ontology/ont.impairment/2.0.0</bundle> - mvn:org.universAAL.ontology/ont.profile.ui.preferences/1.3.6-SNAPSHOT + <bundle>mvn:org.universAAL.ontology/ont.profile.ui.preferences/1.3.6-SNAPSHOT</bundle> </bundleset> <bundleset name="Swing UI Handler"> - <bundle>mvn:org.universAAL.ui/ui.dm/1.3.3-SNAPSHOT</bundle> + <bundle>mvn:org.universAAL.ui/ui.dm/1.3.4-SNAPSHOT</bundle> <bundle>mvn:org.universAAL.ontology/ont.profile.ui.mainmenu/2.0.0</bundle> <bundle>mvn:org.universAAL.ontology/ont.profile.userid/2.0.0</bundle> <bundle>mvn:org.universAAL.ontology/ont.impairment/2.0.0</bundle>