RAMPART-454 Finish OpenSAML 5 / Axis2 2.0.x API migration in trust/integration

- getBuilderOrThrow -> ensureBuilder (OpenSAML 5 builder-factory API).
- net.shibboleth.utilities.java.support.xml -> net.shibboleth.shared.xml
  (Shibboleth 9.x repackaging of ParserPool / BasicParserPool).
- SubjectConfirmation.getConfirmationMethod() -> getURI() in the SAML 1.1
  bearer integration test.
- Switch the test axis2.xml transport senders from the HTTPClient4 classes
  (gone in Axis2 2.0) to HTTPClient5TransportSender.

Author: robertlazarski

modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java

@@ -94,7 +94,7 @@ public void validateRsponse(OMElement resp) {
                    subConfirmationMethods.get(0));
         assertEquals("Subject Confirmation should be BEARER : urn:oasis:names:tc:SAML:1.0:cm:bearer",
                          RahasConstants.SAML11_SUBJECT_CONFIRMATION_BEARER,
-                         subConfirmationMethods.get(0).getConfirmationMethod());
+                         subConfirmationMethods.get(0).getURI());
     }
 
     /* (non-Javadoc)

modules/rampart-integration/src/test/resources/conf/axis2.xml

@@ -139,12 +139,12 @@
     <transportSender name="local"
                      class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http"
-                     class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender">
+                     class="org.apache.axis2.transport.http.impl.httpclient5.HTTPClient5TransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
     </transportSender>
     <transportSender name="https"
-                     class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender">
+                     class="org.apache.axis2.transport.http.impl.httpclient5.HTTPClient5TransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
     </transportSender>
@@ -258,7 +258,7 @@
         <phase name="OperationOutFaultPhase"/>
         <phase name="RMPhase"/>
         <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
+        <phase name="MessageOut"/>
         <phase name="Security"/>
     </phaseOrder>    
 </axisconfig>

modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java

@@ -448,7 +448,7 @@ protected Subject createSubjectWithHolderOfKeySubjectConfirmation(Document doc,
     }
 
     private KeyInfoConfirmationDataType createKeyInfoConfirmationDataType() {
-        SAMLObjectBuilder<KeyInfoConfirmationDataType> keyInfoSubjectConfirmationDataBuilder = (SAMLObjectBuilder<KeyInfoConfirmationDataType>) XMLObjectProviderRegistrySupport.getBuilderFactory().<KeyInfoConfirmationDataType>getBuilderOrThrow(KeyInfoConfirmationDataType.TYPE_NAME);
+        SAMLObjectBuilder<KeyInfoConfirmationDataType> keyInfoSubjectConfirmationDataBuilder = (SAMLObjectBuilder<KeyInfoConfirmationDataType>) XMLObjectProviderRegistrySupport.getBuilderFactory().<KeyInfoConfirmationDataType>ensureBuilder(KeyInfoConfirmationDataType.TYPE_NAME);
 
         //Build the subject confirmation data element
         return keyInfoSubjectConfirmationDataBuilder.

modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java

@@ -26,8 +26,8 @@
 
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.dom.DOMMetaFactory;
-import net.shibboleth.utilities.java.support.xml.ParserPool;
-import net.shibboleth.utilities.java.support.xml.BasicParserPool;
+import net.shibboleth.shared.xml.ParserPool;
+import net.shibboleth.shared.xml.impl.BasicParserPool;
 
 /**
  * Custom OpenSAML {@link ParserPool} implementation that uses a DOM aware Axiom implementation

modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/CommonUtil.java

@@ -435,7 +435,7 @@ public static XMLObject buildXMLObject(QName objectQName) throws TrustException
             }
 
         }
-        XMLObjectBuilder builder = builderFactory.getBuilderOrThrow(objectQName);
+        XMLObjectBuilder builder = builderFactory.ensureBuilder(objectQName);
         if (builder == null) {
             log.error("Unable to find OpenSAML builder for object " + objectQName);
             throw new TrustException("builderNotFound",new Object[]{objectQName});

modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLUtils.java

@@ -85,7 +85,7 @@ public static Collection<X509Certificate> getCertChainCollection(X509Certificate
      */
     public static Assertion buildAssertion(Element assertionElement) {
 
-       final SAMLObjectBuilder<Assertion> assertionBuilder = (SAMLObjectBuilder<Assertion>) XMLObjectProviderRegistrySupport.getBuilderFactory().<Assertion>getBuilderOrThrow(Assertion.DEFAULT_ELEMENT_NAME);
+       final SAMLObjectBuilder<Assertion> assertionBuilder = (SAMLObjectBuilder<Assertion>) XMLObjectProviderRegistrySupport.getBuilderFactory().<Assertion>ensureBuilder(Assertion.DEFAULT_ELEMENT_NAME);
 
        return assertionBuilder.buildObject();
     }
@@ -484,7 +484,7 @@ public static Attribute createAttribute(String name, String namespace, String va
 
         XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
 
-        XMLObjectBuilder<XSString> builder = builderFactory.getBuilderOrThrow(XSString.TYPE_NAME);
+        XMLObjectBuilder<XSString> builder = builderFactory.ensureBuilder(XSString.TYPE_NAME);
 
         XSString stringValue = builder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME);
         stringValue.setValue(value);