try
{
repository.disable(addonToUndeploy);
Addon addonToStop = registry.getAddon(addonToUndeploy);
registry.stop(addonToStop);
Addons.waitUntilStopped(addonToStop);
}
catch (Exception e)
{
throw new DeploymentException("Failed to undeploy " + addonToUndeploy, e);