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 2016/01/28 00:44:09 UTC
svn commit: r1727218 - in /webservices/axiom/trunk:
axiom-compat/src/main/java/org/apache/axiom/soap/
axiom-compat/src/main/java/org/apache/axiom/soap/impl/
axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/
code-coverage/ systests/spring-w...
Author: veithen
Date: Wed Jan 27 23:44:09 2016
New Revision: 1727218
URL: http://svn.apache.org/viewvc?rev=1727218&view=rev
Log:
Restore enough binary compatibility with Axiom 1.2.x to allow us to execute the Spring-WS tests.
Added:
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java (with props)
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (with props)
Modified:
webservices/axiom/trunk/code-coverage/pom.xml
webservices/axiom/trunk/systests/spring-ws-tests/pom.xml
Added: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java?rev=1727218&view=auto
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java (added)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java Wed Jan 27 23:44:09 2016
@@ -0,0 +1,31 @@
+/*
+ * 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.soap.impl.builder;
+
+import org.apache.axiom.om.OMXMLBuilderFactory;
+
+/**
+ * @deprecated Please use the {@link OMXMLBuilderFactory} API to create builders.
+ */
+public class MTOMStAXSOAPModelBuilder extends StAXSOAPModelBuilder {
+ public MTOMStAXSOAPModelBuilder() {
+ // TODO
+ super(null);
+ }
+}
Propchange: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1727218&view=auto
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (added)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java Wed Jan 27 23:44:09 2016
@@ -0,0 +1,108 @@
+/*
+ * 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.soap.impl.builder;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPMessage;
+import org.apache.axiom.soap.SOAPModelBuilder;
+
+/**
+ * @deprecated Please use the {@link OMXMLBuilderFactory} API to create builders.
+ */
+public class StAXSOAPModelBuilder implements SOAPModelBuilder {
+ private final SOAPModelBuilder target;
+
+ protected StAXSOAPModelBuilder(SOAPModelBuilder target) {
+ this.target = target;
+ }
+
+ public StAXSOAPModelBuilder(XMLStreamReader parser, SOAPFactory factory, String soapVersion) {
+ this(OMXMLBuilderFactory.createStAXSOAPModelBuilder(factory.getMetaFactory(), parser));
+ // TODO: check SOAP version
+ }
+
+ public StAXSOAPModelBuilder(XMLStreamReader parser, String soapVersion) {
+ this(OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getMetaFactory(), parser));
+ // TODO: check SOAP version
+ }
+
+ public SOAPEnvelope getSOAPEnvelope() {
+ return target.getSOAPEnvelope();
+ }
+
+ public int next() throws OMException {
+ return target.next();
+ }
+
+ public SOAPMessage getSOAPMessage() {
+ return target.getSOAPMessage();
+ }
+
+ public void discard(OMElement el) throws OMException {
+ target.discard(el);
+ }
+
+ public void setCache(boolean b) throws OMException {
+ target.setCache(b);
+ }
+
+ public boolean isCache() {
+ return target.isCache();
+ }
+
+ public Object getParser() {
+ return target.getParser();
+ }
+
+ public boolean isCompleted() {
+ return target.isCompleted();
+ }
+
+ public OMDocument getDocument() {
+ return target.getDocument();
+ }
+
+ public OMElement getDocumentElement() {
+ return target.getDocumentElement();
+ }
+
+ public OMElement getDocumentElement(boolean discardDocument) {
+ return target.getDocumentElement(discardDocument);
+ }
+
+ public String getCharacterEncoding() {
+ return target.getCharacterEncoding();
+ }
+
+ public void close() {
+ target.close();
+ }
+
+ public void detach() {
+ target.detach();
+ }
+}
Propchange: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/code-coverage/pom.xml?rev=1727218&r1=1727217&r2=1727218&view=diff
==============================================================================
--- webservices/axiom/trunk/code-coverage/pom.xml (original)
+++ webservices/axiom/trunk/code-coverage/pom.xml Wed Jan 27 23:44:09 2016
@@ -222,14 +222,13 @@
<type>exec</type>
</dependency>
- <!-- TODO: tests currently disabled -->
- <!-- dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-ws-tests</artifactId>
<version>${project.version}</version>
<classifier>jacoco</classifier>
<type>exec</type>
- </dependency -->
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: webservices/axiom/trunk/systests/spring-ws-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/spring-ws-tests/pom.xml?rev=1727218&r1=1727217&r2=1727218&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/spring-ws-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/spring-ws-tests/pom.xml Wed Jan 27 23:44:09 2016
@@ -47,6 +47,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-compat</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -74,16 +80,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- TODO: remove this when there is a Spring-WS release compatible with Axiom 1.3.x -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>