You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2019/10/31 14:48:49 UTC

[ws-axiom] 12/25: Merge latest changes from trunk.

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch datatypes
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git

commit 1cb5c08c6201fe5b8a4cc23eaa365b55492218a5
Merge: 016632f 9f85ee3
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun Nov 22 21:15:31 2015 +0000

    Merge latest changes from trunk.

 apidocs/pom.xml                                    |  2 +-
 aspects/core-aspects/pom.xml                       |  2 +-
 aspects/dom-aspects/pom.xml                        |  7 ++-
 .../src/main/java/org/apache/axiom/dom/NSUtil.java | 19 +-----
 aspects/fom-aspects/pom.xml                        |  2 +-
 aspects/om-aspects/pom.xml                         |  2 +-
 aspects/pom.xml                                    |  2 +-
 aspects/shared-aspects/pom.xml                     |  2 +-
 axiom-all/pom.xml                                  |  2 +-
 axiom-api/pom.xml                                  |  2 +-
 .../apache/axiom/om/impl/builder/StAXBuilder.java  |  4 --
 axiom-c14n/pom.xml                                 |  2 +-
 axiom-compat/pom.xml                               |  2 +-
 axiom-jaxb/pom.xml                                 |  2 +-
 buildutils/jar-resource-bundle/pom.xml             |  2 +-
 buildutils/pom.xml                                 |  2 +-
 buildutils/shade-axiom-xml/pom.xml                 |  2 +-
 buildutils/shade-osgi/pom.xml                      |  2 +-
 code-coverage/pom.xml                              | 21 ++++++-
 {testing/multiton => components}/pom.xml           | 21 +++----
 {testing/multiton => components/xml-utils}/pom.xml | 27 +++++----
 .../java/org/apache/axiom/util/xml/XMLChar.java    | 70 ++++++++++++++++++++++
 devguide/pom.xml                                   |  2 +-
 distribution/pom.xml                               |  2 +-
 implementations/axiom-dom/pom.xml                  |  2 +-
 implementations/axiom-impl/pom.xml                 |  2 +-
 implementations/fom-impl/pom.xml                   |  2 +-
 implementations/pom.xml                            |  3 +-
 pom.xml                                            |  5 +-
 samples/pom.xml                                    |  2 +-
 src/site/markdown/release-notes/1.2.17.md          |  2 +
 src/site/site.xml                                  |  1 +
 systests/cross-om-tests/pom.xml                    |  2 +-
 systests/eclipse-tests/pom.xml                     |  2 +-
 systests/integration-tests/pom.xml                 |  2 +-
 systests/jboss-tests/pom.xml                       |  2 +-
 systests/old-tests/pom.xml                         |  2 +-
 systests/osgi-tests/pom.xml                        |  2 +-
 systests/pom.xml                                   |  2 +-
 systests/spring-ws-tests/pom.xml                   |  2 +-
 systests/wss4j-tests/pom.xml                       |  2 +-
 testing/axiom-testsuite/pom.xml                    |  2 +-
 testing/axiom-truth/pom.xml                        |  2 +-
 testing/dom-testsuite/pom.xml                      |  2 +-
 testing/fom-testsuite/pom.xml                      |  2 +-
 testing/jaxen-testsuite/pom.xml                    |  2 +-
 testing/multiton/pom.xml                           |  2 +-
 testing/pom.xml                                    |  2 +-
 testing/saaj-testsuite/pom.xml                     |  2 +-
 testing/soap-testsuite/pom.xml                     |  7 ++-
 .../axiom/ts/soap/ConvertedSOAPSampleContent.java  |  6 +-
 testing/spring-ws-testsuite/pom.xml                |  2 +-
 testing/testutils/pom.xml                          |  2 +-
 testing/xml-testsuite/pom.xml                      |  2 +-
 testing/xml-truth/pom.xml                          |  2 +-
 .../org/apache/axiom/truth/xml/XMLSubjectTest.java | 17 ++++++
 userguide/pom.xml                                  |  2 +-
 57 files changed, 197 insertions(+), 99 deletions(-)

diff --cc implementations/pom.xml
index 24a48e6,a6d5180..1ce22de
--- a/implementations/pom.xml
+++ b/implementations/pom.xml
@@@ -88,7 -88,7 +88,8 @@@
                      <artifactSet>
                          <includes>
                              <include>${project.groupId}:*-aspects</include>
+                             <include>${project.groupId}:xml-utils</include>
 +                            <include>${project.groupId}:datatypes</include>
                              <include>org.aspectj:aspectjrt</include>
                          </includes>
                      </artifactSet>
diff --cc pom.xml
index 529056a,ba13fe7..f4a8c6d
--- a/pom.xml
+++ b/pom.xml
@@@ -223,7 -223,7 +223,8 @@@
          <module>testing</module>
          <module>aspects</module>
          <module>implementations</module>
+         <module>components</module>
 +        <module>datatypes</module>
      </modules>
  
      <scm>
diff --cc testing/soap-testsuite/pom.xml
index 658022a,80e24b3..f0d0ad5
--- a/testing/soap-testsuite/pom.xml
+++ b/testing/soap-testsuite/pom.xml
@@@ -46,10 -46,10 +46,15 @@@
          </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>
 +        </dependency>
 +        <dependency>
              <groupId>commons-io</groupId>
              <artifactId>commons-io</artifactId>
          </dependency>
diff --cc testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java
index 8c46e85,299a5ce..da6bffc
--- a/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java
+++ b/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/ConvertedSOAPSampleContent.java
@@@ -18,9 -18,10 +18,11 @@@
   */
  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;
  import java.util.HashMap;
  import java.util.Map;
  
@@@ -201,14 -208,12 +203,10 @@@ final class ConvertedSOAPSampleContent 
          return null;
      }
      
-     private static boolean isWhitespace(char c) {
-         return " \r\n\t".indexOf(c) != -1;
-     }
-     
 -    private static String transform(String text, TextTransformer transformer) {
 +    private static String[] getSurroundingWhitespace(String text) {
          int start = 0;
          while (isWhitespace(text.charAt(start))) {
 -            if (++start == text.length()) {
 -                return text;
 -            }
 +            start++;
          }
          int end = text.length();
          while (isWhitespace(text.charAt(end-1))) {