diff --git a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java index 9bd226413e..60f2c32cd7 100755 --- a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java +++ b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java @@ -28,7 +28,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.util.List; +import org.alfresco.config.ConfigDeployment; import org.alfresco.i18n.I18NUtil; import org.alfresco.repo.admin.BaseInterpreter; import org.alfresco.repo.config.xml.RepoXMLConfigService; @@ -134,9 +136,22 @@ public class ConfigAdminInterpreter extends BaseInterpreter } // destroy and re-initialise config service - webClientConfigService.reset(); - - out.println("Web Client config has been reloaded"); + webClientConfigService.destroy(); + List configDeployments = webClientConfigService.initConfig(); + + if (configDeployments != null) + { + out.println("Web Client config has been reloaded\n"); + + for (ConfigDeployment configDeployment : configDeployments) + { + out.println(configDeployment.getName() + " ---> " + configDeployment.getDeploymentStatus()); + } + } + else + { + out.println("No config reloaded"); + } } else diff --git a/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java b/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java index 49547c4015..45f3c85872 100644 --- a/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java +++ b/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java @@ -27,6 +27,7 @@ package org.alfresco.web.config; import java.util.List; import org.alfresco.config.ConfigDeployer; +import org.alfresco.config.ConfigDeployment; import org.alfresco.config.ConfigService; import org.alfresco.config.source.UrlConfigSource; import org.alfresco.error.AlfrescoRuntimeException; @@ -104,12 +105,14 @@ public class WebClientConfigBootstrap implements ApplicationContextAware, Config /** * Initialisation method */ - public void initConfig() + public List initConfig() { if (configService != null && this.configs != null && this.configs.size() != 0) { UrlConfigSource configSource = new UrlConfigSource(this.configs); - configService.appendConfig(configSource); + return configService.appendConfig(configSource); } + + return null; } }