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

Integrated Spring v3 snapshot CI-477

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/util/ApplicationContextHelper.java
View File

@@ -26,7 +26,6 @@ package org.alfresco.util;
import java.util.Arrays;
import org.alfresco.config.FixedClassPathXmlApplicationContext;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -81,7 +80,7 @@ public class ApplicationContextHelper
// The config has changed so close the current context (if any)
closeApplicationContext();
instance = new FixedClassPathXmlApplicationContext(configLocations);
instance = new ClassPathXmlApplicationContext(configLocations);
usedConfiguration = configLocations;
return instance;

4
source/java/org/alfresco/util/BaseSpringTest.java
View File

@@ -24,10 +24,10 @@
*/
package org.alfresco.util;
import org.alfresco.config.FixedClassPathXmlApplicationContext;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.orm.hibernate3.SessionFactoryUtils;
import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
@@ -120,7 +120,7 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
else
{
String[] configLocations = (String[]) key;
return new FixedClassPathXmlApplicationContext(configLocations);
return new ClassPathXmlApplicationContext(configLocations);
}
}
}

3
source/java/org/alfresco/util/schemadump/Main.java
View File

@@ -47,7 +47,6 @@ import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import org.alfresco.config.FixedClassPathXmlApplicationContext;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.TypeNames;
@@ -102,7 +101,7 @@ public class Main
@SuppressWarnings("unchecked")
public Main(final String contextPath) throws Exception
{
final ClassPathXmlApplicationContext context = new FixedClassPathXmlApplicationContext(new String[]
final ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]
{
"file:" + contextPath
});