You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2014/06/02 23:58:21 UTC
svn commit: r1599373 - in /webservices/axiom/trunk/axiom-spring-ws/src/test:
java/org/apache/axiom/spring/ws/test/
java/org/apache/axiom/spring/ws/test/jdom/
java/org/apache/axiom/spring/ws/test/wsadom/
resources/org/apache/axiom/spring/ws/test/ resour...
Author: veithen
Date: Mon Jun 2 21:58:21 2014
New Revision: 1599373
URL: http://svn.apache.org/r1599373
Log:
AXIOM-447: Change the Spring WS test cases so that they do real interop testing, with Axiom only being used on one side (either the client side or the server side), and SAAJ on the other side.
Added:
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java (with props)
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java
- copied, changed from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java
- copied, changed from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/axiom-message-factory.xml
- copied, changed from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/common.xml
- copied, changed from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/saaj-message-factory.xml
- copied, changed from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml
Modified:
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioTestCase.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTest.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/wsadom/WSAddressingDOMTest.java
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/client.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/server.xml
Added: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java?rev=1599373&view=auto
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java (added)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java Mon Jun 2 21:58:21 2014
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.spring.ws.test;
+
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.ws.soap.SoapVersion;
+
+/**
+ * Defines a particular {@link SoapMessageFactory} configuration.
+ */
+public interface MessageFactoryConfigurator {
+ MessageFactoryConfigurator SAAJ = new SimpleMessageFactoryConfigurator("saaj", new ClassPathResource("saaj-message-factory.xml", MessageFactoryConfigurator.class));
+ MessageFactoryConfigurator AXIOM = new SimpleMessageFactoryConfigurator("axiom", new ClassPathResource("axiom-message-factory.xml", MessageFactoryConfigurator.class));
+
+ String getName();
+
+ /**
+ * Configure a {@link SoapMessageFactory} in the given application context. The method must
+ * <ul>
+ * <li>add a bean of type {@link SoapMessageFactory} and name <tt>messageFactory</tt> to the
+ * context;
+ * <li>configure that {@link SoapMessageFactory} to use the SOAP version specified by the
+ * <tt>soapVersion</tt> property (which specifies the name of one of the constants defined in
+ * {@link SoapVersion}).
+ * </ul>
+ *
+ * @param context
+ */
+ void configure(GenericApplicationContext context);
+}
Propchange: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java (from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java?p2=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java&r1=1598905&r2=1599373&rev=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java Mon Jun 2 21:58:21 2014
@@ -18,19 +18,22 @@
*/
package org.apache.axiom.spring.ws.test;
-import org.apache.axiom.spring.ws.test.jdom.ClientServerTest;
-import org.apache.axiom.spring.ws.test.wsadom.WSAddressingDOMTest;
-import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
+public final class ScenarioConfig {
+ private final MessageFactoryConfigurator clientMessageFactoryConfigurator;
+ private final MessageFactoryConfigurator serverMessageFactoryConfigurator;
+
+ public ScenarioConfig(MessageFactoryConfigurator clientMessageFactoryConfigurator,
+ MessageFactoryConfigurator serverMessageFactoryConfigurator) {
+ this.clientMessageFactoryConfigurator = clientMessageFactoryConfigurator;
+ this.serverMessageFactoryConfigurator = serverMessageFactoryConfigurator;
+ }
-public class SpringWSTestSuiteBuilder extends MatrixTestSuiteBuilder {
- @Override
- protected void addTests() {
- addTests("SOAP_11");
- addTests("SOAP_12");
+ public final MessageFactoryConfigurator getClientMessageFactoryConfigurator() {
+ return clientMessageFactoryConfigurator;
}
-
- private void addTests(String soapVersion) {
- addTest(new ClientServerTest(soapVersion));
- addTest(new WSAddressingDOMTest(soapVersion));
+
+ public final MessageFactoryConfigurator getServerMessageFactoryConfigurator() {
+ return serverMessageFactoryConfigurator;
}
+
}
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioTestCase.java?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioTestCase.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioTestCase.java Mon Jun 2 21:58:21 2014
@@ -25,27 +25,31 @@ import org.eclipse.jetty.server.nio.Sele
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
import org.springframework.context.support.GenericXmlApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.env.MockPropertySource;
-import org.springframework.web.context.ConfigurableWebApplicationContext;
+import org.springframework.web.context.support.GenericWebApplicationContext;
import org.springframework.ws.transport.http.MessageDispatcherServlet;
public abstract class ScenarioTestCase extends MatrixTestCase {
+ private final ScenarioConfig config;
private Server server;
protected GenericXmlApplicationContext context;
- public ScenarioTestCase(String soapVersion) {
+ public ScenarioTestCase(ScenarioConfig config, String soapVersion) {
+ this.config = config;
+ addTestParameter("client", config.getClientMessageFactoryConfigurator().getName());
+ addTestParameter("server", config.getServerMessageFactoryConfigurator().getName());
addTestParameter("soapVersion", soapVersion);
}
@Override
- @SuppressWarnings("serial")
protected void setUp() throws Exception {
- final MatrixTestCasePropertySource testParameters = new MatrixTestCasePropertySource(this);
-
server = new Server();
// Set up a custom thread pool to improve thread names (for logging purposes)
@@ -57,29 +61,36 @@ public abstract class ScenarioTestCase e
connector.setPort(0);
server.setConnectors(new Connector[] { connector });
ServletContextHandler handler = new ServletContextHandler(server, "/");
- ServletHolder servlet = new ServletHolder(new MessageDispatcherServlet() {
- @Override
- protected void postProcessWebApplicationContext(ConfigurableWebApplicationContext wac) {
- wac.getEnvironment().getPropertySources().addFirst(testParameters);
+ MessageDispatcherServlet servlet = new MessageDispatcherServlet();
+ servlet.setContextClass(GenericWebApplicationContext.class);
+ servlet.setContextInitializers(new ApplicationContextInitializer<ConfigurableApplicationContext>() {
+ public void initialize(ConfigurableApplicationContext applicationContext) {
+ configureContext((GenericWebApplicationContext)applicationContext, config.getServerMessageFactoryConfigurator(), "server.xml");
}
});
- servlet.setName("spring-ws");
- servlet.setInitParameter("contextConfigLocation", getClass().getResource("server.xml").toString());
- servlet.setInitOrder(1);
- handler.addServlet(servlet, "/*");
+ ServletHolder servletHolder = new ServletHolder(servlet);
+ servletHolder.setName("spring-ws");
+ servletHolder.setInitOrder(1);
+ handler.addServlet(servletHolder, "/*");
server.start();
context = new GenericXmlApplicationContext();
- ConfigurableEnvironment environment = context.getEnvironment();
MockPropertySource propertySource = new MockPropertySource();
propertySource.setProperty("port", connector.getLocalPort());
- MutablePropertySources propertySources = environment.getPropertySources();
- propertySources.replace(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, propertySource);
- propertySources.addFirst(testParameters);
- context.load(getClass(), "client.xml");
+ context.getEnvironment().getPropertySources().replace(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, propertySource);
+ configureContext(context, config.getClientMessageFactoryConfigurator(), "client.xml");
context.refresh();
}
+ void configureContext(GenericApplicationContext context, MessageFactoryConfigurator messageFactoryConfigurator, String relativeConfigLocation) {
+ context.getEnvironment().getPropertySources().addFirst(new MatrixTestCasePropertySource(this));
+ messageFactoryConfigurator.configure(context);
+ XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context);
+ reader.loadBeanDefinitions(
+ new ClassPathResource("common.xml", ScenarioTestCase.class),
+ new ClassPathResource(relativeConfigLocation, getClass()));
+ }
+
@Override
protected void tearDown() throws Exception {
context.close();
Copied: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java (from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java?p2=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java&r1=1598905&r2=1599373&rev=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java Mon Jun 2 21:58:21 2014
@@ -18,19 +18,24 @@
*/
package org.apache.axiom.spring.ws.test;
-import org.apache.axiom.spring.ws.test.jdom.ClientServerTest;
-import org.apache.axiom.spring.ws.test.wsadom.WSAddressingDOMTest;
-import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.Resource;
-public class SpringWSTestSuiteBuilder extends MatrixTestSuiteBuilder {
- @Override
- protected void addTests() {
- addTests("SOAP_11");
- addTests("SOAP_12");
+public final class SimpleMessageFactoryConfigurator implements MessageFactoryConfigurator {
+ private final String name;
+ private final Resource resource;
+
+ public SimpleMessageFactoryConfigurator(String name, Resource resource) {
+ this.name = name;
+ this.resource = resource;
+ }
+
+ public final String getName() {
+ return name;
}
-
- private void addTests(String soapVersion) {
- addTest(new ClientServerTest(soapVersion));
- addTest(new WSAddressingDOMTest(soapVersion));
+
+ public void configure(GenericApplicationContext context) {
+ new XmlBeanDefinitionReader(context).loadBeanDefinitions(resource);
}
}
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTest.java?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTest.java Mon Jun 2 21:58:21 2014
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
public class SpringWSTest extends TestCase {
public static TestSuite suite() {
- SpringWSTestSuiteBuilder builder = new SpringWSTestSuiteBuilder();
+ SpringWSTestSuiteBuilder builder = new SpringWSTestSuiteBuilder(MessageFactoryConfigurator.AXIOM, MessageFactoryConfigurator.SAAJ);
return builder.build();
}
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java Mon Jun 2 21:58:21 2014
@@ -23,14 +23,25 @@ import org.apache.axiom.spring.ws.test.w
import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
public class SpringWSTestSuiteBuilder extends MatrixTestSuiteBuilder {
+ private final MessageFactoryConfigurator messageFactoryConfigurator;
+ private final MessageFactoryConfigurator altMessageFactoryConfigurator;
+
+ public SpringWSTestSuiteBuilder(MessageFactoryConfigurator messageFactoryConfigurator,
+ MessageFactoryConfigurator altMessageFactoryConfigurator) {
+ this.messageFactoryConfigurator = messageFactoryConfigurator;
+ this.altMessageFactoryConfigurator = altMessageFactoryConfigurator;
+ }
+
@Override
protected void addTests() {
- addTests("SOAP_11");
- addTests("SOAP_12");
+ addTests(new ScenarioConfig(altMessageFactoryConfigurator, messageFactoryConfigurator), "SOAP_11");
+ addTests(new ScenarioConfig(altMessageFactoryConfigurator, messageFactoryConfigurator), "SOAP_12");
+ addTests(new ScenarioConfig(messageFactoryConfigurator, altMessageFactoryConfigurator), "SOAP_11");
+ addTests(new ScenarioConfig(messageFactoryConfigurator, altMessageFactoryConfigurator), "SOAP_12");
}
- private void addTests(String soapVersion) {
- addTest(new ClientServerTest(soapVersion));
- addTest(new WSAddressingDOMTest(soapVersion));
+ private void addTests(ScenarioConfig config, String soapVersion) {
+ addTest(new ClientServerTest(config, soapVersion));
+ addTest(new WSAddressingDOMTest(config, soapVersion));
}
}
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java Mon Jun 2 21:58:21 2014
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.spring.ws.test.jdom;
+import org.apache.axiom.spring.ws.test.ScenarioConfig;
import org.apache.axiom.spring.ws.test.ScenarioTestCase;
import org.jdom2.input.SAXBuilder;
import org.jdom2.transform.JDOMResult;
@@ -25,8 +26,8 @@ import org.jdom2.transform.JDOMSource;
import org.springframework.ws.client.core.WebServiceTemplate;
public class ClientServerTest extends ScenarioTestCase {
- public ClientServerTest(String soapVersion) {
- super(soapVersion);
+ public ClientServerTest(ScenarioConfig config, String soapVersion) {
+ super(config, soapVersion);
}
@Override
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/wsadom/WSAddressingDOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/wsadom/WSAddressingDOMTest.java?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/wsadom/WSAddressingDOMTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/wsadom/WSAddressingDOMTest.java Mon Jun 2 21:58:21 2014
@@ -23,6 +23,7 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
+import org.apache.axiom.spring.ws.test.ScenarioConfig;
import org.apache.axiom.spring.ws.test.ScenarioTestCase;
import org.springframework.ws.client.core.WebServiceTemplate;
import org.springframework.ws.soap.addressing.client.ActionCallback;
@@ -30,8 +31,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class WSAddressingDOMTest extends ScenarioTestCase {
- public WSAddressingDOMTest(String soapVersion) {
- super(soapVersion);
+ public WSAddressingDOMTest(ScenarioConfig config, String soapVersion) {
+ super(config, soapVersion);
}
@Override
Copied: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/axiom-message-factory.xml (from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/axiom-message-factory.xml?p2=webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/axiom-message-factory.xml&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml&r1=1598905&r2=1599373&rev=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/axiom-message-factory.xml Mon Jun 2 21:58:21 2014
@@ -18,26 +18,15 @@
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xmlns:sws="http://www.springframework.org/schema/web-services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd
- http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
-
- <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-
- <context:component-scan base-package="org.apache.axiom.spring.ws.test.jdom"/>
-
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
<bean name="messageFactory" class="org.apache.axiom.spring.ws.soap.AxiomSoapMessageFactory">
<property name="soapVersion">
<util:constant static-field="org.springframework.ws.soap.SoapVersion.${soapVersion}"/>
</property>
</bean>
<bean class="org.apache.axiom.spring.ws.AxiomOptimizationEnabler"/>
-
- <sws:annotation-driven/>
</beans>
Copied: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/common.xml (from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/common.xml?p2=webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/common.xml&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml&r1=1598905&r2=1599373&rev=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/common.xml Mon Jun 2 21:58:21 2014
@@ -18,21 +18,7 @@
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
-
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-
- <bean class="org.springframework.ws.client.core.WebServiceTemplate">
- <constructor-arg>
- <bean class="org.apache.axiom.spring.ws.soap.AxiomSoapMessageFactory">
- <property name="soapVersion">
- <util:constant static-field="org.springframework.ws.soap.SoapVersion.${soapVersion}"/>
- </property>
- </bean>
- </constructor-arg>
- <property name="defaultUri" value="http://localhost:${port}/"/>
- </bean>
</beans>
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/client.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/client.xml?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/client.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/client.xml Mon Jun 2 21:58:21 2014
@@ -18,21 +18,10 @@
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
-
- <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
<bean class="org.springframework.ws.client.core.WebServiceTemplate">
- <constructor-arg>
- <bean class="org.apache.axiom.spring.ws.soap.AxiomSoapMessageFactory">
- <property name="soapVersion">
- <util:constant static-field="org.springframework.ws.soap.SoapVersion.${soapVersion}"/>
- </property>
- </bean>
- </constructor-arg>
+ <constructor-arg ref="messageFactory"/>
<property name="defaultUri" value="http://localhost:${port}/"/>
</bean>
</beans>
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml Mon Jun 2 21:58:21 2014
@@ -19,25 +19,12 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
xmlns:sws="http://www.springframework.org/schema/web-services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
-
- <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-
<context:component-scan base-package="org.apache.axiom.spring.ws.test.jdom"/>
-
- <bean name="messageFactory" class="org.apache.axiom.spring.ws.soap.AxiomSoapMessageFactory">
- <property name="soapVersion">
- <util:constant static-field="org.springframework.ws.soap.SoapVersion.${soapVersion}"/>
- </property>
- </bean>
- <bean class="org.apache.axiom.spring.ws.AxiomOptimizationEnabler"/>
-
<sws:annotation-driven/>
</beans>
Copied: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/saaj-message-factory.xml (from r1598905, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/saaj-message-factory.xml?p2=webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/saaj-message-factory.xml&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml&r1=1598905&r2=1599373&rev=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/server.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/saaj-message-factory.xml Mon Jun 2 21:58:21 2014
@@ -18,26 +18,14 @@
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xmlns:sws="http://www.springframework.org/schema/web-services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd
- http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
-
- <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-
- <context:component-scan base-package="org.apache.axiom.spring.ws.test.jdom"/>
-
- <bean name="messageFactory" class="org.apache.axiom.spring.ws.soap.AxiomSoapMessageFactory">
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
+ <bean name="messageFactory" class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory">
<property name="soapVersion">
<util:constant static-field="org.springframework.ws.soap.SoapVersion.${soapVersion}"/>
</property>
</bean>
- <bean class="org.apache.axiom.spring.ws.AxiomOptimizationEnabler"/>
-
- <sws:annotation-driven/>
</beans>
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/client.xml Mon Jun 2 21:58:21 2014
@@ -18,21 +18,10 @@
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
-
- <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
<bean class="org.springframework.ws.client.core.WebServiceTemplate">
- <constructor-arg>
- <bean class="org.apache.axiom.spring.ws.soap.AxiomSoapMessageFactory">
- <property name="soapVersion">
- <util:constant static-field="org.springframework.ws.soap.SoapVersion.${soapVersion}"/>
- </property>
- </bean>
- </constructor-arg>
+ <constructor-arg ref="messageFactory"/>
<property name="defaultUri" value="http://localhost:${port}/"/>
</bean>
</beans>
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/server.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/server.xml?rev=1599373&r1=1599372&r2=1599373&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/server.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/server.xml Mon Jun 2 21:58:21 2014
@@ -19,25 +19,12 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
xmlns:sws="http://www.springframework.org/schema/web-services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
-
- <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-
<context:component-scan base-package="org.apache.axiom.spring.ws.test.wsadom"/>
-
- <bean name="messageFactory" class="org.apache.axiom.spring.ws.soap.AxiomSoapMessageFactory">
- <property name="soapVersion">
- <util:constant static-field="org.springframework.ws.soap.SoapVersion.${soapVersion}"/>
- </property>
- </bean>
- <bean class="org.apache.axiom.spring.ws.AxiomOptimizationEnabler"/>
-
<sws:annotation-driven/>
</beans>