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

Latest SpringSurf fixes - support for JBoss VFS in ClassPathStore.

Browse Source 
- Related updates to RemoteAPI and Share app-context files
 - Removal of obsolete stores
 - Removal of JBossEnabled* classes and references - no longer required since upgrade to Spring3.0.0
 - Corrected web.xml as per DTD for strict JBoss checks

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-15 15:00:11 +00:00
parent e2fbd4a8de
commit 0399805772
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java
View File

@@ -36,7 +36,6 @@ import java.util.StringTokenizer;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.TreeSet; import java.util.TreeSet;
import org.alfresco.config.JBossEnabledResourcePatternResolver;
import org.alfresco.config.JndiPropertiesFactoryBean; import org.alfresco.config.JndiPropertiesFactoryBean;
import org.alfresco.util.config.RepositoryPathConfigBean; import org.alfresco.util.config.RepositoryPathConfigBean;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -51,7 +50,6 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.io.support.ResourcePatternResolver;
/** /**
* A factory allowing initialization of an entire 'subsystem' in a child application context. As with other * A factory allowing initialization of an entire 'subsystem' in a child application context. As with other
@@ -400,17 +398,6 @@ public class ChildApplicationContextFactory extends AbstractPropertyBackedBean i
setClassLoader(ChildApplicationContextFactory.this.getParent().getClassLoader()); setClassLoader(ChildApplicationContextFactory.this.getParent().getClassLoader());
} }
/*
* (non-Javadoc)
* @see org.springframework.context.support.AbstractApplicationContext#getResourcePatternResolver()
*/
@Override
protected ResourcePatternResolver getResourcePatternResolver()
{
// Ensure we can resolve resourced on JBoss 5
return new JBossEnabledResourcePatternResolver(this);
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see * @see

4
source/java/org/alfresco/util/ResourceFinder.java
View File

@@ -29,17 +29,17 @@ import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.alfresco.config.JBossEnabledResourcePatternResolver;
import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.springframework.web.context.support.ServletContextResourcePatternResolver;
/** /**
* Can be used in Spring configuration to search for all resources matching an array of patterns. * Can be used in Spring configuration to search for all resources matching an array of patterns.
* *
* @author dward * @author dward
*/ */
public class ResourceFinder extends JBossEnabledResourcePatternResolver public class ResourceFinder extends ServletContextResourcePatternResolver
{ {
public ResourceFinder() public ResourceFinder()
{ {