This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 55f32746700a1360a29b53f274200cd679b59080 Author: Robert Lazarski <[email protected]> AuthorDate: Mon Apr 13 05:27:36 2026 -1000 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. --- .../test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java | 2 +- modules/rampart-integration/src/test/resources/conf/axis2.xml | 6 +++--- .../src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java | 2 +- .../src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java | 4 ++-- .../src/main/java/org/apache/rahas/impl/util/CommonUtil.java | 2 +- .../src/main/java/org/apache/rahas/impl/util/SAMLUtils.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java b/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java index 06467b48..7a989f96 100644 --- a/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java +++ b/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java @@ -94,7 +94,7 @@ public class RahasSAMLTokenUTForBearerTest extends TestClient { 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) diff --git a/modules/rampart-integration/src/test/resources/conf/axis2.xml b/modules/rampart-integration/src/test/resources/conf/axis2.xml index 12059a9e..fafdb7b1 100755 --- a/modules/rampart-integration/src/test/resources/conf/axis2.xml +++ b/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> diff --git a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java index 316f34da..70d1a6ce 100644 --- a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java +++ b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java @@ -448,7 +448,7 @@ public class SAML2TokenIssuer implements TokenIssuer { } 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. diff --git a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java index 67cf066d..0642a02c 100644 --- a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java +++ b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java @@ -26,8 +26,8 @@ import javax.xml.parsers.DocumentBuilderFactory; 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 diff --git a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/CommonUtil.java b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/CommonUtil.java index c95fbd02..8542ca6b 100644 --- a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/CommonUtil.java +++ b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/CommonUtil.java @@ -435,7 +435,7 @@ public class CommonUtil { } } - 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}); diff --git a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLUtils.java b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLUtils.java index 8ba55483..013653e3 100644 --- a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLUtils.java +++ b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLUtils.java @@ -85,7 +85,7 @@ public class SAMLUtils { */ 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 class SAMLUtils { 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);
