Author: veithen
Date: Wed Oct 3 15:04:43 2012
New Revision: 1393525
URL: http://svn.apache.org/viewvc?rev=1393525&view=rev
Log:
* Added a couple of mock services that will be used to replace some external
Web services that are no longer available.
* Use these mock services to validate the processing of GET requests in the
java.net HTTP transport.
Added:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestGET.java
(with props)
axis/axis1/java/trunk/interop-mock/ (with props)
axis/axis1/java/trunk/interop-mock/pom.xml (with props)
axis/axis1/java/trunk/interop-mock/src/
axis/axis1/java/trunk/interop-mock/src/main/
axis/axis1/java/trunk/interop-mock/src/main/java/
axis/axis1/java/trunk/interop-mock/src/main/java/org/
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Constants.java
(with props)
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/DOMUtil.java
(with props)
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java
(with props)
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockGetHandler.java
(with props)
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockPostHandler.java
(with props)
axis/axis1/java/trunk/interop-mock/src/main/resources/
axis/axis1/java/trunk/interop-mock/src/main/resources/log4j.properties
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt
(with props)
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml
(with props)
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response-corrected.xml
(with props)
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml
(with props)
axis/axis1/java/trunk/interop-mock/src/main/webapp/
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(with props)
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/web.xml (with
props)
Modified:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/main/java/org/apache/axis/transport/http/javanet/JavaNetHTTPSender.java
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestErrors.java
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestSOAPService.java
axis/axis1/java/trunk/pom.xml
Modified: axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml?rev=1393525&r1=1393524&r2=1393525&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml Wed Oct 3
15:04:43 2012
@@ -54,6 +54,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>interop-mock</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -109,7 +116,9 @@
<phase>pre-integration-test</phase>
<configuration>
<portNames>
- <portName>testPort</portName>
+ <portName>axis.httpPort</portName>
+ <portName>jetty.httpPort</portName>
+ <portName>jetty.stopPort</portName>
</portNames>
</configuration>
</execution>
@@ -126,7 +135,7 @@
<goal>start-server</goal>
</goals>
<configuration>
- <port>${testPort}</port>
+ <port>${axis.httpPort}</port>
<wsdds>
<wsdd>
<directory>${project.build.directory}</directory>
@@ -146,6 +155,56 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ <includeTypes>war</includeTypes>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <configuration>
+ <war>${project.build.directory}/interop-mock.war</war>
+ <stopKey>foo</stopKey>
+ <stopPort>${jetty.stopPort}</stopPort>
+ <connectors>
+ <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>${jetty.httpPort}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-war</goal>
+ </goals>
+ <configuration>
+ <daemon>true</daemon>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
@@ -158,7 +217,8 @@
<include>**/Test*.java</include>
</includes>
<systemPropertyVariables>
- <testPort>${testPort}</testPort>
+ <axis.httpPort>${axis.httpPort}</axis.httpPort>
+
<jetty.httpPort>${jetty.httpPort}</jetty.httpPort>
</systemPropertyVariables>
</configuration>
</execution>
Modified:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/main/java/org/apache/axis/transport/http/javanet/JavaNetHTTPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/main/java/org/apache/axis/transport/http/javanet/JavaNetHTTPSender.java?rev=1393525&r1=1393524&r2=1393525&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/main/java/org/apache/axis/transport/http/javanet/JavaNetHTTPSender.java
(original)
+++
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/main/java/org/apache/axis/transport/http/javanet/JavaNetHTTPSender.java
Wed Oct 3 15:04:43 2012
@@ -67,8 +67,10 @@ public class JavaNetHTTPSender extends B
// Create and configure HttpURLConnection
HttpURLConnection connection =
(HttpURLConnection)url.openConnection();
connection.setDoInput(true);
- connection.setDoOutput(true);
- connection.setChunkedStreamingMode(0); // 0 means default chunk
size
+ if (request != null) {
+ connection.setDoOutput(true);
+ connection.setChunkedStreamingMode(0); // 0 means default
chunk size
+ }
int timeout = msgContext.getTimeout();
connection.setConnectTimeout(timeout);
connection.setReadTimeout(timeout);
@@ -98,14 +100,17 @@ public class JavaNetHTTPSender extends B
connection.addRequestProperty(HTTPConstants.HEADER_AUTHORIZATION, "Basic " +
Base64.encode(token));
}
- // Set "Content-Type" header
- connection.setRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE,
- request.getContentType(msgContext.getSOAPConstants()));
-
- // Send request
- OutputStream out = connection.getOutputStream();
- request.writeTo(out);
- out.close();
+ if (request != null) {
+ // Set "Content-Type" header
+
connection.setRequestProperty(HTTPConstants.HEADER_CONTENT_TYPE,
+ request.getContentType(msgContext.getSOAPConstants()));
+
+ // Send request
+ OutputStream out = connection.getOutputStream();
+ request.writeTo(out);
+ out.close();
+ }
+
// Process response
int statusCode = connection.getResponseCode();
Modified:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestErrors.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestErrors.java?rev=1393525&r1=1393524&r2=1393525&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestErrors.java
(original)
+++
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestErrors.java
Wed Oct 3 15:04:43 2012
@@ -27,7 +27,7 @@ import org.w3c.dom.Element;
public class TestErrors extends TestCase {
public void test404() throws Exception {
- Call call = new Call("http://localhost:"; +
System.getProperty("testPort", "8080") + "/doesnt-exist");
+ Call call = new Call("http://localhost:"; +
System.getProperty("axis.httpPort", "8080") + "/doesnt-exist");
call.setOperationName("test");
try {
call.invoke(new Object[0]);
Added:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestGET.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestGET.java?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestGET.java
(added)
+++
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestGET.java
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,44 @@
+/*
+ * 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.axis.transport.http.javanet;
+
+import junit.framework.TestCase;
+
+import org.apache.axis.Constants;
+import org.apache.axis.client.Call;
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
+import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.soap.SOAP12Constants;
+import org.apache.axis.soap.SOAPConstants;
+import org.apache.axis.types.Time;
+
+public class TestGET extends TestCase {
+ public void test() throws Exception {
+ Call call = new Call("http://localhost:"; +
System.getProperty("jetty.httpPort", "9080") + "/soap12/add-test-doc/getTime");
+ call.setSOAPVersion(SOAPConstants.SOAP12_CONSTANTS);
+ call.setProperty(SOAP12Constants.PROP_WEBMETHOD, "GET");
+ call.setOperationStyle(Style.DOCUMENT);
+ call.setOperationUse(Use.LITERAL);
+ call.invoke();
+ SOAPEnvelope env =
call.getMessageContext().getResponseMessage().getSOAPEnvelope();
+ Object result = env.getFirstBody().getValueAsType(Constants.XSD_TIME);
+ assertEquals(Time.class, result.getClass());
+ }
+}
Propchange:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestGET.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestSOAPService.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestSOAPService.java?rev=1393525&r1=1393524&r2=1393525&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestSOAPService.java
(original)
+++
axis/axis1/java/trunk/axis-rt-transports-http-javanet/src/test/java/org/apache/axis/transport/http/javanet/TestSOAPService.java
Wed Oct 3 15:04:43 2012
@@ -27,7 +27,7 @@ public class TestSOAPService extends Tes
protected void setUp() throws Exception {
dummy = new DummyServiceLocator().getDummy(new URL(
- "http://localhost:"; + System.getProperty("testPort", "8080") +
"/axis/services/Dummy"));
+ "http://localhost:"; + System.getProperty("axis.httpPort",
"8080") + "/axis/services/Dummy"));
}
public void testTwoWay() throws Exception {
Propchange: axis/axis1/java/trunk/interop-mock/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 3 15:04:43 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: axis/axis1/java/trunk/interop-mock/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/pom.xml?rev=1393525&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/pom.xml (added)
+++ axis/axis1/java/trunk/interop-mock/pom.xml Wed Oct 3 15:04:43 2012
@@ -0,0 +1,94 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>interop-mock</artifactId>
+ <name>Interoperability mock services</name>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>3.1.2.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <configuration>
+ <connectors>
+ <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>9080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ <webAppConfig>
+ <contextPath>/</contextPath>
+
<descriptor>src/main/webapp/WEB-INF/web.xml</descriptor>
+ </webAppConfig>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/interop-mock/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Constants.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Constants.java?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Constants.java
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Constants.java
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,25 @@
+/*
+ * 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.axis.test.interop.mock;
+
+public final class Constants {
+ private Constants() {}
+
+ public static final String CHARSET_PARAM = "charset";
+}
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/DOMUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/DOMUtil.java?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/DOMUtil.java
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/DOMUtil.java
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,84 @@
+/*
+ * 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.axis.test.interop.mock;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.springframework.core.io.Resource;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+public final class DOMUtil {
+ private final static DocumentBuilder documentBuilder;
+
+ static {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setIgnoringComments(true);
+ try {
+ documentBuilder = factory.newDocumentBuilder();
+ } catch (ParserConfigurationException ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private DOMUtil() {}
+
+ public static Document parse(Resource resource) throws SAXException,
IOException {
+ InputStream in = resource.getInputStream();
+ try {
+ return documentBuilder.parse(in);
+ } finally {
+ in.close();
+ }
+ }
+
+ public static Document parse(InputStream in, String encoding) throws
SAXException, IOException {
+ InputSource is = new InputSource(in);
+ is.setEncoding(encoding);
+ return documentBuilder.parse(is);
+ }
+
+ public static void removeWhitespace(Element element) {
+ Node previousChild = null;
+ Node child = element.getFirstChild();
+ while (child != null) {
+ Node nextChild = child.getNextSibling();
+ switch (child.getNodeType()) {
+ case Node.TEXT_NODE:
+ if (previousChild != null || nextChild != null) {
+ element.removeChild(child);
+ }
+ break;
+ case Node.ELEMENT_NODE:
+ removeWhitespace((Element)child);
+ }
+ previousChild = child;
+ child = nextChild;
+ }
+ }
+}
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/DOMUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,144 @@
+/*
+ * 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.axis.test.interop.mock;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.Resource;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class Exchange implements InitializingBean {
+ private static final Log log = LogFactory.getLog(Exchange.class);
+
+ private Resource request;
+ private Resource response;
+ private Element requestMessage;
+ private Element responseMessage;
+
+ public Resource getRequest() {
+ return request;
+ }
+
+ public void setRequest(Resource request) {
+ this.request = request;
+ }
+
+ public Resource getResponse() {
+ return response;
+ }
+
+ public void setResponse(Resource response) {
+ this.response = response;
+ }
+
+ public void afterPropertiesSet() throws Exception {
+ requestMessage = DOMUtil.parse(request).getDocumentElement();
+ DOMUtil.removeWhitespace(requestMessage);
+ responseMessage = DOMUtil.parse(response).getDocumentElement();
+ DOMUtil.removeWhitespace(responseMessage);
+ }
+
+ public Element matchRequest(Element root) {
+ if (log.isDebugEnabled()) {
+ log.debug("Attempting to match " + request);
+ }
+ Map<String,String> inferredVariables = new HashMap<String,String>();
+ if (match(requestMessage, root, inferredVariables)) {
+ log.debug("Message matches");
+ return responseMessage;
+ } else {
+ log.debug("Message doesn't match");
+ return null;
+ }
+ }
+
+ private void getLocation(StringBuilder buffer, Element element) {
+ Node parent = element.getParentNode();
+ if (parent instanceof Element) {
+ getLocation(buffer, (Element)parent);
+ buffer.append('/');
+ }
+ String prefix = element.getPrefix();
+ if (prefix != null) {
+ buffer.append(prefix);
+ buffer.append(':');
+ }
+ buffer.append(element.getLocalName());
+ }
+
+ private String getLocation(Element element) {
+ StringBuilder buffer = new StringBuilder();
+ getLocation(buffer, element);
+ return buffer.toString();
+ }
+
+ private boolean match(Element expected, Element actual, Map<String,String>
inferredVariables) {
+ if (!ObjectUtils.equals(expected.getLocalName(),
actual.getLocalName())) {
+ if (log.isDebugEnabled()) {
+ log.debug("Local name mismatch: expected=" +
expected.getLocalName() + "; actual=" + actual.getLocalName());
+ }
+ return false;
+ }
+ if (!ObjectUtils.equals(expected.getNamespaceURI(),
actual.getNamespaceURI())) {
+ if (log.isDebugEnabled()) {
+ log.debug("Namespace mismatch: expected=" +
expected.getNamespaceURI() + "; actual=" + actual.getNamespaceURI());
+ }
+ return false;
+ }
+ // TODO: compare attributes first
+ NodeList expectedChildren = expected.getChildNodes();
+ NodeList actualChildren = actual.getChildNodes();
+ if (expectedChildren.getLength() != actualChildren.getLength()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Children count mismatch at " +
getLocation(expected) + ": expected=" + expectedChildren.getLength() + ";
actual=" + actualChildren.getLength());
+ }
+ return false;
+ }
+ for (int i=0; i<expectedChildren.getLength(); i++) {
+ Node expectedChild = expectedChildren.item(i);
+ Node actualChild = actualChildren.item(i);
+ if (expectedChild.getNodeType() != actualChild.getNodeType()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Child type mismatch");
+ }
+ return false;
+ }
+ switch (expectedChild.getNodeType()) {
+ case Node.ELEMENT_NODE:
+ if (!match((Element)expectedChild, (Element)actualChild,
inferredVariables)) {
+ return false;
+ }
+ break;
+ default:
+ if (log.isDebugEnabled()) {
+ log.debug("Unexpected node type");
+ }
+ throw new IllegalStateException("Unexpected node type");
+ }
+ }
+ return true;
+ }
+}
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/Exchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockGetHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockGetHandler.java?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockGetHandler.java
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockGetHandler.java
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,79 @@
+/*
+ * 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.axis.test.interop.mock;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.web.HttpRequestHandler;
+
+public class MockGetHandler implements HttpRequestHandler {
+ private static final Log log = LogFactory.getLog(MockGetHandler.class);
+
+ private String contentType;
+ private Resource response;
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public void setResponse(Resource response) {
+ this.response = response;
+ }
+
+ public void handleRequest(HttpServletRequest httpRequest,
HttpServletResponse httpResponse) throws ServletException, IOException {
+ if (!httpRequest.getMethod().equals("GET")) {
+ httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "This
endpoint only supports GET requests");
+ return;
+ }
+ httpResponse.setContentType(contentType + "; " +
Constants.CHARSET_PARAM + "=UTF-8");
+ Transformer transformer;
+ try {
+ transformer = TransformerFactory.newInstance().newTransformer();
+ } catch (TransformerConfigurationException ex) {
+ throw new ServletException("Unexpected exception", ex);
+ }
+ transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+ if (log.isDebugEnabled()) {
+ log.debug("Returning " + response);
+ }
+ InputStream in = response.getInputStream();
+ try {
+ transformer.transform(new StreamSource(in), new
StreamResult(httpResponse.getOutputStream()));
+ } catch (TransformerException ex) {
+ throw new ServletException(ex);
+ } finally {
+ in.close();
+ }
+ }
+}
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockGetHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockPostHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockPostHandler.java?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockPostHandler.java
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockPostHandler.java
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,126 @@
+/*
+ * 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.axis.test.interop.mock;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+
+import javax.activation.MimeType;
+import javax.activation.MimeTypeParseException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.HttpRequestHandler;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+public class MockPostHandler implements HttpRequestHandler {
+ private static final Log log = LogFactory.getLog(MockPostHandler.class);
+
+ private String contentType;
+ private List<Exchange> exchanges;
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public void setExchanges(List<Exchange> exchanges) {
+ this.exchanges = exchanges;
+ }
+
+ public void handleRequest(HttpServletRequest httpRequest,
HttpServletResponse httpResponse) throws ServletException, IOException {
+ if (!httpRequest.getMethod().equals("POST")) {
+ httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "This
endpoint only supports POST requests");
+ return;
+ }
+ String requestContentTypeHeader = httpRequest.getContentType();
+ if (requestContentTypeHeader == null) {
+ httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "No
Content-Type header");
+ return;
+ }
+ MimeType requestContentType;
+ try {
+ requestContentType = new MimeType(requestContentTypeHeader);
+ } catch (MimeTypeParseException ex) {
+ httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST,
"Invalid Content-Type header: " + ex.getMessage());
+ return;
+ }
+ if
(!requestContentType.getBaseType().toLowerCase(Locale.ENGLISH).equals(contentType))
{
+
httpResponse.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, "Only " +
contentType + " is supported");
+ return;
+ }
+ String charset =
requestContentType.getParameter(Constants.CHARSET_PARAM);
+ Document requestDocument;
+ try {
+ requestDocument = DOMUtil.parse(httpRequest.getInputStream(),
charset);
+ } catch (SAXException ex) {
+ httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST,
"Unparsable request " + ex.getMessage());
+ return;
+ }
+ if (charset == null) {
+ charset = requestDocument.getXmlEncoding();
+ if (log.isDebugEnabled()) {
+ log.debug("Setting charset from request entity: " + charset);
+ }
+ }
+ Element responseMessage = null;
+ for (Exchange exchange : exchanges) {
+ responseMessage =
exchange.matchRequest(requestDocument.getDocumentElement());
+ if (responseMessage != null) {
+ break;
+ }
+ }
+ if (responseMessage == null) {
+
httpResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Don't
know how to respond");
+ return;
+ }
+ MimeType responseContentType;
+ try {
+ responseContentType = new MimeType(contentType);
+ } catch (MimeTypeParseException ex) {
+ throw new ServletException("Unexpected exception", ex);
+ }
+ responseContentType.setParameter(Constants.CHARSET_PARAM, charset);
+ httpResponse.setContentType(responseContentType.toString());
+ Transformer transformer;
+ try {
+ transformer = TransformerFactory.newInstance().newTransformer();
+ } catch (TransformerConfigurationException ex) {
+ throw new ServletException("Unexpected exception", ex);
+ }
+ transformer.setOutputProperty(OutputKeys.ENCODING, charset);
+ try {
+ transformer.transform(new DOMSource(responseMessage), new
StreamResult(httpResponse.getOutputStream()));
+ } catch (TransformerException ex) {
+ throw new ServletException(ex);
+ }
+ }
+}
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/java/org/apache/axis/test/interop/mock/MockPostHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: axis/axis1/java/trunk/interop-mock/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/log4j.properties?rev=1393525&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/log4j.properties
(added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/log4j.properties Wed
Oct 3 15:04:43 2012
@@ -0,0 +1,26 @@
+#
+# 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.
+#
+
+log4j.rootLogger=INFO, CONSOLE
+
+log4j.logger.org.apache.axis.test.interop.mock=DEBUG
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c
- %m%n
Added: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt?rev=1393525&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt Wed
Oct 3 15:04:43 2012
@@ -0,0 +1,2 @@
+This folder contains request/responses extracted from SOAP Version 1.2
Specification Assertions and
+Test Collection (Second Edition). See
http://www.w3.org/TR/2007/REC-soap12-testcollection-20070427/.
\ No newline at end of file
Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <env:Body>
+ <sb:echoString xmlns:sb="http://soapinterop.org/";
+ env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"/>
+ </env:Body>
+</env:Envelope>
\ No newline at end of file
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-request.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response-corrected.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response-corrected.xml?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response-corrected.xml
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response-corrected.xml
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope";>
+ <env:Body>
+ <env:Fault>
+ <env:Code>
+ <env:Value xmlns:ns1="http://www.w3.org/2003/05/soap-envelope";>
+ ns1:Sender
+ </env:Value>
+ <env:Subcode>
+ <env:Value xmlns:ns2="http://www.w3.org/2003/05/soap-rpc";>
+ ns2:BadArguments
+ </env:Value>
+ </env:Subcode>
+ </env:Code>
+ <env:Reason>
+ <env:Text xml:lang="en">Missing parameter.</env:Text>
+ </env:Reason>
+ </env:Fault>
+ </env:Body>
+</env:Envelope>
\ No newline at end of file
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-1-response-corrected.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope";>
+ <env:Body>
+ <sb:time xmlns:sb="http://soapinterop.org/";>09:21:19Z</sb:time>
+ </env:Body>
+</env:Envelope>
\ No newline at end of file
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/resources/w3c/XMLP-2-response.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1393525&view=auto
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(added)
+++
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Wed Oct 3 15:04:43 2012
@@ -0,0 +1,41 @@
+<?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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ 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.1.xsd";>
+ <bean id="handlerMapping"
class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping"/>
+
+ <bean name="/soap12/add-test-rpc"
class="org.apache.axis.test.interop.mock.MockPostHandler">
+ <property name="contentType" value="application/soap+xml"/>
+ <property name="exchanges">
+ <list>
+ <bean class="org.apache.axis.test.interop.mock.Exchange">
+ <property name="request"
value="classpath:w3c/XMLP-1-request.xml"/>
+ <property name="response"
value="classpath:w3c/XMLP-1-response-corrected.xml"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="/soap12/add-test-doc/getTime"
class="org.apache.axis.test.interop.mock.MockGetHandler">
+ <property name="contentType" value="application/soap+xml"/>
+ <property name="response" value="classpath:w3c/XMLP-2-response.xml"/>
+ </bean>
+</beans>
Propchange:
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/web.xml?rev=1393525&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/web.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/web.xml Wed Oct
3 15:04:43 2012
@@ -0,0 +1,32 @@
+<?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.
+ -->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+ version="2.4">
+ <servlet>
+ <servlet-name>dispatcher</servlet-name>
+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Propchange: axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1393525&r1=1393524&r2=1393525&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Wed Oct 3 15:04:43 2012
@@ -68,6 +68,7 @@
<module>axis-jms</module>
<module>axis-testutils</module>
<module>integration</module>
+ <module>interop-mock</module>
<module>axis-war</module>
<module>samples</module>
<module>distribution</module>
