Merged HEAD (5.1) to 5.1.N (5.1.1)

117531 bhorje: CM-690 virtualization is disabled by default - virtualization integration tests and the integration tests suite  run with vf enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-11-14 13:38:20 +00:00
parent 1ec4f05efc
commit 9e202dcd66
8 changed files with 76 additions and 95 deletions

View File

@@ -34,7 +34,9 @@ public class SpringExtensionBundle implements InitializingBean
private String id;
private boolean enabled=true;
private boolean enabled = true;
private RegistryExtensionBundle extensionBundle;
public void setEnabled(boolean enabled)
{
@@ -51,14 +53,13 @@ public class SpringExtensionBundle implements InitializingBean
this.id = id;
}
@Override
public void afterPropertiesSet() throws Exception
public synchronized void start()
{
if (this.enabled)
{
logger.info("Starting extension bundle " + id);
RegistryExtensionBundle extensionBundle = new RegistryExtensionBundle(id);
if (extensionBundle == null)
{
logger.info("Registering extension bundle " + id);
extensionBundle = new RegistryExtensionBundle(id);
for (SpringBeanExtension<?, ?> springExtension : extensions)
{
@@ -74,12 +75,33 @@ public class SpringExtensionBundle implements InitializingBean
}
}
}
Extender.getInstance().start(extensionBundle);
logger.info("Starting extension bundle " + id);
Extender.getInstance().start(extensionBundle);
}
public synchronized void stop()
{
if (extensionBundle == null)
{
logger.info("Stop request for unregistered extension bundle " + id);
}
logger.info("Stopping extension bundle " + id);
Extender.getInstance().stop(extensionBundle);
}
@Override
public void afterPropertiesSet() throws Exception
{
if (this.enabled)
{
logger.info("The extension bundle " + id+" is spring-enabled. Starting ... ");
start();
}
else
{
logger.info("Extension bundle " + id + " is disabled.");
logger.info("Extension bundle " + id + " is spring-disabled.");
}
}