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/06/09 14:12:44 UTC
svn commit: r1348368 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/
axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/ axi...
Author: veithen
Date: Sat Jun 9 12:12:43 2012
New Revision: 1348368
URL: http://svn.apache.org/viewvc?rev=1348368&view=rev
Log:
Some cleanups and fixes for the SOAPFaultDetail implementation.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultDetail.java (with props)
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Sat Jun 9 12:12:43 2012
@@ -150,7 +150,7 @@ public class ElementImpl extends ParentN
public ElementImpl(String tagName, OMNamespaceImpl ns,
OMXMLParserWrapper builder, OMFactory factory) {
- this(factory);
+ super(factory);
this.localName = tagName;
if (ns != null) {
setNamespace(ns);
@@ -159,10 +159,6 @@ public class ElementImpl extends ParentN
this.attributes = new AttributeMap(this);
}
- public ElementImpl(OMFactory factory) {
- super(factory);
- }
-
final ParentNode internalGetOwnerNode() {
return ownerNode;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java Sat Jun 9 12:12:43 2012
@@ -30,10 +30,6 @@ import org.apache.axiom.soap.SOAPProcess
public abstract class SOAPElement extends ElementImpl {
- public SOAPElement(SOAPFactory factory) {
- super(factory);
- }
-
/** @param parent */
protected SOAPElement(OMElement parent,
String localName,
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java Sat Jun 9 12:12:43 2012
@@ -22,6 +22,7 @@ package org.apache.axiom.soap.impl.dom;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axiom.soap.SOAPFactory;
@@ -35,24 +36,23 @@ import java.util.Iterator;
public abstract class SOAPFaultDetailImpl extends SOAPElement implements SOAPFaultDetail {
+ protected SOAPFaultDetailImpl(OMNamespace ns, SOAPFactory factory) {
+ super(factory.getSOAPVersion().getFaultDetailQName().getLocalPart(), ns, factory);
+ }
protected SOAPFaultDetailImpl(SOAPFault parent,
- boolean extractNamespaceFromParent, SOAPFactory factory)
- throws SOAPProcessingException {
+ boolean extractNamespaceFromParent,
+ SOAPFactory factory) throws SOAPProcessingException {
super(parent,
- factory.getSOAPVersion().getFaultDetailQName().getLocalPart(),
- extractNamespaceFromParent, factory);
- }
-
- protected SOAPFaultDetailImpl(SOAPFactory factory) {
- super(factory);
+ factory.getSOAPVersion().getFaultDetailQName().getLocalPart(),
+ extractNamespaceFromParent, factory);
}
protected SOAPFaultDetailImpl(SOAPFault parent,
OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, factory.getSOAPVersion().getFaultDetailQName().getLocalPart(), builder,
- factory);
+ factory);
}
public void addDetailEntry(OMElement detailElement) {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java Sat Jun 9 12:12:43 2012
@@ -27,6 +27,9 @@ import org.apache.axiom.soap.SOAPProcess
import org.apache.axiom.soap.impl.dom.SOAPFaultDetailImpl;
public class SOAP11FaultDetailImpl extends SOAPFaultDetailImpl {
+ public SOAP11FaultDetailImpl(SOAPFactory factory) {
+ super(null, factory);
+ }
public SOAP11FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
@@ -38,10 +41,6 @@ public class SOAP11FaultDetailImpl exten
super(parent, builder, factory);
}
- public SOAP11FaultDetailImpl(SOAPFactory factory) {
- super(factory);
- }
-
protected void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java Sat Jun 9 12:12:43 2012
@@ -28,6 +28,10 @@ import org.apache.axiom.soap.impl.dom.SO
public class SOAP12FaultDetailImpl extends SOAPFaultDetailImpl {
+ public SOAP12FaultDetailImpl(SOAPFactory factory) {
+ super(factory.getNamespace(), factory);
+ }
+
public SOAP12FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, true, factory);
@@ -38,10 +42,6 @@ public class SOAP12FaultDetailImpl exten
super(parent, builder, factory);
}
- public SOAP12FaultDetailImpl(SOAPFactory factory) {
- super(factory);
- }
-
protected void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP12FaultImpl)) {
throw new SOAPProcessingException(
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java Sat Jun 9 12:12:43 2012
@@ -21,31 +21,24 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.llom.SOAPFaultDetailImpl;
public class SOAP11FaultDetailImpl extends SOAPFaultDetailImpl {
-
-
-
public SOAP11FaultDetailImpl(SOAPFactory factory) {
super(null, factory);
- this.localName = SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
public SOAP11FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, false, factory);
- this.localName = SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
public SOAP11FaultDetailImpl(SOAPFault parent, OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, builder, factory);
- this.localName = SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
protected void checkParent(OMElement parent) throws SOAPProcessingException {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java Sat Jun 9 12:12:43 2012
@@ -24,28 +24,22 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.impl.llom.SOAPFaultDetailImpl;
-
public class SOAP12FaultDetailImpl extends SOAPFaultDetailImpl {
public SOAP12FaultDetailImpl(SOAPFactory factory) {
super(factory.getNamespace(), factory);
- this.localName = SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
-
}
public SOAP12FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, true, factory);
- this.localName = SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
public SOAP12FaultDetailImpl(SOAPFault parent, OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, builder, factory);
- this.localName = SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
protected void checkParent(OMElement parent) throws SOAPProcessingException {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1348368&r1=1348367&r2=1348368&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java Sat Jun 9 12:12:43 2012
@@ -103,6 +103,7 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.envelope.TestHasFaultWithParser(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestCreateSOAPEnvelope(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestCreateSOAPEnvelopeWithCustomPrefix(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.factory.TestCreateSOAPFaultDetail(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestFactoryIsSingleton(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestGetDefaultEnvelope(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestGetDefaultFaultEnvelope(metaFactory, spec));
Added: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultDetail.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultDetail.java?rev=1348368&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultDetail.java (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultDetail.java Sat Jun 9 12:12:43 2012
@@ -0,0 +1,35 @@
+/*
+ * 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.soap.factory;
+
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.soap.SOAPFaultDetail;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
+
+public class TestCreateSOAPFaultDetail extends SOAPTestCase {
+ public TestCreateSOAPFaultDetail(OMMetaFactory metaFactory, SOAPSpec spec) {
+ super(metaFactory, spec);
+ }
+
+ protected void runTest() throws Throwable {
+ SOAPFaultDetail detail = soapFactory.createSOAPFaultDetail();
+ assertEquals(spec.getFaultDetailQName(), detail.getQName());
+ }
+}
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultDetail.java
------------------------------------------------------------------------------
svn:eol-style = native