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/22 22:15:31 UTC
svn commit: r1715696 - in /webservices/axiom/branches/datatypes: ./ apidocs/
aspects/ aspects/core-aspects/ aspects/dom-aspects/
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
aspects/fom-aspects/ aspects/om-aspects/ aspects/shared-aspects/ ax...
Author: veithen
Date: Sun Nov 22 21:15:31 2015
New Revision: 1715696
URL: http://svn.apache.org/viewvc?rev=1715696&view=rev
Log:
Merge latest changes from trunk.
Added:
webservices/axiom/branches/datatypes/components/ (props changed)
- copied from r1715694, webservices/axiom/trunk/components/
webservices/axiom/branches/datatypes/src/site/markdown/release-notes/1.2.17.md
- copied unchanged from r1715694, webservices/axiom/trunk/src/site/markdown/release-notes/1.2.17.md
Modified:
webservices/axiom/branches/datatypes/ (props changed)
webservices/axiom/branches/datatypes/apidocs/pom.xml
webservices/axiom/branches/datatypes/aspects/core-aspects/pom.xml
webservices/axiom/branches/datatypes/aspects/dom-aspects/pom.xml
webservices/axiom/branches/datatypes/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java
webservices/axiom/branches/datatypes/aspects/fom-aspects/pom.xml
webservices/axiom/branches/datatypes/aspects/om-aspects/pom.xml
webservices/axiom/branches/datatypes/aspects/pom.xml
webservices/axiom/branches/datatypes/aspects/shared-aspects/pom.xml
webservices/axiom/branches/datatypes/axiom-all/pom.xml
webservices/axiom/branches/datatypes/axiom-api/pom.xml
webservices/axiom/branches/datatypes/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
webservices/axiom/branches/datatypes/axiom-c14n/pom.xml
webservices/axiom/branches/datatypes/axiom-compat/pom.xml
webservices/axiom/branches/datatypes/axiom-jaxb/pom.xml
webservices/axiom/branches/datatypes/buildutils/jar-resource-bundle/pom.xml
webservices/axiom/branches/datatypes/buildutils/pom.xml
webservices/axiom/branches/datatypes/buildutils/shade-axiom-xml/pom.xml
webservices/axiom/branches/datatypes/buildutils/shade-osgi/pom.xml
webservices/axiom/branches/datatypes/code-coverage/pom.xml
webservices/axiom/branches/datatypes/components/xml-utils/ (props changed)
webservices/axiom/branches/datatypes/devguide/pom.xml
webservices/axiom/branches/datatypes/distribution/pom.xml
webservices/axiom/branches/datatypes/implementations/axiom-dom/pom.xml
webservices/axiom/branches/datatypes/implementations/axiom-impl/pom.xml
webservices/axiom/branches/datatypes/implementations/fom-impl/ (props changed)
webservices/axiom/branches/datatypes/implementations/fom-impl/pom.xml
webservices/axiom/branches/datatypes/implementations/pom.xml
webservices/axiom/branches/datatypes/pom.xml
webservices/axiom/branches/datatypes/samples/pom.xml
webservices/axiom/branches/datatypes/src/site/site.xml
webservices/axiom/branches/datatypes/systests/cross-om-tests/pom.xml
webservices/axiom/branches/datatypes/systests/eclipse-tests/pom.xml
webservices/axiom/branches/datatypes/systests/integration-tests/pom.xml
webservices/axiom/branches/datatypes/systests/jboss-tests/pom.xml
webservices/axiom/branches/datatypes/systests/old-tests/pom.xml
webservices/axiom/branches/datatypes/systests/osgi-tests/pom.xml
webservices/axiom/branches/datatypes/systests/pom.xml
webservices/axiom/branches/datatypes/systests/spring-ws-tests/pom.xml
webservices/axiom/branches/datatypes/systests/wss4j-tests/pom.xml
webservices/axiom/branches/datatypes/testing/axiom-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/axiom-truth/pom.xml
webservices/axiom/branches/datatypes/testing/dom-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/fom-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/jaxen-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/multiton/pom.xml
webservices/axiom/branches/datatypes/testing/pom.xml
webservices/axiom/branches/datatypes/testing/saaj-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/soap-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java
webservices/axiom/branches/datatypes/testing/spring-ws-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/testutils/pom.xml
webservices/axiom/branches/datatypes/testing/xml-testsuite/pom.xml
webservices/axiom/branches/datatypes/testing/xml-truth/pom.xml
webservices/axiom/branches/datatypes/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
webservices/axiom/branches/datatypes/userguide/pom.xml
Propchange: webservices/axiom/branches/datatypes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 22 21:15:31 2015
@@ -11,4 +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:1714490-1715042
+/webservices/axiom/trunk:1714490-1715694
Modified: webservices/axiom/branches/datatypes/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/apidocs/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/apidocs/pom.xml (original)
+++ webservices/axiom/branches/datatypes/apidocs/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>apidocs</artifactId>
Modified: webservices/axiom/branches/datatypes/aspects/core-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/core-aspects/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/aspects/core-aspects/pom.xml (original)
+++ webservices/axiom/branches/datatypes/aspects/core-aspects/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>aspects</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>core-aspects</artifactId>
Modified: webservices/axiom/branches/datatypes/aspects/dom-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/dom-aspects/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/aspects/dom-aspects/pom.xml (original)
+++ webservices/axiom/branches/datatypes/aspects/dom-aspects/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>aspects</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>dom-aspects</artifactId>
@@ -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/datatypes/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java (original)
+++ webservices/axiom/branches/datatypes/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java Sun Nov 22 21:15:31 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/datatypes/aspects/fom-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/fom-aspects/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/aspects/fom-aspects/pom.xml (original)
+++ webservices/axiom/branches/datatypes/aspects/fom-aspects/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>aspects</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>fom-aspects</artifactId>
Modified: webservices/axiom/branches/datatypes/aspects/om-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/om-aspects/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/aspects/om-aspects/pom.xml (original)
+++ webservices/axiom/branches/datatypes/aspects/om-aspects/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>aspects</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>om-aspects</artifactId>
Modified: webservices/axiom/branches/datatypes/aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/aspects/pom.xml (original)
+++ webservices/axiom/branches/datatypes/aspects/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>aspects</artifactId>
Modified: webservices/axiom/branches/datatypes/aspects/shared-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/aspects/shared-aspects/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/aspects/shared-aspects/pom.xml (original)
+++ webservices/axiom/branches/datatypes/aspects/shared-aspects/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>aspects</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>shared-aspects</artifactId>
Modified: webservices/axiom/branches/datatypes/axiom-all/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/axiom-all/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/axiom-all/pom.xml (original)
+++ webservices/axiom/branches/datatypes/axiom-all/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-all</artifactId>
Modified: webservices/axiom/branches/datatypes/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/axiom-api/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/axiom-api/pom.xml (original)
+++ webservices/axiom/branches/datatypes/axiom-api/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-api</artifactId>
Modified: webservices/axiom/branches/datatypes/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java (original)
+++ webservices/axiom/branches/datatypes/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java Sun Nov 22 21:15:31 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/datatypes/axiom-c14n/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/axiom-c14n/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/axiom-c14n/pom.xml (original)
+++ webservices/axiom/branches/datatypes/axiom-c14n/pom.xml Sun Nov 22 21:15:31 2015
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-c14n</artifactId>
Modified: webservices/axiom/branches/datatypes/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/axiom-compat/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/axiom-compat/pom.xml (original)
+++ webservices/axiom/branches/datatypes/axiom-compat/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-compat</artifactId>
Modified: webservices/axiom/branches/datatypes/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/axiom-jaxb/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/branches/datatypes/axiom-jaxb/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-jaxb</artifactId>
Modified: webservices/axiom/branches/datatypes/buildutils/jar-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/buildutils/jar-resource-bundle/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/buildutils/jar-resource-bundle/pom.xml (original)
+++ webservices/axiom/branches/datatypes/buildutils/jar-resource-bundle/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>buildutils</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>jar-resource-bundle</artifactId>
Modified: webservices/axiom/branches/datatypes/buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/buildutils/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/buildutils/pom.xml (original)
+++ webservices/axiom/branches/datatypes/buildutils/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>buildutils</artifactId>
Modified: webservices/axiom/branches/datatypes/buildutils/shade-axiom-xml/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/buildutils/shade-axiom-xml/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/buildutils/shade-axiom-xml/pom.xml (original)
+++ webservices/axiom/branches/datatypes/buildutils/shade-axiom-xml/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>buildutils</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>shade-axiom-xml</artifactId>
Modified: webservices/axiom/branches/datatypes/buildutils/shade-osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/buildutils/shade-osgi/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/buildutils/shade-osgi/pom.xml (original)
+++ webservices/axiom/branches/datatypes/buildutils/shade-osgi/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>buildutils</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>shade-osgi</artifactId>
Modified: webservices/axiom/branches/datatypes/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/code-coverage/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/code-coverage/pom.xml (original)
+++ webservices/axiom/branches/datatypes/code-coverage/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>code-coverage</artifactId>
@@ -188,6 +188,25 @@
<version>${project.version}</version>
<classifier>jacoco</classifier>
<type>exec</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-truth</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-truth</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xml-truth</artifactId>
+ <version>${project.version}</version>
+ <classifier>jacoco</classifier>
+ <type>exec</type>
</dependency>
<dependency>
Propchange: webservices/axiom/branches/datatypes/components/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 22 21:15:31 2015
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Modified: webservices/axiom/branches/datatypes/devguide/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/devguide/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/devguide/pom.xml (original)
+++ webservices/axiom/branches/datatypes/devguide/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>devguide</artifactId>
Modified: webservices/axiom/branches/datatypes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/distribution/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/distribution/pom.xml (original)
+++ webservices/axiom/branches/datatypes/distribution/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
Modified: webservices/axiom/branches/datatypes/implementations/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-dom/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/implementations/axiom-dom/pom.xml (original)
+++ webservices/axiom/branches/datatypes/implementations/axiom-dom/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>implementations</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-dom</artifactId>
Modified: webservices/axiom/branches/datatypes/implementations/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/axiom-impl/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/implementations/axiom-impl/pom.xml (original)
+++ webservices/axiom/branches/datatypes/implementations/axiom-impl/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>implementations</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-impl</artifactId>
Propchange: webservices/axiom/branches/datatypes/implementations/fom-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 22 21:15:31 2015
@@ -1 +1,2 @@
/abdera/java/branches/axiom-upgrade/parser:1371877-1374810
+/webservices/axiom/trunk/implementations/fom-impl:1714490-1715694
Modified: webservices/axiom/branches/datatypes/implementations/fom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/fom-impl/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/implementations/fom-impl/pom.xml (original)
+++ webservices/axiom/branches/datatypes/implementations/fom-impl/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>implementations</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>fom-impl</artifactId>
Modified: webservices/axiom/branches/datatypes/implementations/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/implementations/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/implementations/pom.xml (original)
+++ webservices/axiom/branches/datatypes/implementations/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>implementations</artifactId>
@@ -88,6 +88,7 @@
<artifactSet>
<includes>
<include>${project.groupId}:*-aspects</include>
+ <include>${project.groupId}:xml-utils</include>
<include>${project.groupId}:datatypes</include>
<include>org.aspectj:aspectjrt</include>
</includes>
Modified: webservices/axiom/branches/datatypes/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/pom.xml (original)
+++ webservices/axiom/branches/datatypes/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.ws</groupId>
<artifactId>ws-parent</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>2</version>
</parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Axiom</name>
@@ -223,6 +223,7 @@
<module>testing</module>
<module>aspects</module>
<module>implementations</module>
+ <module>components</module>
<module>datatypes</module>
</modules>
Modified: webservices/axiom/branches/datatypes/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/samples/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/samples/pom.xml (original)
+++ webservices/axiom/branches/datatypes/samples/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>samples</artifactId>
Modified: webservices/axiom/branches/datatypes/src/site/site.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/src/site/site.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/src/site/site.xml (original)
+++ webservices/axiom/branches/datatypes/src/site/site.xml Sun Nov 22 21:15:31 2015
@@ -53,6 +53,7 @@
<item name="1.2.14" href="release-notes/1.2.14.html"/>
<item name="1.2.15" href="release-notes/1.2.15.html"/>
<item name="1.2.16" href="release-notes/1.2.16.html"/>
+ <item name="1.2.17" href="release-notes/1.2.17.html"/>
</item>
<item name="Quick start samples" href="quickstart-samples.html"/>
<item name="User guide" href="userguide/userguide.html"/>
Modified: webservices/axiom/branches/datatypes/systests/cross-om-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/cross-om-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/cross-om-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/cross-om-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>cross-om-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/eclipse-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/eclipse-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/eclipse-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/eclipse-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>eclipse-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/integration-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/integration-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/integration-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>integration-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/jboss-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/jboss-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/jboss-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/jboss-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>jboss-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/old-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/old-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/old-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/old-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>old-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/osgi-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/osgi-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/osgi-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>osgi-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>systests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/spring-ws-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/spring-ws-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/spring-ws-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/spring-ws-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>spring-ws-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/systests/wss4j-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/systests/wss4j-tests/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/systests/wss4j-tests/pom.xml (original)
+++ webservices/axiom/branches/datatypes/systests/wss4j-tests/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>wss4j-tests</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/axiom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/axiom-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/axiom-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/axiom-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-testsuite</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/axiom-truth/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/axiom-truth/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/axiom-truth/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/axiom-truth/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>axiom-truth</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/dom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/dom-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/dom-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/dom-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>dom-testsuite</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/fom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/fom-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/fom-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/fom-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>fom-testsuite</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/jaxen-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/jaxen-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/jaxen-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/jaxen-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>jaxen-testsuite</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/multiton/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/multiton/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/multiton/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/multiton/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>multiton</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>testing</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/saaj-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/saaj-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/saaj-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/saaj-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>saaj-testsuite</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/soap-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/soap-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/soap-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/soap-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>soap-testsuite</artifactId>
@@ -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>${project.groupId}</groupId>
<artifactId>datatypes</artifactId>
<version>${project.version}</version>
Modified: webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java (original)
+++ webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java Sun Nov 22 21:15:31 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.text.ParseException;
@@ -201,10 +203,6 @@ final class ConvertedSOAPSampleContent e
return null;
}
- private static boolean isWhitespace(char c) {
- return " \r\n\t".indexOf(c) != -1;
- }
-
private static String[] getSurroundingWhitespace(String text) {
int start = 0;
while (isWhitespace(text.charAt(start))) {
Modified: webservices/axiom/branches/datatypes/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/spring-ws-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/spring-ws-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>spring-ws-testsuite</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/testutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>testutils</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/xml-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-testsuite/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-testsuite/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/xml-testsuite/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>xml-testsuite</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/xml-truth/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-truth/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-truth/pom.xml (original)
+++ webservices/axiom/branches/datatypes/testing/xml-truth/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testing</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>xml-truth</artifactId>
Modified: webservices/axiom/branches/datatypes/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java (original)
+++ webservices/axiom/branches/datatypes/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java Sun Nov 22 21:15:31 2015
@@ -39,4 +39,21 @@ public class XMLSubjectTest {
.ignoringRedundantNamespaceDeclarations()
.hasSameContentAs("<a xmlns:p='#1'><b/></a>");
}
+
+ @Test
+ public void testIgnoringNamespaceDeclarationsAndPrefixes() {
+ assertAbout(xml())
+ .that("<p:a xmlns:p='urn:ns'/>")
+ .ignoringNamespacePrefixes()
+ .ignoringNamespaceDeclarations()
+ .hasSameContentAs("<a xmlns='urn:ns'/>");
+ }
+
+ @Test
+ public void testIgnoringComments() {
+ assertAbout(xml())
+ .that("<a><!-- comment --></a>")
+ .ignoringComments()
+ .hasSameContentAs("<a/>");
+ }
}
Modified: webservices/axiom/branches/datatypes/userguide/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/userguide/pom.xml?rev=1715696&r1=1715695&r2=1715696&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/userguide/pom.xml (original)
+++ webservices/axiom/branches/datatypes/userguide/pom.xml Sun Nov 22 21:15:31 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
- <version>1.2.16-SNAPSHOT</version>
+ <version>1.2.17-SNAPSHOT</version>
</parent>
<artifactId>userguide</artifactId>