Fix ALF-2324: Virtualization Server failed to connect to WCM Authoring Server

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-04-08 15:38:51 +00:00
parent f901c63daa
commit e51c893643
2 changed files with 14 additions and 7 deletions

View File

@@ -9,9 +9,13 @@
<!-- -->
<!-- Load runtime-dependent properties (e.g.: alfresco.jmx.dir). -->
<!-- Note: This bean relies on PropertyPlaceholderConfigurer -->
<bean id="runtimeProperties" class="org.alfresco.util.RuntimeSystemPropertiesSetter"/>
<!-- Note: This bean relies on PropertyPlaceholderConfigurer (should be ordered before "shared-properties") -->
<bean id="runtimeProperties" class="org.alfresco.util.RuntimeSystemPropertiesSetter">
<property name="order">
<value>5</value>
</property>
</bean>
<!-- Ensure backward compatibility with installations that control custom properties through repository-properties -->
<bean id="legacyConfigPostProcessor" class="org.alfresco.repo.management.subsystems.LegacyConfigPostProcessor"/>
@@ -70,8 +74,8 @@
<!-- Load properties that must be shared between the -->
<!-- Alfresco server and its remote clients. -->
<!-- -->
<!-- Note: This is done in a seperate bean to make it -->
<!-- for users who have alrady overridden their -->
<!-- Note: This is done in a separate bean to make it -->
<!-- for users who have already overridden their -->
<!-- "repository-properties" in a dev-context.xml -->
<!-- or custom-db-and-data-context.xml file. -->
@@ -85,6 +89,9 @@
<value>classpath:alfresco/alfresco-shared.properties</value>
</list>
</property>
<property name="order">
<value>10</value>
</property>
</bean>
<bean id="jgroupsPropertySetter" class="org.alfresco.config.SystemPropertiesSetterBean" init-method="init">

View File

@@ -29,7 +29,7 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.Ordered;
import org.springframework.core.PriorityOrdered;
import org.springframework.core.io.support.ResourcePatternResolver;
/**
@@ -44,7 +44,7 @@ import org.springframework.core.io.support.ResourcePatternResolver;
* @author Jon Cox
* @see #setProperties(Map)
*/
public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor, ApplicationContextAware, Ordered
public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor, ApplicationContextAware, PriorityOrdered
{
private static Log logger = LogFactory.getLog(RuntimeSystemPropertiesSetter.class );