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

Merged BRANCHES/DEV/DAVEW/SPRING3 to HEAD

Browse Source 
15422: Fix deploy-virtual-tomcat macro for Spring 3
   15391: Fix ContentStoreReplicatorTest for Spring 3
   15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility
   15385: Correction to previous checkin
   15384: Fix ClassPathStore.createRelative() to work with Spring 3
      - Relative resource path resolution with directory resources has changed
   15346: Merged V3.3_SPRING3 to SPRING3
      15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring)
         - Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing
      15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3
      15308: Fix IBATIS integration to be compatible with Spring 3
      15307: Added missing runtime dependencies
         - org.springframework.expression-3.0.0.RC2.jar
         - org.springframework.asm-3.0.0.RC2.jar
      15289: Move Alfresco stack to Spring 3
         - Stage 1: get it compiling in eclipse and update ant scripts
         - Still requires Web Framework contributions from Uzi


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-11-23 20:20:06 +00:00
parent 512e7c8cb5
commit 1a481a63c2
41 changed files with 258 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/util/ApplicationContextHelper.java
View File

@@ -26,7 +26,8 @@ package org.alfresco.util;
import java.util.Arrays;
import org.springframework.context.ConfigurableApplicationContext;
import org.alfresco.config.FixedClassPathXmlApplicationContext;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -52,7 +53,7 @@ public class ApplicationContextHelper
*
* @return Returns an application context for the default Alfresco configuration
*/
public synchronized static ConfigurableApplicationContext getApplicationContext()
public synchronized static ApplicationContext getApplicationContext()
{
return getApplicationContext(CONFIG_LOCATIONS);
}
@@ -66,7 +67,7 @@ public class ApplicationContextHelper
*
* @return Returns an application context for the given configuration
*/
public synchronized static ConfigurableApplicationContext getApplicationContext(String[] configLocations)
public synchronized static ApplicationContext getApplicationContext(String[] configLocations)
{
if (configLocations == null)
{
@@ -80,7 +81,7 @@ public class ApplicationContextHelper
// The config has changed so close the current context (if any)
closeApplicationContext();
instance = new ClassPathXmlApplicationContext(configLocations);
instance = new FixedClassPathXmlApplicationContext(configLocations);
usedConfiguration = configLocations;
return instance;