From b1380aca0222b51cc2ad5143aac55aa2cf074a03 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Wed, 1 Apr 2009 16:15:24 +0000 Subject: [PATCH] Fix CifsIntegrationTest git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/filesys/repo/CifsIntegrationTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/filesys/repo/CifsIntegrationTest.java b/source/java/org/alfresco/filesys/repo/CifsIntegrationTest.java index b9d5c9d6e8..c3d1fee24b 100644 --- a/source/java/org/alfresco/filesys/repo/CifsIntegrationTest.java +++ b/source/java/org/alfresco/filesys/repo/CifsIntegrationTest.java @@ -24,7 +24,7 @@ */ package org.alfresco.filesys.repo; -import org.alfresco.filesys.CIFSServerBean; +import org.alfresco.jlan.server.config.ServerConfigurationAccessor; import org.alfresco.jlan.server.filesys.DiskSharedDevice; import org.alfresco.jlan.server.filesys.FilesystemsConfigSection; import org.alfresco.service.ServiceRegistry; @@ -42,22 +42,22 @@ public class CifsIntegrationTest extends BaseAlfrescoTestCase public void testGetServerName() { - CIFSServerBean cifsServer = (CIFSServerBean) ctx.getBean("cifsServer"); - assertNotNull("No CIFS server available", cifsServer); + ServerConfigurationAccessor config = (ServerConfigurationAccessor) ctx.getBean("fileServerConfiguration"); + assertNotNull("No file server config available", config); // the server might, quite legitimately, not start - if (!cifsServer.isStarted()) + if (!config.isServerRunning( "CIFS")) { return; } // get the server name - String serverName = cifsServer.getConfiguration().getServerName(); + String serverName = config.getServerName(); assertNotNull("No server name available", serverName); assertTrue("No server name available (zero length)", serverName.length() > 0); // Get the primary filesystem, might be null if the home folder mapper is configured - FilesystemsConfigSection filesysConfig = (FilesystemsConfigSection) cifsServer.getConfiguration().getConfigSection(FilesystemsConfigSection.SectionName); + FilesystemsConfigSection filesysConfig = (FilesystemsConfigSection) config.getConfigSection(FilesystemsConfigSection.SectionName); DiskSharedDevice mainFilesys = (DiskSharedDevice) filesysConfig.getShares().enumerateShares().nextElement(); if ( mainFilesys != null)