inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +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 afec362f9a
commit 9decf60e5d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
View File

@@ -31,12 +31,12 @@ import java.io.PrintStream;
import java.util.List; import java.util.List;
import org.alfresco.config.ConfigDeployment; import org.alfresco.config.ConfigDeployment;
import org.alfresco.config.FixedClassPathXmlApplicationContext;
import org.alfresco.i18n.I18NUtil; import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.admin.BaseInterpreter; import org.alfresco.repo.admin.BaseInterpreter;
import org.alfresco.repo.config.xml.RepoXMLConfigService; import org.alfresco.repo.config.xml.RepoXMLConfigService;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
/** /**
@@ -63,7 +63,7 @@ public class ConfigAdminInterpreter extends BaseInterpreter
*/ */
public static void main(String[] args) public static void main(String[] args)
{ {
ApplicationContext context = new FixedClassPathXmlApplicationContext(new String[] {"classpath:alfresco/application-context.xml","classpath:alfresco/web-client-application-context.xml"}); ApplicationContext context = new ClassPathXmlApplicationContext(new String[] {"classpath:alfresco/application-context.xml","classpath:alfresco/web-client-application-context.xml"});
runMain(context, "webClientConfigAdminInterpreter"); runMain(context, "webClientConfigAdminInterpreter");
} }

4
source/java/org/alfresco/web/forms/FormsTest.java
View File

@@ -28,7 +28,6 @@ import java.io.Serializable;
import java.util.Calendar; import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import org.alfresco.config.FixedClassPathXmlApplicationContext;
import org.alfresco.model.WCMAppModel; import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
@@ -50,6 +49,7 @@ import org.apache.shale.test.mock.MockHttpServletRequest;
import org.apache.shale.test.mock.MockHttpServletResponse; import org.apache.shale.test.mock.MockHttpServletResponse;
import org.apache.shale.test.mock.MockServletContext; import org.apache.shale.test.mock.MockServletContext;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.StaticWebApplicationContext; import org.springframework.web.context.support.StaticWebApplicationContext;
import org.w3c.dom.Document; import org.w3c.dom.Document;
@@ -163,7 +163,7 @@ public class FormsTest
protected ConfigurableApplicationContext loadContext(Object key) protected ConfigurableApplicationContext loadContext(Object key)
throws Exception throws Exception
{ {
return new FixedClassPathXmlApplicationContext((String[])key); return new ClassPathXmlApplicationContext((String[])key);
} }
public void testOutputPathPatternForFormInstanceData() public void testOutputPathPatternForFormInstanceData()