diff options
| author | Pascal Rapicault | 2008-11-26 06:42:18 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2008-11-26 06:42:18 +0000 |
| commit | 1901dd6dea2b1a306f8d9f1798119122450b1e6f (patch) | |
| tree | d59f99ea0859a75a84e21d4c1ba6c11cf7be0a64 /bundles/org.eclipse.equinox.simpleconfigurator.manipulator | |
| parent | f9a7815bc5ec056f6caf382c28d4bab42cd307de (diff) | |
| download | rt.equinox.p2-1901dd6dea2b1a306f8d9f1798119122450b1e6f.tar.gz rt.equinox.p2-1901dd6dea2b1a306f8d9f1798119122450b1e6f.tar.xz rt.equinox.p2-1901dd6dea2b1a306f8d9f1798119122450b1e6f.zip | |
Re-enable TestRunningInstance test and release forgotten code to set the VM
Diffstat (limited to 'bundles/org.eclipse.equinox.simpleconfigurator.manipulator')
| -rw-r--r-- | bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java index 73dd84383..3d110d9f4 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java @@ -341,7 +341,7 @@ public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorMani return configData.getBundles(); File outputFile = getConfigFile(manipulator); - saveConfiguration((BundleInfo[]) setToSimpleConfig.toArray(new BundleInfo[setToSimpleConfig.size()]), outputFile, ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getLauncherData()), backup); + saveConfiguration((BundleInfo[]) setToSimpleConfig.toArray(new BundleInfo[setToSimpleConfig.size()]), outputFile, ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData()), backup); configData.setProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_CONFIGURL, outputFile.toURL().toExternalForm()); return orderingInitialConfig(setToInitialConfig); } @@ -410,7 +410,7 @@ public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorMani boolean exclusiveInstallation = Boolean.valueOf(properties.getProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_EXCLUSIVE_INSTALLATION)).booleanValue(); File configFile = getConfigFile(manipulator); - BundleInfo[] toInstall = loadConfiguration(configFile.toURL(), ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getLauncherData())); + BundleInfo[] toInstall = loadConfiguration(configFile.toURL(), ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData())); List toUninstall = new LinkedList(); if (exclusiveInstallation) |