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

Daily merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-12 20:22:46 +00:00
parent a22ddfb666
commit 4b881e72ad
15 changed files with 282 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import java.net.Socket;
import java.net.UnknownHostException;
import java.security.Provider;
import java.security.Security;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Enumeration;
import java.util.List;
@@ -1430,7 +1431,15 @@ public class ServerConfiguration implements ApplicationListener
{
// Check for the old style configuration
filesysElems = config.getConfigElementList( "filesystem");
ConfigElement filesysElem = config.getConfigElement( "filesystem");
if (filesysElem != null)
{
// create a list with the single filesys element in
filesysElems = new ArrayList<ConfigElement>(1);
filesysElems.add(filesysElem);
}
// Warn that the configuration is using the old format