inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-14306: Merged DEV to HEAD (4.2)

Browse Source 
- fix build failure 



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2013-02-18 14:31:46 +00:00
parent f5bd27c36c
commit 0a59cc7dee
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/bootstrap-context.xml
View File

@@ -437,6 +437,9 @@
<import resource="classpath*:alfresco/extension/bootstrap/*-context.xml" />
<bean id="Transformers" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean">
<property name="saveSetProperty">
<value>true</value>
</property>
</bean>
<!-- Start third party transformer Subsystem. -->

28
source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2012 Alfresco Software Limited.
* Copyright (C) 2005-2013 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -55,6 +55,10 @@ import org.springframework.util.PropertyPlaceholderHelper;
public abstract class AbstractPropertyBackedBean implements PropertyBackedBean, ApplicationContextAware,
ApplicationListener<ApplicationEvent>, InitializingBean, DisposableBean, BeanNameAware
{
/**
* When true, calls to setProperties / setProperty are persisted to the MBean if it exists.
*/
private boolean saveSetProperty = false;
/** The default final part of an ID. */
protected static final String DEFAULT_INSTANCE_NAME = "default";
@@ -271,6 +275,14 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
}
return this.state;
}
/**
* When set to true, calls to setProperties / setProperty are persisted to the MBean if it exists.
*/
public void setSaveSetProperty(boolean saveSetProperty)
{
this.saveSetProperty = saveSetProperty;
}
/**
* {@inheritDoc}
@@ -669,8 +681,11 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
// broadcast method returns. If there is no MBean (community edition) OR when
// initiated from the MBean (say setting a value via JConsole), nothing happens
// as a result of the broadcast.
logger.debug("setProperty() broadcastSetProperties");
this.registry.broadcastSetProperty(this, name, value);
if (saveSetProperty)
{
logger.debug("setProperty() broadcastSetProperties");
this.registry.broadcastSetProperty(this, name, value);
}
if (localSetProperties.get())
{
@@ -743,8 +758,11 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
// broadcast method returns. If there is no MBean (community edition) OR when
// initiated from the MBean (say setting a value via JConsole), nothing happens
// as a result of the broadcast.
logger.debug("setProperties() broadcastSetProperties");
this.registry.broadcastSetProperties(this, properties);
if (saveSetProperty)
{
logger.debug("setProperties() broadcastSetProperties");
this.registry.broadcastSetProperties(this, properties);
}
if (localSetProperties.get())
{