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/04 00:38:13 UTC
svn commit: r1599823 - in /webservices/axiom/trunk: ./
axiom-spring-ws-testsuite/ axiom-spring-ws-testsuite/src/
axiom-spring-ws-testsuite/src/main/ axiom-spring-ws-testsuite/src/main/java/
axiom-spring-ws-testsuite/src/main/java/org/ axiom-spring-ws-t...
Author: veithen
Date: Tue Jun 3 22:38:11 2014
New Revision: 1599823
URL: http://svn.apache.org/r1599823
Log:
AXIOM-447: Move the test scenarios to a separate module so that we can later reuse them as regression tests for the original Spring-WS Axiom support. Also validate the test scenarios using SAAJ.
Added:
webservices/axiom/trunk/axiom-spring-ws-testsuite/pom.xml (with props)
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MatrixTestCasePropertySource.java
- copied, changed from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MatrixTestCasePropertySource.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java
- copied, changed from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioConfig.java
- copied, changed from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioTestCase.java
- copied, changed from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioTestCase.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SimpleMessageFactoryConfigurator.java
- copied, changed from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java
- copied, changed from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/
- copied from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/
- copied from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/wsadom/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/common.xml
- copied unchanged from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/common.xml
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/jdom/
- copied from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/saaj-message-factory.xml
- copied unchanged from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/saaj-message-factory.xml
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/wsadom/
- copied from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/springws/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/springws/SpringWSTest.java (with props)
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/resources/
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/resources/log4j.properties
- copied unchanged from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j.properties
Removed:
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MatrixTestCasePropertySource.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java
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/SimpleMessageFactoryConfigurator.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/
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/wsadom/
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/common.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/saaj-message-factory.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/wsadom/
Modified:
webservices/axiom/trunk/axiom-spring-ws-testsuite/ (props changed)
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/CalculatorEndpoint.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/ClientServerTest.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/EchoEndpoint.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/WSAddressingDOMTest.java
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/jdom/server.xml
webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/wsadom/server.xml
webservices/axiom/trunk/axiom-spring-ws/pom.xml
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/AxiomMessageFactoryConfigurator.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/DOOMSpringWSTest.java
webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/LLOMSpringWSTest.java
webservices/axiom/trunk/pom.xml
Propchange: webservices/axiom/trunk/axiom-spring-ws-testsuite/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 3 22:38:11 2014
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: webservices/axiom/trunk/axiom-spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/pom.xml?rev=1599823&view=auto
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/pom.xml (added)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/pom.xml Tue Jun 3 22:38:11 2014
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom</artifactId>
+ <version>1.2.15-SNAPSHOT</version>
+ </parent>
+ <artifactId>axiom-spring-ws-testsuite</artifactId>
+ <name>Spring-WS Test Suite</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.ws</groupId>
+ <artifactId>spring-ws-core</artifactId>
+ <version>2.1.3.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-testutils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.6.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>7.5.4.v20111024</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>7.5.4.v20111024</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>3.2.2.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: webservices/axiom/trunk/axiom-spring-ws-testsuite/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MatrixTestCasePropertySource.java (from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MatrixTestCasePropertySource.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MatrixTestCasePropertySource.java?p2=webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MatrixTestCasePropertySource.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MatrixTestCasePropertySource.java&r1=1599747&r2=1599823&rev=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MatrixTestCasePropertySource.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MatrixTestCasePropertySource.java Tue Jun 3 22:38:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test;
+package org.apache.axiom.ts.springws;
import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.springframework.core.env.PropertySource;
Copied: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java (from r1599747, 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-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java?p2=webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java&r1=1599747&r2=1599823&rev=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/MessageFactoryConfigurator.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java Tue Jun 3 22:38:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test;
+package org.apache.axiom.ts.springws;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
Copied: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioConfig.java (from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioConfig.java?p2=webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioConfig.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java&r1=1599747&r2=1599823&rev=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioConfig.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioConfig.java Tue Jun 3 22:38:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test;
+package org.apache.axiom.ts.springws;
public final class ScenarioConfig {
private final MessageFactoryConfigurator clientMessageFactoryConfigurator;
Copied: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioTestCase.java (from r1599747, 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-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioTestCase.java?p2=webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioTestCase.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/ScenarioTestCase.java&r1=1599747&r2=1599823&rev=1599823&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-testsuite/src/main/java/org/apache/axiom/ts/springws/ScenarioTestCase.java Tue Jun 3 22:38:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test;
+package org.apache.axiom.ts.springws;
import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.eclipse.jetty.server.Connector;
Copied: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SimpleMessageFactoryConfigurator.java (from r1599747, webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SimpleMessageFactoryConfigurator.java?p2=webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SimpleMessageFactoryConfigurator.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java&r1=1599747&r2=1599823&rev=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SimpleMessageFactoryConfigurator.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SimpleMessageFactoryConfigurator.java Tue Jun 3 22:38:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test;
+package org.apache.axiom.ts.springws;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.GenericApplicationContext;
Copied: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java (from r1599747, 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-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java?p2=webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java&p1=webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/SpringWSTestSuiteBuilder.java&r1=1599747&r2=1599823&rev=1599823&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-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuiteBuilder.java Tue Jun 3 22:38:11 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test;
+package org.apache.axiom.ts.springws;
-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.apache.axiom.ts.springws.jdom.ClientServerTest;
+import org.apache.axiom.ts.springws.wsadom.WSAddressingDOMTest;
public class SpringWSTestSuiteBuilder extends MatrixTestSuiteBuilder {
private final MessageFactoryConfigurator messageFactoryConfigurator;
@@ -36,8 +36,10 @@ public class SpringWSTestSuiteBuilder ex
protected void addTests() {
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");
+ if (altMessageFactoryConfigurator != messageFactoryConfigurator) {
+ addTests(new ScenarioConfig(messageFactoryConfigurator, altMessageFactoryConfigurator), "SOAP_11");
+ addTests(new ScenarioConfig(messageFactoryConfigurator, altMessageFactoryConfigurator), "SOAP_12");
+ }
}
private void addTests(ScenarioConfig config, String soapVersion) {
Modified: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/CalculatorEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/CalculatorEndpoint.java?rev=1599823&r1=1599747&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/CalculatorEndpoint.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/CalculatorEndpoint.java Tue Jun 3 22:38:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test.jdom;
+package org.apache.axiom.ts.springws.jdom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/ClientServerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/ClientServerTest.java?rev=1599823&r1=1599747&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/ClientServerTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/jdom/ClientServerTest.java Tue Jun 3 22:38:11 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test.jdom;
+package org.apache.axiom.ts.springws.jdom;
-import org.apache.axiom.spring.ws.test.ScenarioConfig;
-import org.apache.axiom.spring.ws.test.ScenarioTestCase;
+import org.apache.axiom.ts.springws.ScenarioConfig;
+import org.apache.axiom.ts.springws.ScenarioTestCase;
import org.jdom2.input.SAXBuilder;
import org.jdom2.transform.JDOMResult;
import org.jdom2.transform.JDOMSource;
Modified: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/EchoEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/EchoEndpoint.java?rev=1599823&r1=1599747&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/EchoEndpoint.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/EchoEndpoint.java Tue Jun 3 22:38:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test.wsadom;
+package org.apache.axiom.ts.springws.wsadom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/WSAddressingDOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/WSAddressingDOMTest.java?rev=1599823&r1=1599747&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/WSAddressingDOMTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/wsadom/WSAddressingDOMTest.java Tue Jun 3 22:38:11 2014
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.spring.ws.test.wsadom;
+package org.apache.axiom.ts.springws.wsadom;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
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.apache.axiom.ts.springws.ScenarioConfig;
+import org.apache.axiom.ts.springws.ScenarioTestCase;
import org.springframework.ws.client.core.WebServiceTemplate;
import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.w3c.dom.Document;
Modified: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/jdom/server.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/jdom/server.xml?rev=1599823&r1=1599747&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/jdom/server.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/jdom/server.xml Tue Jun 3 22:38:11 2014
@@ -25,6 +25,6 @@
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/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
- <context:component-scan base-package="org.apache.axiom.spring.ws.test.jdom"/>
+ <context:component-scan base-package="org.apache.axiom.ts.springws.jdom"/>
<sws:annotation-driven/>
</beans>
Modified: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/wsadom/server.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/wsadom/server.xml?rev=1599823&r1=1599747&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/wsadom/server.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/wsadom/server.xml Tue Jun 3 22:38:11 2014
@@ -25,6 +25,6 @@
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/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
- <context:component-scan base-package="org.apache.axiom.spring.ws.test.wsadom"/>
+ <context:component-scan base-package="org.apache.axiom.ts.springws.wsadom"/>
<sws:annotation-driven/>
</beans>
Added: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/springws/SpringWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/springws/SpringWSTest.java?rev=1599823&view=auto
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/springws/SpringWSTest.java (added)
+++ webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/springws/SpringWSTest.java Tue Jun 3 22:38:11 2014
@@ -0,0 +1,30 @@
+/*
+ * 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.ts.springws;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class SpringWSTest extends TestCase {
+ public static TestSuite suite() {
+ SpringWSTestSuiteBuilder builder = new SpringWSTestSuiteBuilder(MessageFactoryConfigurator.SAAJ, MessageFactoryConfigurator.SAAJ);
+
+ return builder.build();
+ }
+}
Propchange: webservices/axiom/trunk/axiom-spring-ws-testsuite/src/test/java/org/apache/axiom/ts/springws/SpringWSTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/axiom-spring-ws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/pom.xml?rev=1599823&r1=1599822&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/pom.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/pom.xml Tue Jun 3 22:38:11 2014
@@ -46,25 +46,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.6.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>7.5.4.v20111024</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>7.5.4.v20111024</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -86,20 +67,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- <version>2.0.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>3.2.2.RELEASE</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-spring-ws-testsuite</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -113,15 +83,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/LLOMSpringWSTest.java</include>
- <include>**/DOOMSpringWSTest.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/AxiomMessageFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/AxiomMessageFactoryConfigurator.java?rev=1599823&r1=1599822&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/AxiomMessageFactoryConfigurator.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/AxiomMessageFactoryConfigurator.java Tue Jun 3 22:38:11 2014
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.spring.ws.test;
+import org.apache.axiom.ts.springws.MessageFactoryConfigurator;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/DOOMSpringWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/DOOMSpringWSTest.java?rev=1599823&r1=1599822&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/DOOMSpringWSTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/DOOMSpringWSTest.java Tue Jun 3 22:38:11 2014
@@ -19,6 +19,8 @@
package org.apache.axiom.spring.ws.test;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.ts.springws.MessageFactoryConfigurator;
+import org.apache.axiom.ts.springws.SpringWSTestSuiteBuilder;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/LLOMSpringWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/LLOMSpringWSTest.java?rev=1599823&r1=1599822&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/LLOMSpringWSTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/LLOMSpringWSTest.java Tue Jun 3 22:38:11 2014
@@ -19,6 +19,8 @@
package org.apache.axiom.spring.ws.test;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.ts.springws.MessageFactoryConfigurator;
+import org.apache.axiom.ts.springws.SpringWSTestSuiteBuilder;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1599823&r1=1599822&r2=1599823&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Tue Jun 3 22:38:11 2014
@@ -355,6 +355,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<properties>
@@ -868,6 +873,7 @@
<module>modules/axiom-integration</module>
<module>modules/axiom-all</module>
<module>modules/axiom-samples</module>
+ <module>axiom-spring-ws-testsuite</module>
<module>axiom-spring-ws</module>
<module>systests</module>
<module>forbiddenapi-signatures</module>