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

Added support to load config from 'file:', 'classpath:' or 'http:'

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-01-09 17:05:36 +00:00
parent dad8713bc8
commit 7de3129545
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
View File

@@ -34,7 +34,8 @@ import net.sf.acegisecurity.AuthenticationManager;
import org.alfresco.config.Config; import org.alfresco.config.Config;
import org.alfresco.config.ConfigElement; import org.alfresco.config.ConfigElement;
import org.alfresco.config.ConfigLookupContext; import org.alfresco.config.ConfigLookupContext;
import org.alfresco.config.source.ClassPathConfigSource; import org.alfresco.config.ConfigSource;
import org.alfresco.config.source.UrlConfigSource;
import org.alfresco.config.xml.XMLConfigService; import org.alfresco.config.xml.XMLConfigService;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.filesys.ftp.FTPPath; import org.alfresco.filesys.ftp.FTPPath;
@@ -196,9 +197,6 @@ public class ServerConfiguration
// controls // controls
private AccessControlList m_globalACLs; private AccessControlList m_globalACLs;
// SMB server, NetBIOS name server and host announcer debug enable
private boolean m_srvDebug = false;
private boolean m_nbDebug = false; private boolean m_nbDebug = false;
private boolean m_announceDebug = false; private boolean m_announceDebug = false;
@@ -404,8 +402,8 @@ public class ServerConfiguration
// Create the configuration source // Create the configuration source
ClassPathConfigSource classPathConfigSource = new ClassPathConfigSource(configLocation); ConfigSource configSource = new UrlConfigSource(configLocation);
XMLConfigService xmlConfigService = new XMLConfigService(classPathConfigSource); XMLConfigService xmlConfigService = new XMLConfigService(configSource);
xmlConfigService.init(); xmlConfigService.init();
// Create the configuration context // Create the configuration context