You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2012/12/29 21:03:16 UTC
svn commit: r1426817 [1/2] - in /webservices/axiom/branches/AXIOM-201: ./
apidocs/ apidocs/src/ apidocs/src/main/ apidocs/src/main/assembly/
devguide/ devguide/src/ devguide/src/docbkx/ devguide/src/docbkx/images/
distribution/ distribution/src/ distri...
Author: veithen
Date: Sat Dec 29 20:03:14 2012
New Revision: 1426817
URL: http://svn.apache.org/viewvc?rev=1426817&view=rev
Log:
Merged latest changes from trunk.
Added:
webservices/axiom/branches/AXIOM-201/apidocs/ (props changed)
- copied from r1426814, webservices/commons/trunk/modules/axiom/apidocs/
webservices/axiom/branches/AXIOM-201/apidocs/pom.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/apidocs/pom.xml
webservices/axiom/branches/AXIOM-201/apidocs/src/
- copied from r1426814, webservices/commons/trunk/modules/axiom/apidocs/src/
webservices/axiom/branches/AXIOM-201/apidocs/src/main/
- copied from r1426814, webservices/commons/trunk/modules/axiom/apidocs/src/main/
webservices/axiom/branches/AXIOM-201/apidocs/src/main/assembly/
- copied from r1426814, webservices/commons/trunk/modules/axiom/apidocs/src/main/assembly/
webservices/axiom/branches/AXIOM-201/apidocs/src/main/assembly/apidocs.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/apidocs/src/main/assembly/apidocs.xml
webservices/axiom/branches/AXIOM-201/devguide/ (props changed)
- copied from r1426814, webservices/commons/trunk/modules/axiom/devguide/
webservices/axiom/branches/AXIOM-201/devguide/pom.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/devguide/pom.xml
webservices/axiom/branches/AXIOM-201/devguide/src/
- copied from r1426814, webservices/commons/trunk/modules/axiom/devguide/src/
webservices/axiom/branches/AXIOM-201/devguide/src/docbkx/
- copied from r1426814, webservices/commons/trunk/modules/axiom/devguide/src/docbkx/
webservices/axiom/branches/AXIOM-201/devguide/src/docbkx/devguide.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/devguide/src/docbkx/devguide.xml
webservices/axiom/branches/AXIOM-201/devguide/src/docbkx/images/
- copied from r1426814, webservices/commons/trunk/modules/axiom/devguide/src/docbkx/images/
webservices/axiom/branches/AXIOM-201/devguide/src/docbkx/images/sonarj-939984.png
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/devguide/src/docbkx/images/sonarj-939984.png
webservices/axiom/branches/AXIOM-201/devguide/src/docbkx/images/sonarj-944680.png
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/devguide/src/docbkx/images/sonarj-944680.png
webservices/axiom/branches/AXIOM-201/distribution/ (props changed)
- copied from r1426814, webservices/commons/trunk/modules/axiom/distribution/
webservices/axiom/branches/AXIOM-201/distribution/pom.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/distribution/pom.xml
webservices/axiom/branches/AXIOM-201/distribution/src/
- copied from r1426814, webservices/commons/trunk/modules/axiom/distribution/src/
webservices/axiom/branches/AXIOM-201/distribution/src/main/
- copied from r1426814, webservices/commons/trunk/modules/axiom/distribution/src/main/
webservices/axiom/branches/AXIOM-201/distribution/src/main/assembly/
- copied from r1426814, webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/
webservices/axiom/branches/AXIOM-201/distribution/src/main/assembly/bin.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/bin.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildElementIterator.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildElementIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLocalNameIterator.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLocalNameIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenNamespaceIterator.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenNamespaceIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMDescendantsIterator.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMDescendantsIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/test/java/org/apache/axiom/attachments/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/attachments/
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/llom/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/llom/
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/llom/util/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/llom/util/
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/llom/util/AXIOMUtilTest.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/llom/util/AXIOMUtilTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestAxiom95.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestAxiom95.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestElementPullStreamAndOMExpansion.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestElementPullStreamAndOMExpansion.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestElementPullStreamAndOMExpansion2.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestElementPullStreamAndOMExpansion2.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestElementPullStreamAndOMExpansion3.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/misc/TestElementPullStreamAndOMExpansion3.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/element/purchase-order.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/element/purchase-order.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/misc/
- copied from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/misc/
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/misc/defaultNamespace2.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/misc/defaultNamespace2.xml
webservices/axiom/branches/AXIOM-201/userguide/ (props changed)
- copied from r1426814, webservices/commons/trunk/modules/axiom/userguide/
webservices/axiom/branches/AXIOM-201/userguide/pom.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/userguide/pom.xml
webservices/axiom/branches/AXIOM-201/userguide/src/
- copied from r1426814, webservices/commons/trunk/modules/axiom/userguide/src/
webservices/axiom/branches/AXIOM-201/userguide/src/docbkx/
- copied from r1426814, webservices/commons/trunk/modules/axiom/userguide/src/docbkx/
webservices/axiom/branches/AXIOM-201/userguide/src/docbkx/images/
- copied from r1426814, webservices/commons/trunk/modules/axiom/userguide/src/docbkx/images/
webservices/axiom/branches/AXIOM-201/userguide/src/docbkx/images/api.jpg
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/userguide/src/docbkx/images/api.jpg
webservices/axiom/branches/AXIOM-201/userguide/src/docbkx/images/architecture.jpg
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/userguide/src/docbkx/images/architecture.jpg
webservices/axiom/branches/AXIOM-201/userguide/src/docbkx/userguide.xml
- copied unchanged from r1426814, webservices/commons/trunk/modules/axiom/userguide/src/docbkx/userguide.xml
Removed:
webservices/axiom/branches/AXIOM-201/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildElementIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLocalNameIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenNamespaceIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMDescendantsIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-parent/
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/DefaultNSHandlingTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMWrapperTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/StaxParserTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/CashWihBuildElementTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/util/stax/xop/
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/resources/defaultNamespace2.xml
webservices/axiom/branches/AXIOM-201/src/docbkx/devguide.xml
webservices/axiom/branches/AXIOM-201/src/docbkx/images/api.jpg
webservices/axiom/branches/AXIOM-201/src/docbkx/images/architecture.jpg
webservices/axiom/branches/AXIOM-201/src/docbkx/images/sonarj-939984.png
webservices/axiom/branches/AXIOM-201/src/docbkx/images/sonarj-944680.png
webservices/axiom/branches/AXIOM-201/src/docbkx/userguide.xml
webservices/axiom/branches/AXIOM-201/src/docbkx/xsl/common.xsl
webservices/axiom/branches/AXIOM-201/src/docbkx/xsl/html.xsl
webservices/axiom/branches/AXIOM-201/src/main/
Modified:
webservices/axiom/branches/AXIOM-201/ (props changed)
webservices/axiom/branches/AXIOM-201/modules/axiom-all/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-api/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-buildutils/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-c14n/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl-testsuite/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/JavaMailMultipartWriterFactory.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/package.html
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/EmptyOMLocation.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderImpl.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/XMLComparisonException.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java
webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/UUIDGenerator.java
webservices/axiom/branches/AXIOM-201/modules/axiom-dom-testsuite/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-dom/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-impl/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-integration/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-jaxb/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-jaxen-testsuite/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-osgi-tests/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-samples/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OmStAXBuilderTest.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/pom.xml
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testutils/pom.xml
webservices/axiom/branches/AXIOM-201/pom.xml
webservices/axiom/branches/AXIOM-201/src/docbkx/xsl/fo.xsl
Propchange: webservices/axiom/branches/AXIOM-201/
------------------------------------------------------------------------------
Merged /webservices/commons/trunk/modules/axiom:r1424544-1426814
Propchange: webservices/axiom/branches/AXIOM-201/apidocs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 29 20:03:14 2012
@@ -0,0 +1 @@
+target
Propchange: webservices/axiom/branches/AXIOM-201/devguide/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 29 20:03:14 2012
@@ -0,0 +1 @@
+target
Propchange: webservices/axiom/branches/AXIOM-201/distribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 29 20:03:14 2012
@@ -0,0 +1 @@
+target
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-all/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-all/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-all/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-all/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-all</artifactId>
<name>Axiom Uber-JAR</name>
@@ -109,6 +109,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-api/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-api/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-api/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-api</artifactId>
<name>Axiom API</name>
@@ -102,14 +102,7 @@
<!-- We need this in the StAX dialect for Woodstox 4 -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
@@ -233,6 +226,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-buildutils/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-buildutils/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-buildutils/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-buildutils</artifactId>
<name>Axiom Build Utilities</name>
@@ -73,6 +73,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-c14n/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-c14n/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-c14n/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-c14n/pom.xml Sat Dec 29 20:03:14 2012
@@ -19,13 +19,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>axiom-c14n</artifactId>
<name>Axiom C14N</name>
<packaging>bundle</packaging>
@@ -70,6 +70,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl-testsuite/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl-testsuite/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl-testsuite/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-common-impl-testsuite</artifactId>
<name>Axiom Common Implementation Test Suite</name>
@@ -61,4 +61,15 @@
<artifactId>xmlunit</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-common-impl</artifactId>
<name>Axiom Common Implementation Classes</name>
@@ -67,6 +67,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java Sat Dec 29 20:03:14 2012
@@ -69,29 +69,4 @@ public class OMChildrenQNameIterator ext
return false;
}
}
-
- /**
- * Prior versions of the OMChildrenQNameIterator used the following
- * logic to check equality. This algorithm is incorrect; however some customers
- * have dependency on this behavior. This method is retained (but deprecated) to allow
- * them an opportunity to use the old algorithm.
- *
- * @param searchQName
- * @param currentQName
- * @return true using legacy equality match
- * @deprecated
- */
- public static boolean isEquals_Legacy(QName searchQName, QName currentQName) {
-
- // if the given localname is null, whatever value this.qname has, its a match. But can one give a QName without a localName ??
- String localPart = searchQName.getLocalPart();
- boolean localNameMatch =(localPart == null) || (localPart.equals("")) ||
- ((currentQName != null) && currentQName.getLocalPart().equals(localPart));
- String namespaceURI = searchQName.getNamespaceURI();
- boolean namespaceURIMatch = (namespaceURI.equals(""))||
- ((currentQName != null) && currentQName.getNamespaceURI().equals(namespaceURI));
- return localNameMatch && namespaceURIMatch;
- }
-
-
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-compat</artifactId>
<name>Axiom Compatibility Classes</name>
@@ -53,7 +53,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>axiom-dom</artifactId>
<version>${project.version}</version>
- <optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -67,5 +67,21 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/JavaMailMultipartWriterFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/JavaMailMultipartWriterFactory.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/JavaMailMultipartWriterFactory.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/JavaMailMultipartWriterFactory.java Sat Dec 29 20:03:14 2012
@@ -23,9 +23,16 @@ import java.io.OutputStream;
import org.apache.axiom.mime.MultipartWriter;
import org.apache.axiom.mime.MultipartWriterFactory;
+import org.apache.axiom.mime.impl.axiom.AxiomMultipartWriterFactory;
/**
* Factory for the JavaMail based {@link MultipartWriter} implementation.
+ *
+ * @deprecated The original purpose of this class was to provide an alternative implementation
+ * should bugs be discovered in {@link AxiomMultipartWriterFactory}. However,
+ * {@link AxiomMultipartWriterFactory} exists for several releases now and has no known
+ * issues. It should therefore always be used as {@link MultipartWriterFactory}
+ * implementation.
*/
public class JavaMailMultipartWriterFactory implements MultipartWriterFactory {
public static final MultipartWriterFactory INSTANCE = new JavaMailMultipartWriterFactory();
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/package.html
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/package.html?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/package.html (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/mime/impl/javamail/package.html Sat Dec 29 20:03:14 2012
@@ -18,6 +18,6 @@
-->
<html>
<body>
-MIME message processing API implementation based on JavaMail.
+MIME message processing API implementation based on JavaMail (deprecated).
</body>
</html>
\ No newline at end of file
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/EmptyOMLocation.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/EmptyOMLocation.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/EmptyOMLocation.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/EmptyOMLocation.java Sat Dec 29 20:03:14 2012
@@ -22,7 +22,7 @@ package org.apache.axiom.om.impl;
import org.apache.axiom.util.stax.DummyLocation;
/**
- * @deprecated use {@link DummyLocation#INSTANCE} instead
+ * @deprecated Use {@link DummyLocation#INSTANCE} instead.
*/
public class EmptyOMLocation extends DummyLocation {
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java Sat Dec 29 20:03:14 2012
@@ -24,16 +24,25 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.validation.Schema;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.dom.DOMMetaFactory;
+
/**
* @deprecated
* This class has static methods that allow to switch between DOOM and the default
* DOM implementation as returned by JAXP. This was a hack introduced for Rampart.
* Recent versions of Rampart no longer rely on this hack. On the other hand
* usage of {@link #setDOOMRequired(boolean)} in a concurrent environment can
- * lead to unexpected behavior and severe bugs, as shown in AXIOM-3 and AXIS2-1570.
+ * lead to unexpected behavior and severe bugs, as shown in
+ * <a href="https://issues.apache.org/jira/browse/AXIOM-3">AXIOM-3</a> and
+ * <a href="https://issues.apache.org/jira/browse/AXIS2-1570">AXIS2-1570</a>.
* Due to the way {@link #newDocumentBuilder()} is implemented, it is not possible
* to get rid of the setDOOMRequired hack without the risk of breaking existing code.
- * Therefore this class has been deprecated in favor of {@link DOOMDocumentBuilderFactory}.
+ * <p>
+ * Application code should always use {@link DOMMetaFactory#newDocumentBuilderFactory()}
+ * to get an Axiom compatible {@link DocumentBuilderFactory} and should not attempt to
+ * override the JVM's default {@link DocumentBuilderFactory} with an Axiom compatible
+ * version.
*/
public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory {
@@ -47,6 +56,9 @@ public class DocumentBuilderFactoryImpl
private static String originalDocumentBuilderFactoryClassName = null;
private static ThreadLocal documentBuilderFactoryTracker = new ThreadLocal();
+ private static final DOMMetaFactory domMetaFactory =
+ (DOMMetaFactory)OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
+
protected Schema schema;
public static boolean isDOOMRequired() {
@@ -91,7 +103,7 @@ public class DocumentBuilderFactoryImpl
* Determine which DocumentBuilder implementation should be returned
*/
return isDOOMRequired()
- ? new DocumentBuilderImpl(this)
+ ? new DocumentBuilderImpl(this, domMetaFactory)
: originalDocumentBuilderFactory.newDocumentBuilder();
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderImpl.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderImpl.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/DocumentBuilderImpl.java Sat Dec 29 20:03:14 2012
@@ -19,11 +19,10 @@
package org.apache.axiom.om.impl.dom.jaxp;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.dom.DOMMetaFactory;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.dom.DocumentImpl;
-import org.apache.axiom.om.impl.dom.ElementImpl;
-import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
-import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
import org.apache.axiom.om.util.StAXUtils;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
@@ -42,16 +41,19 @@ import java.io.IOException;
import java.io.InputStream;
/**
- * @deprecated see {@link DocumentBuilderFactoryImpl}
+ * @deprecated See {@link DocumentBuilderFactoryImpl} for the reason why this class is deprecated.
*/
public class DocumentBuilderImpl extends DocumentBuilder {
/** The DocumentBuilderFactory used to create this document builder */
private DocumentBuilderFactoryImpl factory;
- protected DocumentBuilderImpl(DocumentBuilderFactoryImpl fac) {
+ private final DOMMetaFactory domMetaFactory;
+
+ protected DocumentBuilderImpl(DocumentBuilderFactoryImpl fac, DOMMetaFactory domMetaFactory) {
super();
this.factory = fac;
+ this.domMetaFactory = domMetaFactory;
}
/**
@@ -75,7 +77,7 @@ public class DocumentBuilderImpl extends
}
public DOMImplementation getDOMImplementation() {
- return OMDOMMetaFactory.INSTANCE.getDOMImplementation();
+ return domMetaFactory.getDOMImplementation();
}
/**
@@ -84,10 +86,7 @@ public class DocumentBuilderImpl extends
* @see javax.xml.parsers.DocumentBuilder#newDocument()
*/
public Document newDocument() {
- OMDOMFactory factory = new OMDOMFactory();
- DocumentImpl documentImpl = new DocumentImpl(factory);
- documentImpl.setComplete(true);
- return documentImpl;
+ return (Document)domMetaFactory.getOMFactory().createOMDocument();
}
public void setEntityResolver(EntityResolver er) {
@@ -101,14 +100,14 @@ public class DocumentBuilderImpl extends
public Document parse(InputSource inputSource) throws SAXException,
IOException {
try {
- OMDOMFactory factory = new OMDOMFactory();
+ OMFactory factory = domMetaFactory.getOMFactory();
// Not really sure whether this will work :-?
XMLStreamReader reader = StAXUtils
.createXMLStreamReader(inputSource.getCharacterStream());
StAXOMBuilder builder = new StAXOMBuilder(factory, reader);
- DocumentImpl doc = (DocumentImpl) builder.getDocument();
- ((ElementImpl) doc.getDocumentElement()).build();
- return (DocumentImpl) builder.getDocument();
+ OMDocument doc = builder.getDocument();
+ doc.build();
+ return (Document)doc;
} catch (XMLStreamException e) {
throw new SAXException(e);
}
@@ -117,11 +116,11 @@ public class DocumentBuilderImpl extends
/** @see javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream) */
public Document parse(InputStream is) throws SAXException, IOException {
try {
- OMDOMFactory factory = new OMDOMFactory();
+ OMFactory factory = domMetaFactory.getOMFactory();
XMLStreamReader reader = StAXUtils
.createXMLStreamReader(is);
StAXOMBuilder builder = new StAXOMBuilder(factory, reader);
- return (DocumentImpl) builder.getDocument();
+ return (Document) builder.getDocument();
} catch (XMLStreamException e) {
throw new SAXException(e);
}
@@ -130,11 +129,11 @@ public class DocumentBuilderImpl extends
/** @see javax.xml.parsers.DocumentBuilder#parse(java.io.File) */
public Document parse(File file) throws SAXException, IOException {
try {
- OMDOMFactory factory = new OMDOMFactory();
+ OMFactory factory = domMetaFactory.getOMFactory();
XMLStreamReader reader = StAXUtils
.createXMLStreamReader(new FileInputStream(file));
StAXOMBuilder builder = new StAXOMBuilder(factory, reader);
- return (DocumentImpl) builder.getDocument();
+ return (Document) builder.getDocument();
} catch (XMLStreamException e) {
throw new SAXException(e);
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/XMLComparisonException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/XMLComparisonException.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/XMLComparisonException.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/exception/XMLComparisonException.java Sat Dec 29 20:03:14 2012
@@ -19,6 +19,11 @@
package org.apache.axiom.om.impl.exception;
+import org.apache.axiom.om.impl.llom.util.XMLComparator;
+
+/**
+ * @deprecated This exception is only used by {@link XMLComparator} which is deprecated.
+ */
public class XMLComparisonException extends Exception {
private static final long serialVersionUID = -7918497983548520994L;
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java Sat Dec 29 20:03:14 2012
@@ -27,8 +27,6 @@ import org.apache.axiom.soap.impl.builde
import javax.xml.stream.XMLStreamReader;
/**
- * Class OMXMLBuilderFactory
- *
* @deprecated This class is deprecated because it is located in the wrong package and JAR
* (it is implementation independent but belongs to LLOM). Please use
* {@link org.apache.axiom.om.OMXMLBuilderFactory} instead.
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java Sat Dec 29 20:03:14 2012
@@ -31,7 +31,9 @@ import java.util.Iterator;
import java.util.Vector;
-/** @deprecated This class is outdated. Please use XmlUnit to compate two xml files. */
+/**
+ * @deprecated This class is no longer maintained. Please use XmlUnit to compare XML documents.
+ */
public class XMLComparator {
private static final Log log = LogFactory.getLog(XMLComparator.class);
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java Sat Dec 29 20:03:14 2012
@@ -36,6 +36,9 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.util.base64.Base64EncodingStringBufferOutputStream;
import org.apache.axiom.util.base64.Base64Utils;
+/**
+ * @deprecated Class containing only deprecated utility methods.
+ */
public class TextHelper {
/**
* @deprecated
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/UUIDGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/UUIDGenerator.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/UUIDGenerator.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/UUIDGenerator.java Sat Dec 29 20:03:14 2012
@@ -27,12 +27,14 @@ import java.util.Date;
import java.util.Random;
import org.apache.axiom.om.OMException;
+import org.apache.axiom.util.UIDGenerator;
/**
- * @deprecated Please use one of the specialized methods in the
- * {@link org.apache.axiom.util.UIDGenerator} class. In contrast to what its name
- * suggests, the {@link #getUUID()} method doesn't return a UUID. It also doesn't return
- * a valid URN with uuid NID. See AXIS2-4527 for more information.
+ * @deprecated Please use one of the specialized methods in the {@link UIDGenerator} class. In
+ * contrast to what its name suggests, the {@link #getUUID()} method doesn't return a
+ * UUID. It doesn't return a valid URN with uuid NID either. See <a
+ * href="https://issues.apache.org/jira/browse/AXIS2-4527">AXIS2-4527</a> for more
+ * information.
*/
public class UUIDGenerator {
/** This class will give UUIDs for axis2. */
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-dom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-dom-testsuite/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-dom-testsuite/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-dom-testsuite/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-dom-testsuite</artifactId>
<name>Axiom DOM Test Suite</name>
@@ -71,6 +71,17 @@
<artifactId>xmlunit</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-dom/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-dom/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-dom/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-dom</artifactId>
<name>Axiom DOM</name>
@@ -195,6 +195,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-impl/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-impl/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-impl/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-impl</artifactId>
<name>Axiom Impl</name>
@@ -178,6 +178,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-integration/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-integration/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-integration/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-integration</artifactId>
<name>Axiom Integration Test Suite</name>
@@ -131,6 +131,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-jaxb/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-jaxb/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-jaxb</artifactId>
<name>Axiom JAXB Integration</name>
@@ -110,6 +110,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-jaxen-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-jaxen-testsuite/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-jaxen-testsuite/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-jaxen-testsuite/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-jaxen-testsuite</artifactId>
<name>Axiom Jaxen Test Suite</name>
@@ -48,6 +48,17 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-osgi-tests/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-osgi-tests/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-osgi-tests/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-osgi-tests</artifactId>
<name>Axiom OSGi Tests</name>
@@ -108,9 +108,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>1.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -194,13 +194,13 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- </repositories>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-samples/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-samples/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-samples/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-samples</artifactId>
<name>Axiom Samples</name>
@@ -96,6 +96,13 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/pom.xml?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/pom.xml (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/pom.xml Sat Dec 29 20:03:14 2012
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-tests</artifactId>
<name>Axiom Test Suite</name>
@@ -58,12 +58,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <!-- TODO: eliminate this dependency -->
- <groupId>${project.groupId}</groupId>
- <artifactId>axiom-compat</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>
@@ -131,6 +125,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java Sat Dec 29 20:03:14 2012
@@ -23,11 +23,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.TestConstants;
import org.apache.axiom.om.ds.ByteArrayDataSource;
import org.apache.axiom.om.ds.custombuilder.ByteArrayCustomBuilder;
import org.apache.axiom.om.util.CopyUtils;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -36,7 +36,6 @@ import org.apache.axiom.soap.SOAPHeaderB
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
import java.io.InputStream;
import java.util.ArrayList;
@@ -53,9 +52,8 @@ public class CustomBuilderTest extends A
public void testHeaderCustomBuilder() throws Exception{
- XMLStreamReader parser =
- StAXUtils.createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(parser, null);
+ StAXSOAPModelBuilder builder = (StAXSOAPModelBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
builder.registerCustomBuilder(new QName("http://schemas.xmlsoap.org/ws/2004/03/addressing","To"), 3, new
ByteArrayCustomBuilder("utf-8"));
SOAPEnvelope sourceEnv = (SOAPEnvelope) builder.getDocumentElement();
@@ -137,8 +135,7 @@ public class CustomBuilderTest extends A
* @throws Exception
*/
protected SOAPEnvelope createEnvelope(InputStream in) throws Exception {
- XMLStreamReader parser = StAXUtils.createXMLStreamReader(in);
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(parser, null);
+ StAXSOAPModelBuilder builder = (StAXSOAPModelBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(in, null);
builder.registerCustomBuilderForPayload(new ByteArrayCustomBuilder("utf-8"));
return (SOAPEnvelope) builder.getDocumentElement();
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java Sat Dec 29 20:03:14 2012
@@ -32,11 +32,9 @@ import org.apache.axiom.om.TestConstants
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
-import org.apache.axiom.util.stax.xop.XOPEncodedStream;
import org.apache.axiom.util.stax.xop.XOPUtils;
import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import java.io.BufferedInputStream;
@@ -49,9 +47,6 @@ import java.util.List;
public class MTOMStAXSOAPModelBuilderTest extends AbstractTestCase {
- private final static QName XOP_INCLUDE =
- new QName("http://www.w3.org/2004/08/xop/include", "Include");
-
protected void setUp() throws Exception {
super.setUp();
}
@@ -285,44 +280,6 @@ public class MTOMStAXSOAPModelBuilderTes
root.build();
}
- public void testCreateAndXMLStreamReader() throws Exception {
- OMElement root = createTestMTOMMessage();
-
- // Build tree
- root.build();
-
- // Use tree as input to XMLStreamReader
- // Issue XOP:Include events for optimized MTOM text nodes
- XOPEncodedStream xopEncodedStream = XOPUtils.getXOPEncodedStream(root.getXMLStreamReader());
- XMLStreamReader xmlStreamReader = xopEncodedStream.getReader();
-
- DataHandler dh = null;
- while(xmlStreamReader.hasNext() && dh == null) {
- xmlStreamReader.next();
- if (xmlStreamReader.isStartElement()) {
- QName qName =xmlStreamReader.getName();
- if (XOP_INCLUDE.equals(qName)) {
- String hrefValue = xmlStreamReader.getAttributeValue("", "href");
- if (hrefValue != null) {
- dh = xopEncodedStream.getMimePartProvider().getDataHandler(
- XOPUtils.getContentIDFromURL(hrefValue));
- }
- }
- }
- }
- assertTrue(dh != null);
-
- // Make sure next event is an an XOP_Include END element
- xmlStreamReader.next();
- assertTrue(xmlStreamReader.isEndElement());
- assertTrue(XOP_INCLUDE.equals(xmlStreamReader.getName()));
-
- // Make sure the next event is the end tag of name
- xmlStreamReader.next();
- assertTrue(xmlStreamReader.isEndElement());
- assertTrue("name".equals(xmlStreamReader.getLocalName()));
- }
-
private byte[] append(byte[] a, byte[] b) {
byte[] z = new byte[a.length + b.length];
System.arraycopy(a, 0, z, 0, a.length);
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java Sat Dec 29 20:03:14 2012
@@ -33,6 +33,7 @@ import org.apache.axiom.om.TestConstants
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.commons.io.output.NullOutputStream;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -43,12 +44,10 @@ public class ElementSerializerTest exten
private XMLStreamReader reader;
private XMLStreamWriter writer;
private OMXMLParserWrapper builder;
- private File tempFile;
protected void setUp() throws Exception {
reader = StAXUtils.createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
- tempFile = File.createTempFile("temp", "xml");
- writer = StAXUtils.createXMLStreamWriter(new FileOutputStream(tempFile),
+ writer = StAXUtils.createXMLStreamWriter(new NullOutputStream(),
OMConstants.DEFAULT_CHAR_SET_ENCODING);
builder =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(reader);
@@ -122,6 +121,5 @@ public class ElementSerializerTest exten
protected void tearDown() throws Exception {
reader.close();
- tempFile.delete();
}
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java?rev=1426817&r1=1426816&r2=1426817&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java Sat Dec 29 20:03:14 2012
@@ -66,12 +66,9 @@ public class NoNamespaceSerializerTest e
private XMLStreamWriter writer;
// private OMXMLParserWrapper builder;
- // private File tempFile;
private OMXMLParserWrapper builderOne;
private OMXMLParserWrapper builderTwo;
- // private File tempFile;
-
protected void setUp() throws Exception {
readerOne = StAXUtils.createXMLStreamReader(