From 1e51996cd93eaeefc920ba9fe3f867c2bdf68fd8 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Mon, 23 Nov 2009 20:20:06 +0000 Subject: [PATCH] Merged BRANCHES/DEV/DAVEW/SPRING3 to HEAD 15422: Fix deploy-virtual-tomcat macro for Spring 3 15391: Fix ContentStoreReplicatorTest for Spring 3 15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility 15385: Correction to previous checkin 15384: Fix ClassPathStore.createRelative() to work with Spring 3 - Relative resource path resolution with directory resources has changed 15346: Merged V3.3_SPRING3 to SPRING3 15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring) - Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing 15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3 15308: Fix IBATIS integration to be compatible with Spring 3 15307: Added missing runtime dependencies - org.springframework.expression-3.0.0.RC2.jar - org.springframework.asm-3.0.0.RC2.jar 15289: Move Alfresco stack to Spring 3 - Stage 1: get it compiling in eclipse and update ant scripts - Still requires Web Framework contributions from Uzi git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/cmis-ws-context.xml | 18 ++++++++++++++++++ .../web/scripts/TestWebScriptRepoServer.java | 3 ++- source/sample/JavaCmisTest/.classpath | 2 +- .../repo/cmis/ws/CMISCustomTypeTest.java | 4 ++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/config/alfresco/cmis-ws-context.xml b/config/alfresco/cmis-ws-context.xml index fb1db41a40..226a4186b4 100644 --- a/config/alfresco/cmis-ws-context.xml +++ b/config/alfresco/cmis-ws-context.xml @@ -5,10 +5,28 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + + + + + + + + http://schemas.xmlsoap.org/soap/ + http://schemas.xmlsoap.org/wsdl/soap/ + http://schemas.xmlsoap.org/wsdl/soap12/ + http://www.w3.org/2003/05/soap/bindings/HTTP/ + http://schemas.xmlsoap.org/wsdl/soap/http + + + + + diff --git a/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java b/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java index a34d5e9ccc..aa3899cfec 100644 --- a/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java +++ b/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; +import org.alfresco.config.FixedClassPathXmlApplicationContext; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; @@ -168,7 +169,7 @@ public class TestWebScriptRepoServer extends TestWebScriptServer System.arraycopy(CONFIG_LOCATIONS, 0, configLocations, 0, CONFIG_LOCATIONS.length); configLocations[CONFIG_LOCATIONS.length] = appendTestConfigLocation; } - TestWebScriptRepoServer.ctx = new ClassPathXmlApplicationContext(configLocations); + TestWebScriptRepoServer.ctx = new FixedClassPathXmlApplicationContext(configLocations); TestWebScriptRepoServer.appendedTestConfiguration = appendTestConfigLocation; } diff --git a/source/sample/JavaCmisTest/.classpath b/source/sample/JavaCmisTest/.classpath index 69eb9113a8..497368e1f6 100755 --- a/source/sample/JavaCmisTest/.classpath +++ b/source/sample/JavaCmisTest/.classpath @@ -3,7 +3,7 @@ - + diff --git a/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java b/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java index a48885db85..be23e8b5eb 100755 --- a/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java @@ -32,12 +32,12 @@ import javax.xml.ws.Holder; import junit.framework.TestCase; import org.alfresco.cmis.CMISDictionaryModel; +import org.alfresco.config.FixedClassPathXmlApplicationContext; import org.alfresco.repo.cmis.ws.utils.PropertyUtil; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.security.AuthenticationService; import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; public class CMISCustomTypeTest extends TestCase { @@ -61,7 +61,7 @@ public class CMISCustomTypeTest extends TestCase { if (null == applicationContext) { - applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:alfresco/application-context.xml", "classpath:alfresco/cmis-ws-context.xml", + applicationContext = new FixedClassPathXmlApplicationContext(new String[] { "classpath:alfresco/application-context.xml", "classpath:alfresco/cmis-ws-context.xml", "classpath:cmis/cmis-test-context.xml" }); ServiceRegistry serviceRegistry = (ServiceRegistry) applicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY); authenticationService = serviceRegistry.getAuthenticationService();