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 2017/05/22 13:08:44 UTC
svn commit: r1795803 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/
axiom-api/src/main/java/org/apache/axiom/om/impl/exception/
axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/
Author: veithen
Date: Mon May 22 13:08:43 2017
New Revision: 1795803
URL: http://svn.apache.org/viewvc?rev=1795803&view=rev
Log:
Deprecate OMBuilderException.
Added:
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java
- copied, changed from r1795802, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java
Removed:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/exception/
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java?rev=1795803&r1=1795802&r2=1795803&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java Mon May 22 13:08:43 2017
@@ -20,7 +20,6 @@
package org.apache.axiom.soap.impl.common.builder;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.exception.OMBuilderException;
import org.apache.axiom.om.impl.intf.AxiomElement;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -59,7 +58,7 @@ public class SOAP12BuilderHelper extends
if (elementLevel == 4) {
if (localName.equals(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME)) {
if (codePresent) {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Multiple Code element encountered");
} else {
elementType = AxiomSOAP12FaultCode.class;
@@ -70,7 +69,7 @@ public class SOAP12BuilderHelper extends
if (!codeprocessing && !subCodeProcessing) {
if (codePresent) {
if (reasonPresent) {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Multiple Reason Element encountered");
} else {
elementType = AxiomSOAP12FaultReason.class;
@@ -78,15 +77,15 @@ public class SOAP12BuilderHelper extends
reasonProcessing = true;
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Wrong element order encountred at " + localName);
}
} else {
if (codeprocessing) {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Code doesn't have a value");
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"A subcode doesn't have a Value");
}
}
@@ -95,58 +94,58 @@ public class SOAP12BuilderHelper extends
if (!reasonProcessing) {
if (reasonPresent && !rolePresent && !detailPresent) {
if (nodePresent) {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Multiple Node element encountered");
} else {
elementType = AxiomSOAP12FaultNode.class;
nodePresent = true;
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"wrong element order encountered at " + localName);
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Reason element Should have a text");
}
} else if (localName.equals(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME)) {
if (!reasonProcessing) {
if (reasonPresent && !detailPresent) {
if (rolePresent) {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Multiple Role element encountered");
} else {
elementType = AxiomSOAP12FaultRole.class;
rolePresent = true;
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Wrong element order encountered at " + localName);
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Reason element should have a text");
}
} else if (localName.equals(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME)) {
if (!reasonProcessing) {
if (reasonPresent) {
if (detailPresent) {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Multiple detail element encountered");
} else {
elementType = AxiomSOAP12FaultDetail.class;
detailPresent = true;
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"wrong element order encountered at " + localName);
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Reason element should have a text");
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
localName + " unsupported element in SOAPFault element");
}
@@ -159,7 +158,7 @@ public class SOAP12BuilderHelper extends
valuePresent = true;
codeprocessing = false;
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Multiple value Encountered in code element");
}
@@ -170,16 +169,16 @@ public class SOAP12BuilderHelper extends
subcodePresent = true;
subCodeProcessing = true;
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Value should present before the subcode");
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"multiple subcode Encountered in code element");
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
localName + " is not supported inside the code element");
}
@@ -189,7 +188,7 @@ public class SOAP12BuilderHelper extends
elementType = AxiomSOAP12FaultText.class;
reasonProcessing = false;
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
localName + " is not supported inside the reason");
}
} else if (parent.getLocalName().equals(
@@ -200,7 +199,7 @@ public class SOAP12BuilderHelper extends
detailElementNames.add(localName);
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
parent.getLocalName() +
" should not have child element");
}
@@ -211,7 +210,7 @@ public class SOAP12BuilderHelper extends
SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME)) {
if (localName.equals(SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME)) {
if (subcodeValuePresent) {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"multiple subCode value encountered");
} else {
elementType = AxiomSOAP12FaultValue.class;
@@ -227,15 +226,15 @@ public class SOAP12BuilderHelper extends
subSubcodePresent = true;
subCodeProcessing = true;
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"multiple subcode encountered");
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
"Value should present before the subcode");
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
localName + " is not supported inside the subCode element");
}
} else if (processingDetailElements) {
@@ -255,7 +254,7 @@ public class SOAP12BuilderHelper extends
}
} else {
- throw new OMBuilderException(
+ throw new SOAPProcessingException(
parent.getLocalName() +
" should not have child at element level " +
elementLevel);
Copied: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java (from r1795802, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java?p2=webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java&r1=1795802&r2=1795803&rev=1795803&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/OMBuilderException.java Mon May 22 13:08:43 2017
@@ -21,7 +21,9 @@ package org.apache.axiom.om.impl.excepti
import org.apache.axiom.om.OMException;
-/** Class OMBuilderException */
+/**
+ * @deprecated
+ */
public class OMBuilderException extends OMException {
private static final long serialVersionUID = -7447667411291193889L;