Merged missing changes to file-servers.xml and file-servers.properties from 13521 in V3.1

Synchronized new file-servers-context.xml with these changes
Debugged NFS and Desktop Action Initialization via Spring

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/filesys/avm/AVMContext.java

@@ -29,6 +29,7 @@ import java.util.StringTokenizer;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.filesys.alfresco.AlfrescoContext;
+import org.alfresco.filesys.alfresco.AlfrescoDiskDriver;
 import org.alfresco.filesys.alfresco.IOControlHandler;
 import org.alfresco.filesys.state.FileState;
 import org.alfresco.filesys.state.FileStateTable;
@@ -126,8 +127,6 @@ public class AVMContext extends AlfrescoContext
         
         // Set the store version to use     
         setVersion(version);
-
-        afterPropertiesSet();
     }
 
     /**
@@ -146,8 +145,6 @@ public class AVMContext extends AlfrescoContext
         // Enable the virtualization view
         setVirtualView(true);
         setShowOptions(showOptions);
-
-        afterPropertiesSet();
     }
 
     public void setStorePath(String path)
@@ -213,10 +210,10 @@ public class AVMContext extends AlfrescoContext
         m_createStore = createStore;
     }
 
+    
     @Override
-    public void afterPropertiesSet()
+    public void initialize(AlfrescoDiskDriver filesysDriver)
     {
-
         if (m_virtualView)
         {
             // A context for a view onto all stores/versions within AVM.
@@ -241,7 +238,7 @@ public class AVMContext extends AlfrescoContext
             
             setShareName(m_storePath + "(" + m_version + ")");                        
         }
-        super.afterPropertiesSet();
+        super.initialize(filesysDriver);
     }
 
     /**

source/java/org/alfresco/filesys/avm/AVMDiskDriver.java

@@ -426,9 +426,12 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
      * @param context the device context
      * @exception DeviceContextException
      */
+    @Override
     public void registerContext(DeviceContext ctx)
             throws DeviceContextException
     {
+        super.registerContext(ctx);        
+
         AVMContext context = (AVMContext)ctx;
         // Use the system user as the authenticated context for the filesystem initialization
 
@@ -625,7 +628,6 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
         {
             AuthenticationUtil.popAuthentication();
         }
-
     }
 
     /**