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 2015/11/25 08:56:04 UTC
svn commit: r1716317 - in /webservices/axiom/branches/DOXIA-492: ./
aspects/dom-aspects/
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ aspects/om-aspects/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/
aspects/om-aspects/sr...
Author: veithen
Date: Wed Nov 25 07:56:03 2015
New Revision: 1716317
URL: http://svn.apache.org/viewvc?rev=1716317&view=rev
Log:
Merge latest changes from trunk.
Added:
webservices/axiom/branches/DOXIA-492/components/ (props changed)
- copied from r1716316, webservices/axiom/trunk/components/
Modified:
webservices/axiom/branches/DOXIA-492/ (props changed)
webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/pom.xml
webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java
webservices/axiom/branches/DOXIA-492/aspects/om-aspects/pom.xml
webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java
webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultClassifierSupport.aj
webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
webservices/axiom/branches/DOXIA-492/components/xml-utils/ (props changed)
webservices/axiom/branches/DOXIA-492/devguide/src/docbkx/devguide.xml
webservices/axiom/branches/DOXIA-492/etc/axiom.rdf
webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
webservices/axiom/branches/DOXIA-492/implementations/pom.xml
webservices/axiom/branches/DOXIA-492/pom.xml
webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/pom.xml
webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java
Propchange: webservices/axiom/branches/DOXIA-492/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 07:56:03 2015
@@ -11,3 +11,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
+/webservices/axiom/trunk:1715574-1716316
Modified: webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/pom.xml?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/pom.xml (original)
+++ webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/pom.xml Wed Nov 25 07:56:03 2015
@@ -44,6 +44,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
Modified: webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java (original)
+++ webservices/axiom/branches/DOXIA-492/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java Wed Nov 25 07:56:03 2015
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.dom;
+import static org.apache.axiom.util.xml.XMLChar.isNameChar;
+import static org.apache.axiom.util.xml.XMLChar.isNameStartChar;
+
import javax.xml.XMLConstants;
import org.w3c.dom.DOMException;
@@ -25,22 +28,6 @@ import org.w3c.dom.DOMException;
public final class NSUtil {
private NSUtil() {}
- // This is the NameStartChar production from http://www.w3.org/TR/2008/REC-xml-20081126/
- private static boolean isNameStartChar(char c) {
- return c == ':' || 'A' <= c && c <= 'Z' || c == '_' || 'a' <= c && c <= 'z' || 0xC0 <= c && c <= 0xD6
- || 0xD8 <= c && c <= 0xF6 || 0xF8 <= c && c <= 0x2FF || 0x370 <= c && c <= 0x37D
- || 0x37F <= c && c <= 0x1FFF || 0x200C <= c && c <= 0x200D
- || 0x2070 <= c && c <= 0x218F || 0x2C00 <= c && c <= 0x2FEF
- || 0x3001 <= c && c <= 0xD7FF || 0xF900 <= c && c <= 0xFDCF
- || 0xFDF0 <= c && c <= 0xFFFD || 0x10000 <= c && c <= 0xEFFFF;
- }
-
- // This is the NameChar production from http://www.w3.org/TR/2008/REC-xml-20081126/
- private static boolean isNameChar(char c) {
- return isNameStartChar(c) || c == '-' || c == '.' || '0' <= c && c <= '9' || c == 0xB7
- || 0x0300 <= c && c <= 0x036F || 0x203F <= c && c <= 0x2040;
- }
-
public static void validateName(String name) throws DOMException {
if (name.length() == 0) {
throw DOMExceptionTranslator.newDOMException(DOMException.INVALID_CHARACTER_ERR);
Modified: webservices/axiom/branches/DOXIA-492/aspects/om-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/aspects/om-aspects/pom.xml?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/aspects/om-aspects/pom.xml (original)
+++ webservices/axiom/branches/DOXIA-492/aspects/om-aspects/pom.xml Wed Nov 25 07:56:03 2015
@@ -57,6 +57,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj (original)
+++ webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj Wed Nov 25 07:56:03 2015
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.om.impl.common;
+import static org.apache.axiom.util.xml.NSUtils.generatePrefix;
+
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -53,7 +55,6 @@ import org.apache.axiom.om.impl.intf.Axi
import org.apache.axiom.om.impl.intf.AxiomContainer;
import org.apache.axiom.om.impl.intf.AxiomElement;
import org.apache.axiom.om.impl.intf.AxiomNamespaceDeclaration;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.util.namespace.MapBasedNamespaceContext;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
import org.apache.commons.logging.Log;
@@ -304,7 +305,7 @@ public aspect AxiomElementSupport {
if (namespaceURI.length() > 0 || prefix != null) {
namespace = findNamespace(namespaceURI, prefix);
if (namespace == null || prefix == null && namespace.getPrefix().length() == 0) {
- namespace = new OMNamespaceImpl(namespaceURI, prefix != null ? prefix : OMSerializerUtil.getNextNSPrefix());
+ namespace = new OMNamespaceImpl(namespaceURI, prefix != null ? prefix : generatePrefix(namespaceURI));
}
}
}
@@ -366,11 +367,12 @@ public aspect AxiomElementSupport {
public final OMNamespace AxiomElement.declareNamespace(OMNamespace namespace) {
String prefix = namespace.getPrefix();
+ String namespaceURI = namespace.getNamespaceURI();
if (prefix == null) {
- prefix = OMSerializerUtil.getNextNSPrefix();
- namespace = new OMNamespaceImpl(namespace.getNamespaceURI(), prefix);
+ prefix = generatePrefix(namespaceURI);
+ namespace = new OMNamespaceImpl(namespaceURI, prefix);
}
- if (prefix.length() > 0 && namespace.getNamespaceURI().length() == 0) {
+ if (prefix.length() > 0 && namespaceURI.length() == 0) {
throw new IllegalArgumentException("Cannot bind a prefix to the empty namespace name");
}
addNamespaceDeclaration(namespace);
@@ -380,7 +382,7 @@ public aspect AxiomElementSupport {
public final OMNamespace AxiomElement.declareNamespace(String uri, String prefix) {
if ("".equals(prefix)) {
log.warn("Deprecated usage of OMElement#declareNamespace(String,String) with empty prefix");
- prefix = OMSerializerUtil.getNextNSPrefix();
+ prefix = generatePrefix(uri);
}
OMNamespaceImpl ns = new OMNamespaceImpl(uri, prefix);
return declareNamespace(ns);
Modified: webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java (original)
+++ webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java Wed Nov 25 07:56:03 2015
@@ -18,9 +18,10 @@
*/
package org.apache.axiom.om.impl.common;
+import static org.apache.axiom.util.xml.NSUtils.generatePrefix;
+
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.intf.AxiomElement;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
public final class NSUtil {
private NSUtil() {}
@@ -58,7 +59,7 @@ public final class NSUtil {
}
}
if (prefix == null) {
- prefix = OMSerializerUtil.getNextNSPrefix();
+ prefix = generatePrefix(namespaceURI);
ns = new OMNamespaceImpl(namespaceURI, prefix);
}
if (addNSDecl) {
Modified: webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java (original)
+++ webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java Wed Nov 25 07:56:03 2015
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.om.impl.common.factory;
+import static org.apache.axiom.util.xml.NSUtils.generatePrefix;
+
import javax.xml.namespace.QName;
import org.apache.axiom.core.CoreNode;
@@ -57,7 +59,6 @@ import org.apache.axiom.om.impl.intf.Axi
import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
import org.apache.axiom.om.impl.intf.AxiomText;
import org.apache.axiom.om.impl.intf.TextContent;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
public class OMFactoryImpl implements OMFactoryEx {
private final OMMetaFactory metaFactory;
@@ -284,7 +285,7 @@ public class OMFactoryImpl implements OM
OMNamespace ns = element.findNamespace(namespaceURI, prefix.length() == 0 ? null : prefix);
if (ns == null) {
if ("".equals(prefix)) {
- prefix = OMSerializerUtil.getNextNSPrefix();
+ prefix = generatePrefix(namespaceURI);
}
ns = element.declareNamespace(namespaceURI, prefix);
}
@@ -341,7 +342,7 @@ public class OMFactoryImpl implements OM
if (namespaceURI.length() == 0) {
ns = null;
} else {
- ns = new OMNamespaceImpl(namespaceURI, OMSerializerUtil.getNextNSPrefix());
+ ns = new OMNamespaceImpl(namespaceURI, generatePrefix(namespaceURI));
}
}
if (ns != null) {
Modified: webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultClassifierSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultClassifierSupport.aj?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultClassifierSupport.aj (original)
+++ webservices/axiom/branches/DOXIA-492/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FaultClassifierSupport.aj Wed Nov 25 07:56:03 2015
@@ -20,10 +20,30 @@ package org.apache.axiom.soap.impl.commo
import javax.xml.namespace.QName;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.impl.intf.AxiomSOAP12FaultClassifier;
public aspect AxiomSOAP12FaultClassifierSupport {
+ private static final Class<?>[] sequence = { SOAPFaultValue.class, SOAPFaultSubCode.class };
+
+ public final SOAPFaultValue AxiomSOAP12FaultClassifier.getValue() {
+ return (SOAPFaultValue)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
+ }
+
+ public final void AxiomSOAP12FaultClassifier.setValue(SOAPFaultValue value) {
+ insertChild(sequence, 0, value);
+ }
+
+ public final SOAPFaultSubCode AxiomSOAP12FaultClassifier.getSubCode() {
+ return (SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
+ }
+
+ public final void AxiomSOAP12FaultClassifier.setSubCode(SOAPFaultSubCode subCode) {
+ insertChild(sequence, 1, subCode);
+ }
+
public final QName AxiomSOAP12FaultClassifier.getValueAsQName() {
SOAPFaultValue value = getValue();
return value == null ? null : value.getTextAsQName();
Modified: webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java (original)
+++ webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java Wed Nov 25 07:56:03 2015
@@ -34,7 +34,6 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMAttributeEx;
import org.apache.axiom.om.impl.OMContainerEx;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
import org.apache.commons.logging.Log;
@@ -238,9 +237,6 @@ public abstract class StAXBuilder implem
// a default namespace from its parent
namespace = node.findNamespace(uri, prefix);
if (namespace == null) {
- if (prefix == null || "".equals(prefix)) {
- prefix = OMSerializerUtil.getNextNSPrefix();
- }
namespace = node.declareNamespace(uri, prefix);
}
}
Modified: webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java (original)
+++ webservices/axiom/branches/DOXIA-492/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java Wed Nov 25 07:56:03 2015
@@ -564,6 +564,7 @@ public class OMSerializerUtil {
/**
* Get the next prefix name
* @return next prefix name
+ * @deprecated
*/
public static String getNextNSPrefix() {
Propchange: webservices/axiom/branches/DOXIA-492/components/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 25 07:56:03 2015
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Modified: webservices/axiom/branches/DOXIA-492/devguide/src/docbkx/devguide.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/devguide/src/docbkx/devguide.xml?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/devguide/src/docbkx/devguide.xml (original)
+++ webservices/axiom/branches/DOXIA-492/devguide/src/docbkx/devguide.xml Wed Nov 25 07:56:03 2015
@@ -1164,7 +1164,7 @@ javax.xml.stream.XMLOutputFactory=com.be
https://svn.apache.org/repos/asf/webservices/website/axiom-staging</screen>
<tip>
<para>
- This step can be skipped if the staging area already exists and is in a state where it can cleanly be merged.
+ This step can be skipped if the staging area has already been created earlier (e.g. to test a snapshot version of the site).
</para>
</tip>
</step>
@@ -1230,9 +1230,10 @@ javax.xml.stream.XMLOutputFactory=com.be
<para>
Publish the site:
</para>
-<screen>svn co https://svn.apache.org/repos/asf/webservices/website/axiom axiom-site
-cd axiom-site/
-svn merge https://svn.apache.org/repos/asf/webservices/website/axiom-staging
+<screen>svn co --depth=immediates https://svn.apache.org/repos/asf/webservices/website ws-site
+cd ws-site
+svn rm axiom
+svn mv axiom-staging axiom
svn commit</screen>
</step>
</procedure>
@@ -1253,7 +1254,7 @@ svn commit</screen>
</listitem>
<listitem>
<para>
- the binary and source distributions can be downloaded from <link xlink:href="http://ws.apache.org/axiom/download.cgi"/>.
+ the binary and source distributions can be downloaded from <link xlink:href="http://ws.apache.org/axiom/download.html"/>.
</para>
</listitem>
</itemizedlist>
@@ -1342,17 +1343,6 @@ svn commit</screen>
Remove archived releases from <link xlink:href="https://dist.apache.org/repos/dist/release/ws/axiom/"/>.
</para>
</listitem>
- <listitem>
- <para>
- Delete <link xlink:href="https://svn.apache.org/repos/asf/webservices/website/axiom-staging/"/>.
- </para>
- <note>
- <para>
- This step is optional. The staging area may be reused during the next release. It may also be used
- to publish a snapshot version of the site.
- </para>
- </note>
- </listitem>
</itemizedlist>
</section>
<section>
Modified: webservices/axiom/branches/DOXIA-492/etc/axiom.rdf
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/etc/axiom.rdf?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/etc/axiom.rdf [UTF-8] (original)
+++ webservices/axiom/branches/DOXIA-492/etc/axiom.rdf [UTF-8] Wed Nov 25 07:56:03 2015
@@ -56,6 +56,7 @@
<release><Version><name>Apache Axiom</name><created>2012-04-02</created><revision>1.2.13</revision></Version></release>
<release><Version><name>Apache Axiom</name><created>2012-12-02</created><revision>1.2.14</revision></Version></release>
<release><Version><name>Apache Axiom</name><created>2015-06-10</created><revision>1.2.15</revision></Version></release>
+ <release><Version><name>Apache Axiom</name><created>2015-11-19</created><revision>1.2.16</revision></Version></release>
<repository>
<SVNRepository>
<location rdf:resource="http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom"/>
Modified: webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java (original)
+++ webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultCodeImpl.java Wed Nov 25 07:56:03 2015
@@ -22,34 +22,11 @@ package org.apache.axiom.soap.impl.dom.s
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.dom.SOAPFaultCodeImpl;
import org.apache.axiom.soap.impl.intf.AxiomSOAP12FaultCode;
public class SOAP12FaultCodeImpl extends SOAPFaultCodeImpl implements AxiomSOAP12FaultCode {
- public void setSubCode(SOAPFaultSubCode subCode)
- throws SOAPProcessingException {
- if (!(subCode instanceof SOAP12FaultSubCodeImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP 1.2 implementation of SOAP Fault " +
- "Sub Code. But received some other implementation");
- }
- ElementHelper.setNewElement(this, getSubCode(), subCode);
- }
-
- public void setValue(SOAPFaultValue value) throws SOAPProcessingException {
- if (!(value instanceof SOAP12FaultValueImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP 1.2 implementation of SOAP Fault Value. " +
- "But received some other implementation");
- }
- ElementHelper.setNewElement(this, getValue(), value);
- }
-
// TODO: For compatibility with Axiom 1.2.x; remove in Axiom 1.3
public QName getTextAsQName() {
return getValueAsQName();
@@ -62,12 +39,4 @@ public class SOAP12FaultCodeImpl extends
"the parent. But received some other implementation");
}
}
-
- public SOAPFaultValue getValue() {
- return (SOAPFaultValue)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
- }
-
- public SOAPFaultSubCode getSubCode() {
- return (SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
- }
}
Modified: webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java (original)
+++ webservices/axiom/branches/DOXIA-492/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultSubCodeImpl.java Wed Nov 25 07:56:03 2015
@@ -20,18 +20,11 @@
package org.apache.axiom.soap.impl.dom.soap12;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.dom.SOAPElement;
import org.apache.axiom.soap.impl.intf.AxiomSOAP12FaultSubCode;
public class SOAP12FaultSubCodeImpl extends SOAPElement implements AxiomSOAP12FaultSubCode {
- private SOAPFaultValue value;
- private SOAPFaultSubCode subCode;
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!((parent instanceof SOAP12FaultSubCodeImpl) ||
(parent instanceof SOAP12FaultCodeImpl))) {
@@ -41,37 +34,4 @@ public class SOAP12FaultSubCodeImpl exte
"other implementation");
}
}
-
- public void setSubCode(SOAPFaultSubCode subCode) throws SOAPProcessingException {
- if (!(subCode instanceof SOAP12FaultSubCodeImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP 1.2 implementation of SOAP Fault " +
- "Sub Code. But received some other implementation");
- }
- ElementHelper.setNewElement(this, this.subCode, subCode);
- }
-
- public SOAPFaultSubCode getSubCode() {
- if (subCode == null) {
- subCode = (SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
- }
- return subCode;
- }
-
- public void setValue(SOAPFaultValue soapFaultSubCodeValue)
- throws SOAPProcessingException {
- if (!(soapFaultSubCodeValue instanceof SOAP12FaultValueImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP 1.2 implementation of SOAP Fault Value. " +
- "But received some other implementation");
- }
- ElementHelper.setNewElement(this, value, soapFaultSubCodeValue);
- }
-
- public SOAPFaultValue getValue() {
- if (value == null) {
- value = (SOAPFaultValue)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
- }
- return value;
- }
}
Modified: webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java (original)
+++ webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java Wed Nov 25 07:56:03 2015
@@ -22,31 +22,11 @@ package org.apache.axiom.soap.impl.llom.
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.intf.AxiomSOAP12FaultCode;
import org.apache.axiom.soap.impl.llom.SOAPFaultCodeImpl;
public class SOAP12FaultCodeImpl extends SOAPFaultCodeImpl implements AxiomSOAP12FaultCode {
- public void setSubCode(SOAPFaultSubCode subCode) throws SOAPProcessingException {
- if (!(subCode instanceof SOAP12FaultSubCodeImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP12FaultSubCodeImpl, got " + subCode.getClass());
- }
- ElementHelper.setNewElement(this, getSubCode(), subCode);
- }
-
- public void setValue(SOAPFaultValue value) throws SOAPProcessingException {
- if (!(value instanceof SOAP12FaultValueImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP12FaultValueImpl, got " + value.getClass());
- }
- ElementHelper.setNewElement(this, getValue(), value);
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP12FaultImpl)) {
throw new SOAPProcessingException(
@@ -58,12 +38,4 @@ public class SOAP12FaultCodeImpl extends
public QName getTextAsQName() {
return getValueAsQName();
}
-
- public SOAPFaultValue getValue() {
- return (SOAPFaultValue)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
- }
-
- public SOAPFaultSubCode getSubCode() {
- return (SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
- }
}
Modified: webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java (original)
+++ webservices/axiom/branches/DOXIA-492/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java Wed Nov 25 07:56:03 2015
@@ -20,18 +20,11 @@
package org.apache.axiom.soap.impl.llom.soap12;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.intf.AxiomSOAP12FaultSubCode;
import org.apache.axiom.soap.impl.llom.SOAPElement;
public class SOAP12FaultSubCodeImpl extends SOAPElement implements AxiomSOAP12FaultSubCode {
- private SOAPFaultValue value;
- private SOAPFaultSubCode subCode;
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!((parent instanceof SOAP12FaultSubCodeImpl) ||
(parent instanceof SOAP12FaultCodeImpl))) {
@@ -41,36 +34,4 @@ public class SOAP12FaultSubCodeImpl exte
"other implementation");
}
}
-
- public void setSubCode(SOAPFaultSubCode subCode)
- throws SOAPProcessingException {
- if (!(subCode instanceof SOAP12FaultSubCodeImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP12FaultSubCodeImpl, got " + subCode.getClass());
- }
- ElementHelper.setNewElement(this, this.subCode, subCode);
- }
-
- public SOAPFaultSubCode getSubCode() {
- if (subCode == null) {
- subCode = (SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
- }
- return subCode;
- }
-
- public void setValue(SOAPFaultValue soapFaultSubCodeValue)
- throws SOAPProcessingException {
- if (!(soapFaultSubCodeValue instanceof SOAP12FaultValueImpl)) {
- throw new SOAPProcessingException(
- "Expecting SOAP12FaultValueImpl, got " + soapFaultSubCodeValue.getClass());
- }
- ElementHelper.setNewElement(this, value, soapFaultSubCodeValue);
- }
-
- public SOAPFaultValue getValue() {
- if (value == null) {
- value = (SOAPFaultValue)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
- }
- return value;
- }
}
Modified: webservices/axiom/branches/DOXIA-492/implementations/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/implementations/pom.xml?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/implementations/pom.xml (original)
+++ webservices/axiom/branches/DOXIA-492/implementations/pom.xml Wed Nov 25 07:56:03 2015
@@ -88,6 +88,7 @@
<artifactSet>
<includes>
<include>${project.groupId}:*-aspects</include>
+ <include>${project.groupId}:xml-utils</include>
<include>org.aspectj:aspectjrt</include>
</includes>
</artifactSet>
Modified: webservices/axiom/branches/DOXIA-492/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/pom.xml?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/pom.xml (original)
+++ webservices/axiom/branches/DOXIA-492/pom.xml Wed Nov 25 07:56:03 2015
@@ -223,6 +223,7 @@
<module>testing</module>
<module>aspects</module>
<module>implementations</module>
+ <module>components</module>
</modules>
<scm>
Modified: webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/pom.xml?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/pom.xml (original)
+++ webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/pom.xml Wed Nov 25 07:56:03 2015
@@ -45,6 +45,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
Modified: webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java?rev=1716317&r1=1716316&r2=1716317&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java (original)
+++ webservices/axiom/branches/DOXIA-492/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java Wed Nov 25 07:56:03 2015
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap;
+import static org.apache.axiom.util.xml.XMLChar.isWhitespace;
+
import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
@@ -206,10 +208,6 @@ final class ConvertedSOAPSampleContent e
return null;
}
- private static boolean isWhitespace(char c) {
- return " \r\n\t".indexOf(c) != -1;
- }
-
private static String transform(String text, TextTransformer transformer) {
int start = 0;
while (isWhitespace(text.charAt(start))) {