[java-opensaml COMMIT] in /trunk: opensaml-core/src/main/java/org/opensaml/xml/AbstractExtensibleXMLObjectUnmarshalle...

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Sep 23 15:32:49 2011
New Revision: 2907

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2907&view=rev
Log:
Finish remove of XMLHelper class and migration to appropriate *Support classes in xml package of util module

Removed:
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLHelper.java
Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractExtensibleXMLObjectUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLObjectHelper.java
    trunk/opensaml-core/src/test/java/org/opensaml/xml/XMLObjectBaseTestCase.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml2/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml2/binding/encoding/HandlerChainAwareHTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/binding/decoding/HTTPPostDecoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/http/HttpSOAPClient.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/util/SOAPHelper.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/wssecurity/util/WSSecurityHelper.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/ws/soap/soap11/encoder/SOAP11Encoder.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/net/HttpResource.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/resource/CachingResource.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/xml/NamespaceSupport.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xml/signature/DetachedSignatureTest.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractExtensibleXMLObjectUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractExtensibleXMLObjectUnmarshaller.java?rev=2907&r1=2906&r2=2907&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractExtensibleXMLObjectUnmarshaller.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractExtensibleXMLObjectUnmarshaller.java Fri Sep 23 15:32:49 2011
@@ -21,7 +21,6 @@
 
 import org.opensaml.util.xml.QNameSupport;
 import org.opensaml.xml.io.UnmarshallingException;
-import org.opensaml.xml.util.XMLHelper;
 import org.w3c.dom.Attr;
 
 /**

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java?rev=2907&r1=2906&r2=2907&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java Fri Sep 23 15:32:49 2011
@@ -32,11 +32,10 @@
 import org.opensaml.xml.Configuration;
 import org.opensaml.xml.Namespace;
 import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.parse.XMLParserException;
 import org.opensaml.xml.util.XMLConstants;
-import org.opensaml.xml.util.XMLHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -462,8 +461,8 @@
             log.trace("Rooting all visible namespaces of XMLObject {} before adding it to new parent Element",
                     domCachingObject.getElementQName());
             try {
-                XMLHelper.rootNamespaces(domCachingObject.getDOM());
-            } catch (XMLParserException e) {
+                NamespaceSupport.rootNamespaces(domCachingObject.getDOM());
+            } catch (DOMException e) {
                 String errorMsg = "Unable to root namespaces of cached DOM element, "
                         + domCachingObject.getElementQName();
                 log.error(errorMsg, e);

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLObjectHelper.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLObjectHelper.java?rev=2907&r1=2906&r2=2907&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLObjectHelper.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLObjectHelper.java Fri Sep 23 15:32:49 2011
@@ -20,7 +20,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;

[... 706 lines stripped ...]