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 2012/07/28 21:09:58 UTC
svn commit: r1366744 - in /webservices/axiom/branches/JAXB2_DS: ./
modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/
modules/axiom-api/src/main/java/org/apache/axiom/util/stax/
modules/axiom-dom/src/main/java/org/apache/axiom/soap/imp...
Author: veithen
Date: Sat Jul 28 19:09:58 2012
New Revision: 1366744
URL: http://svn.apache.org/viewvc?rev=1366744&view=rev
Log:
Merged latest changes from trunk.
Added:
webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
- copied unchanged from r1366743, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
- copied unchanged from r1366743, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
- copied unchanged from r1366743, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
Modified:
webservices/axiom/branches/JAXB2_DS/ (props changed)
webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
webservices/axiom/branches/JAXB2_DS/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java
webservices/axiom/branches/JAXB2_DS/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
webservices/axiom/branches/JAXB2_DS/modules/axiom-integration/pom.xml
webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
Propchange: webservices/axiom/branches/JAXB2_DS/
------------------------------------------------------------------------------
Merged /webservices/commons/trunk/modules/axiom:r1366463-1366743
Modified: webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1366744&r1=1366743&r2=1366744&view=diff
==============================================================================
--- webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java Sat Jul 28 19:09:58 2012
@@ -331,8 +331,9 @@ public class StAXSOAPModelBuilder extend
} else if ((elementLevel == 3) &&
((OMElement)parent).getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME) &&
- elementName.equals(SOAPConstants.BODY_FAULT_LOCAL_NAME)) {
- // this is a headerblock
+ elementName.equals(SOAPConstants.BODY_FAULT_LOCAL_NAME) &&
+ soapFactory.getSoapVersionURI().equals(parser.getNamespaceURI())) {
+ // this is a SOAP fault
element = soapFactory.createSOAPFault((SOAPBody) parent, this);
processNamespaceData(element, false);
processAttributes(element);
Modified: webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java?rev=1366744&r1=1366743&r2=1366744&view=diff
==============================================================================
--- webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java (original)
+++ webservices/axiom/branches/JAXB2_DS/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java Sat Jul 28 19:09:58 2012
@@ -76,7 +76,7 @@ public class XMLStreamWriterUtils {
/**
* Get the {@link DataHandlerWriter} extension for a given {@link XMLStreamWriter}. If the
- * writer expose the extension, a reference to the extension interface implementation is
+ * writer exposes the extension, a reference to the extension interface implementation is
* returned. If the writer doesn't expose the extension, this method returns an instance of the
* extension interface that emulates the extension (by writing the binary data as base64
* character data to the stream).
Modified: webservices/axiom/branches/JAXB2_DS/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/JAXB2_DS/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java?rev=1366744&r1=1366743&r2=1366744&view=diff
==============================================================================
--- webservices/axiom/branches/JAXB2_DS/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java (original)
+++ webservices/axiom/branches/JAXB2_DS/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java Sat Jul 28 19:09:58 2012
@@ -26,8 +26,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.dom.ParentNode;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -67,16 +65,7 @@ public abstract class SOAPBodyImpl exten
* <code>SOAPBody</code> object; <code>false</code> otherwise
*/
public boolean hasFault() {
- OMElement element = getFirstElement();
- if (element != null
- && SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element.getLocalName())) {
- OMNamespace ns = element.getNamespace();
- return ns != null &&
- (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI()) ||
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI()));
- } else {
- return false;
- }
+ return getFirstElement() instanceof SOAPFault;
}
/**
@@ -86,19 +75,7 @@ public abstract class SOAPBodyImpl exten
*/
public SOAPFault getFault() {
OMElement element = getFirstElement();
- if (element != null
- && SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element.getLocalName())) {
- OMNamespace ns = element.getNamespace();
- if (ns != null &&
- (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI()) ||
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI()))) {
- return (SOAPFault) element;
- } else {
- return null;
- }
- } else {
- return null;
- }
+ return element instanceof SOAPFault ? (SOAPFault)element : null;
}
/**
Modified: webservices/axiom/branches/JAXB2_DS/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/JAXB2_DS/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java?rev=1366744&r1=1366743&r2=1366744&view=diff
==============================================================================
--- webservices/axiom/branches/JAXB2_DS/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java (original)
+++ webservices/axiom/branches/JAXB2_DS/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java Sat Jul 28 19:09:58 2012
@@ -107,19 +107,7 @@ public abstract class SOAPBodyImpl exten
*/
public SOAPFault getFault() {
OMElement element = getFirstElement();
- if (element != null
- && SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element.getLocalName())) {
- OMNamespace ns = element.getNamespace();
- if (ns != null &&
- (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI()) ||
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI()))) {
- return (SOAPFault) element;
- } else {
- return null;
- }
- } else {
- return null;
- }
+ return element instanceof SOAPFault ? (SOAPFault)element : null;
}
/**
Modified: webservices/axiom/branches/JAXB2_DS/modules/axiom-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/JAXB2_DS/modules/axiom-integration/pom.xml?rev=1366744&r1=1366743&r2=1366744&view=diff
==============================================================================
--- webservices/axiom/branches/JAXB2_DS/modules/axiom-integration/pom.xml (original)
+++ webservices/axiom/branches/JAXB2_DS/modules/axiom-integration/pom.xml Sat Jul 28 19:09:58 2012
@@ -77,7 +77,6 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
Modified: webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1366744&r1=1366743&r2=1366744&view=diff
==============================================================================
--- webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/JAXB2_DS/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java Sat Jul 28 19:09:58 2012
@@ -77,6 +77,7 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.body.TestAddFault1(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestAddFault2(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestGetFault(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.body.TestGetFaultFakeFault(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestGetFaultWithParser(metaFactory, spec));
for (int i=0; i<generalQNames.length; i++) {
QName qname = generalQNames[i];
@@ -88,6 +89,7 @@ public class SOAPTestSuiteBuilder extend
for (int i=0; i<noFaultQNames.length; i++) {
QName qname = noFaultQNames[i];
addTest(new org.apache.axiom.ts.soap.body.TestGetFaultNoFault(metaFactory, spec, qname));
+ addTest(new org.apache.axiom.ts.soap.body.TestGetFaultWithParserNoFault(metaFactory, spec, qname));
addTest(new org.apache.axiom.ts.soap.body.TestHasFaultNoFault(metaFactory, spec, qname));
addTest(new org.apache.axiom.ts.soap.body.TestHasFaultWithParserNoFault(metaFactory, spec,
qname, supportsBodyElementNameOptimization));
@@ -96,6 +98,7 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.body.TestGetFirstElementNSEmptyBody(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestHasFault(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestHasFaultAfterReplace(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.body.TestHasFaultFakeFault(metaFactory, spec));
if (supportsOMSourcedElement) {
addTest(new org.apache.axiom.ts.soap.body.TestHasFaultWithOMSEUnknownName(metaFactory, spec));
}