Integrated Spring v3 snapshot CI-477

- Fixes SPR-6411 and SPR-6412
- Removes dependency on Hibernate v3.3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-11-30 09:36:40 +00:00
parent bf7da50140
commit be0482f06e
20 changed files with 37 additions and 40 deletions

View File

@@ -30,7 +30,6 @@ import java.net.SocketException;
import java.util.LinkedList;
import java.util.List;
import org.alfresco.config.FixedClassPathXmlApplicationContext;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.jlan.netbios.server.NetBIOSNameServer;
import org.alfresco.jlan.server.NetworkServer;
@@ -43,6 +42,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* CIFS Server Class
@@ -213,7 +213,7 @@ public class CIFSServerBean extends AbstractLifecycleBean
{
// Create the configuration service in the same way that Spring creates it
ApplicationContext ctx = new FixedClassPathXmlApplicationContext("alfresco/application-context.xml");
ApplicationContext ctx = new ClassPathXmlApplicationContext("alfresco/application-context.xml");
// Get the CIFS server bean