From 2e4170ffb896e177646a2d4fbdaac4879188465a Mon Sep 17 00:00:00 2001 From: Maxim Thomas Date: Tue, 19 May 2026 15:30:07 +0300 Subject: [PATCH 01/15] JAXB3 migration --- .../authentication/modules/saml2/SAML2.java | 16 +- .../saml2/SAML2PostAuthenticationPlugin.java | 8 +- .../cli/CreateMetaDataTemplate.java | 3 +- .../federation/cli/ExportMetaData.java | 3 +- .../federation/cli/ImportMetaData.java | 30 +- openam-clientsdk/pom.xml | 7 +- .../federation/SAMLv2SPServicesViewBean.java | 21 +- .../model/CreateMetaDataModelImpl.java | 6 +- .../federation/model/EntityModelImpl.java | 4 +- .../federation/model/IDFFModelImpl.java | 142 +- .../model/ImportEntityModelImpl.java | 20 +- .../federation/model/SAMLv2ModelImpl.java | 556 ++- .../model/WSFedPropertiesModelImpl.java | 96 +- .../service/model/SMDiscoEntryData.java | 39 +- .../service/model/SMDiscoveryServiceData.java | 23 +- .../console/task/model/TaskModelImpl.java | 20 +- openam-core/pom.xml | 27 +- .../xacml3/XACMLPrivilegeUtils.java | 11 +- .../entitlement/xacml3/XACMLReaderWriter.java | 4 +- .../xacml3/XACMLSchemaFactory.java | 3 +- .../entitlement/xacml3/FactoryMethods.java | 3 +- .../xacml3/XACMLPrivilegeUtilsTest.java | 4 +- .../xacml3/XACMLSchemaFactoryTest.java | 3 +- .../identity/classloader/FAMClassLoader.java | 8 +- .../configuration/ConfigFedMonitoring.java | 3 +- .../plugins/FSDefaultSPAdapter.java | 4 +- .../plugins/DiscoEntryHandlerImplUtils.java | 35 +- .../workflow/ConfigureGoogleApps.java | 13 +- .../workflow/ConfigureSalesForceApps.java | 16 +- .../identity/workflow/CreateHostedIDP.java | 4 +- .../sun/identity/workflow/CreateHostedSP.java | 4 +- .../sun/identity/workflow/CreateRemoteSP.java | 16 +- .../workflow/CreateWSFedMetaDataTemplate.java | 106 +- .../workflow/ExportSAML2MetaData.java | 4 +- .../identity/workflow/GetCircleOfTrusts.java | 7 +- .../sun/identity/workflow/GetHostedIDPs.java | 3 +- .../workflow/GetIDPSPPairingInCOT.java | 8 +- .../workflow/ImportSAML2MetaData.java | 7 +- .../sun/identity/workflow/ValidateSAML2.java | 17 +- .../DefaultADFSPartnerAccountMapper.java | 8 +- .../wss/policy/NamespacePrefixMapperImpl.java | 4 +- .../identity/wss/policy/WSSPolicyManager.java | 492 ++- .../identity/wss/policy/WSSPolicyUtils.java | 10 +- .../identity/wss/provider/ProviderConfig.java | 6 +- .../wss/provider/plugins/AgentProvider.java | 8 +- .../common/SystemConfigurationUtil.java | 4 +- .../identity/cot/CircleOfTrustManager.java | 3 +- .../accountmgmt/FSAccountManager.java | 6 +- .../sun/identity/federation/key/KeyUtil.java | 20 +- .../federation/login/FSPostLogin.java | 6 +- .../identity/federation/login/FSPreLogin.java | 6 +- .../common/EncryptedNameIdentifier.java | 5 +- .../federation/meta/IDFFCOTUtils.java | 50 +- .../federation/meta/IDFFMetaManager.java | 46 +- .../meta/IDFFMetaSecurityUtils.java | 65 +- .../federation/meta/IDFFMetaUtils.java | 24 +- .../meta/NamespacePrefixMapperImpl.java | 4 +- .../services/FSAssertionManager.java | 5 +- .../services/FSAuthnDecisionHandler.java | 4 +- .../services/FSDefaultAttributeMapper.java | 4 +- .../services/FSDefaultAttributePlugin.java | 4 +- .../FSDefaultRealmAttributeMapper.java | 4 +- .../FSDefaultRealmAttributePlugin.java | 4 +- .../services/FSDiscoveryBootStrap.java | 4 +- .../federation/services/FSIDPProxyImpl.java | 4 +- .../federation/services/FSLoginHelper.java | 6 +- .../services/FSRealmIDPProxyImpl.java | 4 +- .../federation/services/FSSOAPReceiver.java | 20 +- .../federation/services/FSServiceManager.java | 10 +- .../fednsso/FSAssertionArtifactHandler.java | 6 +- .../fednsso/FSAssertionConsumerService.java | 6 +- .../services/fednsso/FSIDPFinderService.java | 8 +- .../fednsso/FSIntersiteTransferService.java | 4 +- .../services/fednsso/FSSSOAndFedHandler.java | 6 +- .../services/fednsso/FSSSOAndFedService.java | 10 +- .../services/logout/FSLogoutUtil.java | 6 +- .../logout/FSProcessLogoutServlet.java | 6 +- .../logout/FSReturnLogoutServlet.java | 6 +- .../logout/FSSingleLogoutHandler.java | 6 +- .../FSRegistrationInitiationServlet.java | 6 +- .../FSRegistrationRequestServlet.java | 6 +- .../FSRegistrationReturnServlet.java | 6 +- .../FSTerminationInitiationServlet.java | 6 +- .../FSTerminationRequestServlet.java | 6 +- .../FSTerminationReturnServlet.java | 6 +- .../util/FSAttributeStatementHelper.java | 4 +- .../services/util/FSServiceUtils.java | 16 +- .../liberty/ws/authnsvc/AuthnSvcUtils.java | 4 +- .../liberty/ws/disco/DiscoveryService.java | 21 +- .../ws/disco/common/DiscoSDKUtils.java | 10 +- .../ws/disco/common/DiscoServiceManager.java | 3 +- .../liberty/ws/disco/common/DiscoUtils.java | 9 +- .../plugins/IDFFNameIdentifierMapper.java | 4 +- .../liberty/ws/idpp/PPRequestHandler.java | 257 +- .../liberty/ws/idpp/PersonalProfile.java | 3 +- .../liberty/ws/idpp/common/IDPPUtils.java | 29 +- .../ws/idpp/container/IDPPAddressCard.java | 47 +- .../ws/idpp/container/IDPPBaseContainer.java | 146 +- .../ws/idpp/container/IDPPCommonName.java | 22 +- .../ws/idpp/container/IDPPDemographics.java | 109 +- .../idpp/container/IDPPEmergencyContact.java | 34 +- .../container/IDPPEmploymentIdentity.java | 73 +- .../ws/idpp/container/IDPPEncryptKey.java | 73 +- .../container/IDPPExtensionContainer.java | 81 +- .../liberty/ws/idpp/container/IDPPFacade.java | 97 +- .../ws/idpp/container/IDPPInformalName.java | 33 +- .../ws/idpp/container/IDPPLegalIdentity.java | 136 +- .../ws/idpp/container/IDPPMsgContact.java | 45 +- .../ws/idpp/container/IDPPSignKey.java | 75 +- .../ws/interaction/InteractionManager.java | 85 +- .../ws/interaction/InteractionUtils.java | 14 +- .../WSPRedirectHandlerServlet.java | 26 +- .../liberty/ws/soapbinding/Message.java | 10 +- .../NamespacePrefixMapperImpl.java | 4 +- .../liberty/ws/soapbinding/SOAPFault.java | 4 +- .../ws/soapbinding/SOAPFaultDetail.java | 10 +- .../liberty/ws/soapbinding/Utils.java | 18 +- .../liberty/ws/util/IDFFProviderManager.java | 14 +- .../IDFFSingleLogoutHandler.java | 6 +- .../SAML2SingleLogoutHandler.java | 8 +- .../multiprotocol/SingleLogoutManager.java | 4 +- .../WSFederationSingleLogoutHandler.java | 4 +- .../impl/FedletConfigurationImpl.java | 6 +- .../sun/identity/saml2/common/SAML2Utils.java | 81 +- .../com/sun/identity/saml2/key/KeyUtil.java | 54 +- .../saml2/meta/NamespacePrefixMapperImpl.java | 4 +- .../identity/saml2/meta/SAML2COTUtils.java | 125 +- .../identity/saml2/meta/SAML2MetaManager.java | 148 +- .../saml2/meta/SAML2MetaSecurityUtils.java | 71 +- .../identity/saml2/meta/SAML2MetaUtils.java | 127 +- .../saml2/plugins/DefaultAccountMapper.java | 5 +- .../saml2/plugins/DefaultFedletAdapter.java | 6 +- .../identity/saml2/plugins/ECPIDPFinder.java | 4 +- .../saml2/plugins/SAML2IDPProxyFRImpl.java | 21 +- .../saml2/plugins/SAML2IDPProxyImpl.java | 4 +- .../saml2/plugins/SAML2ProviderManager.java | 18 +- .../saml2/profile/AssertionIDRequestUtil.java | 32 +- .../saml2/profile/AttributeQueryUtil.java | 78 +- .../saml2/profile/AuthnQueryUtil.java | 22 +- .../saml2/profile/DiscoveryBootstrap.java | 5 +- .../saml2/profile/DoManageNameID.java | 48 +- .../saml2/profile/IDPArtifactResolution.java | 6 +- .../identity/saml2/profile/IDPProxyUtil.java | 32 +- .../identity/saml2/profile/IDPSSOUtil.java | 75 +- .../saml2/profile/IDPSessionListener.java | 10 +- .../saml2/profile/IDPSingleLogout.java | 41 +- .../identity/saml2/profile/LogoutUtil.java | 48 +- .../identity/saml2/profile/NameIDMapping.java | 18 +- .../identity/saml2/profile/SPACSUtils.java | 26 +- .../identity/saml2/profile/SPSSOFederate.java | 48 +- .../saml2/profile/SPSessionListener.java | 10 +- .../saml2/profile/SPSingleLogout.java | 12 +- .../saml2/soapbinding/QueryClient.java | 16 +- .../soapbinding/QueryHandlerServlet.java | 4 +- .../common/WSFederationUtils.java | 12 +- .../meta/NamespacePrefixMapperImpl.java | 4 +- .../meta/WSFederationCOTUtils.java | 48 +- .../meta/WSFederationMetaManager.java | 93 +- .../meta/WSFederationMetaSecurityUtils.java | 50 +- .../meta/WSFederationMetaUtils.java | 22 +- .../plugins/DefaultAccountMapper.java | 12 +- .../plugins/DefaultAttributeMapper.java | 6 +- .../plugins/DefaultIDPAccountMapper.java | 11 +- .../DefaultIDPAuthenticationMethodMapper.java | 4 +- .../whitelist/ValidWReplyExtractor.java | 5 +- .../wsfederation/profile/IDPSSOUtil.java | 8 +- .../profile/SAML11RequestedSecurityToken.java | 3 +- .../wsfederation/servlet/ActiveRequest.java | 10 +- .../wsfederation/servlet/IPSigninRequest.java | 4 +- .../wsfederation/servlet/MetadataRequest.java | 4 +- .../wsfederation/servlet/MexRequest.java | 4 +- .../wsfederation/servlet/RPSigninRequest.java | 4 +- .../servlet/RPSigninResponse.java | 10 +- .../java/com/sun/liberty/LibertyManager.java | 6 +- .../saml2/UtilProxySAMLAuthenticator.java | 16 +- .../plugins/ValidRelayStateExtractor.java | 5 +- .../sun/identity/saml2/key/KeyUtilTest.java | 14 +- .../saml2/meta/SAML2MetaUtilsTest.java | 24 +- .../saml2/profile/SLOLocationTest.java | 27 +- .../src/test/resources/idp-extended.xml | 111 + .../src/test/resources/idp-metadata.xml | 97 + .../saml2/core/Saml2GrantTypeHandler.java | 4 +- openam-schema/openam-liberty-schema/pom.xml | 38 +- .../AffiliationDescriptorConfigElement.java | 26 - .../jaxb/entityconfig/AttributeElement.java | 26 - .../jaxb/entityconfig/AttributeType.java | 74 - .../jaxb/entityconfig/BaseConfigType.java | 75 - .../entityconfig/EntityConfigElement.java | 26 - .../jaxb/entityconfig/EntityConfigType.java | 203 - .../IDPDescriptorConfigElement.java | 26 - .../jaxb/entityconfig/ObjectFactory.java | 235 -- .../SPDescriptorConfigElement.java | 26 - .../jaxb/entityconfig/ValueElement.java | 44 - ...ffiliationDescriptorConfigElementImpl.java | 286 -- .../impl/AttributeElementImpl.java | 265 -- .../entityconfig/impl/AttributeTypeImpl.java | 374 -- .../entityconfig/impl/BaseConfigTypeImpl.java | 413 -- .../impl/EntityConfigElementImpl.java | 336 -- .../impl/EntityConfigTypeImpl.java | 1119 ------ .../impl/IDPDescriptorConfigElementImpl.java | 286 -- .../jaxb/entityconfig/impl/JAXBVersion.java | 15 - .../impl/SPDescriptorConfigElementImpl.java | 286 -- .../entityconfig/impl/ValueElementImpl.java | 252 -- ...AbstractUnmarshallingEventHandlerImpl.java | 351 -- .../impl/runtime/ContentHandlerAdaptor.java | 123 - .../impl/runtime/DefaultJAXBContextImpl.java | 172 - .../entityconfig/impl/runtime/Discarder.java | 57 - .../impl/runtime/ErrorHandlerAdaptor.java | 83 - .../impl/runtime/GrammarInfo.java | 90 - .../impl/runtime/GrammarInfoFacade.java | 289 -- .../impl/runtime/GrammarInfoImpl.java | 183 - .../impl/runtime/IdentityHashSet.java | 103 - .../impl/runtime/InterleaveDispatcher.java | 426 --- .../runtime/InterningUnmarshallerHandler.java | 42 - .../impl/runtime/MSVValidator.java | 460 --- .../impl/runtime/MarshallerImpl.java | 292 -- .../impl/runtime/NamespaceContext2.java | 59 - .../impl/runtime/NamespaceContextImpl.java | 290 -- .../impl/runtime/PrefixCallback.java | 13 - .../impl/runtime/SAXMarshaller.java | 464 --- .../impl/runtime/SAXUnmarshallerHandler.java | 39 - .../runtime/SAXUnmarshallerHandlerImpl.java | 626 --- .../impl/runtime/UnmarshallableObject.java | 23 - .../impl/runtime/UnmarshallerImpl.java | 186 - .../impl/runtime/UnmarshallingContext.java | 224 -- .../runtime/UnmarshallingEventHandler.java | 43 - .../UnmarshallingEventHandlerAdaptor.java | 128 - .../jaxb/entityconfig/impl/runtime/Util.java | 73 - .../impl/runtime/ValidatableObject.java | 28 - .../impl/runtime/ValidatingUnmarshaller.java | 110 - .../impl/runtime/ValidationContext.java | 205 - .../impl/runtime/ValidatorImpl.java | 179 - .../impl/runtime/XMLSerializable.java | 37 - .../impl/runtime/XMLSerializer.java | 233 -- .../federation/jaxb/entityconfig/package.html | 1 - .../liberty/ws/authnsvc/jaxb/EmptyType.java | 30 - .../ws/authnsvc/jaxb/ExtensionElement.java | 27 - .../ws/authnsvc/jaxb/ExtensionType.java | 56 - .../ws/authnsvc/jaxb/ObjectFactory.java | 313 -- .../jaxb/PasswordTransformsElement.java | 58 - .../authnsvc/jaxb/PasswordTransformsType.java | 224 -- .../ws/authnsvc/jaxb/SASLRequestElement.java | 48 - .../ws/authnsvc/jaxb/SASLRequestType.java | 192 - .../ws/authnsvc/jaxb/SASLResponseElement.java | 59 - .../ws/authnsvc/jaxb/SASLResponseType.java | 275 -- .../ws/authnsvc/jaxb/StatusElement.java | 27 - .../liberty/ws/authnsvc/jaxb/StatusType.java | 114 - .../ws/authnsvc/jaxb/impl/EmptyTypeImpl.java | 163 - .../jaxb/impl/ExtensionElementImpl.java | 235 -- .../authnsvc/jaxb/impl/ExtensionTypeImpl.java | 220 -- .../ws/authnsvc/jaxb/impl/JAXBVersion.java | 15 - .../impl/PasswordTransformsElementImpl.java | 234 -- .../jaxb/impl/PasswordTransformsTypeImpl.java | 1061 ------ .../jaxb/impl/SASLRequestElementImpl.java | 368 -- .../jaxb/impl/SASLRequestTypeImpl.java | 867 ----- .../jaxb/impl/SASLResponseElementImpl.java | 337 -- .../jaxb/impl/SASLResponseTypeImpl.java | 1231 ------ .../authnsvc/jaxb/impl/StatusElementImpl.java | 277 -- .../ws/authnsvc/jaxb/impl/StatusTypeImpl.java | 585 --- .../liberty/ws/authnsvc/jaxb/package.html | 1 - .../ac/ActivationLimitDurationElement.java | 28 - .../jaxb/ac/ActivationLimitDurationType.java | 48 - .../jaxb/ac/ActivationLimitElement.java | 28 - .../ac/ActivationLimitSessionElement.java | 28 - .../jaxb/ac/ActivationLimitSessionType.java | 29 - .../common/jaxb/ac/ActivationLimitType.java | 94 - .../jaxb/ac/ActivationLimitUsagesElement.java | 28 - .../jaxb/ac/ActivationLimitUsagesType.java | 48 - .../common/jaxb/ac/ActivationPinElement.java | 28 - .../ws/common/jaxb/ac/ActivationPinType.java | 140 - .../ws/common/jaxb/ac/AlphabetElement.java | 26 - .../ws/common/jaxb/ac/AlphabetType.java | 86 - .../jaxb/ac/AsymmetricDecryptionElement.java | 38 - .../jaxb/ac/AsymmetricDecryptionType.java | 56 - .../ac/AsymmetricKeyAgreementElement.java | 38 - .../jaxb/ac/AsymmetricKeyAgreementType.java | 56 - .../ac/AuthenticatingAuthorityElement.java | 28 - .../jaxb/ac/AuthenticatingAuthorityType.java | 71 - ...AuthenticationContextStatementElement.java | 30 - .../AuthenticationContextStatementType.java | 201 - .../jaxb/ac/AuthenticationMethodElement.java | 28 - .../jaxb/ac/AuthenticationMethodType.java | 119 - .../common/jaxb/ac/AuthenticatorElement.java | 28 - ...AuthenticatorTransportProtocolElement.java | 28 - .../AuthenticatorTransportProtocolType.java | 203 - .../ws/common/jaxb/ac/AuthenticatorType.java | 266 -- .../ac/DeactivationCallCenterElement.java | 36 - .../jaxb/ac/DeactivationCallCenterType.java | 56 - .../ws/common/jaxb/ac/DigSigElement.java | 38 - .../liberty/ws/common/jaxb/ac/DigSigType.java | 56 - .../liberty/ws/common/jaxb/ac/EmptyType.java | 30 - .../ws/common/jaxb/ac/ExtensionElement.java | 27 - .../ws/common/jaxb/ac/ExtensionType.java | 56 - .../ws/common/jaxb/ac/GenerationElement.java | 48 - .../ws/common/jaxb/ac/GenerationType.java | 55 - .../jaxb/ac/GoverningAgreementRefElement.java | 26 - .../jaxb/ac/GoverningAgreementRefType.java | 48 - .../jaxb/ac/GoverningAgreementsElement.java | 28 - .../jaxb/ac/GoverningAgreementsType.java | 56 - .../ws/common/jaxb/ac/HTTPElement.java | 38 - .../liberty/ws/common/jaxb/ac/HTTPType.java | 56 - .../ws/common/jaxb/ac/IPAddressElement.java | 38 - .../ws/common/jaxb/ac/IPAddressType.java | 56 - .../ws/common/jaxb/ac/IPSecElement.java | 38 - .../liberty/ws/common/jaxb/ac/IPSecType.java | 56 - .../common/jaxb/ac/IdentificationElement.java | 30 - .../ws/common/jaxb/ac/IdentificationType.java | 125 - .../common/jaxb/ac/KeyActivationElement.java | 27 - .../ws/common/jaxb/ac/KeyActivationType.java | 77 - .../ws/common/jaxb/ac/KeySharingElement.java | 27 - .../ws/common/jaxb/ac/KeySharingType.java | 42 - .../ws/common/jaxb/ac/KeyStorageElement.java | 33 - .../ws/common/jaxb/ac/KeyStorageType.java | 58 - .../ws/common/jaxb/ac/LengthElement.java | 30 - .../liberty/ws/common/jaxb/ac/LengthType.java | 67 - ...obileNetworkEndToEndEncryptionElement.java | 36 - .../MobileNetworkEndToEndEncryptionType.java | 56 - .../ac/MobileNetworkNoEncryptionElement.java | 38 - .../ac/MobileNetworkNoEncryptionType.java | 56 - .../MobileNetworkRadioEncryptionElement.java | 36 - .../ac/MobileNetworkRadioEncryptionType.java | 56 - .../ws/common/jaxb/ac/ObjectFactory.java | 1490 -------- .../jaxb/ac/OperationalProtectionElement.java | 28 - .../jaxb/ac/OperationalProtectionType.java | 98 - .../ws/common/jaxb/ac/PasswordElement.java | 29 - .../ws/common/jaxb/ac/PasswordType.java | 119 - .../jaxb/ac/PhysicalVerificationElement.java | 44 - .../jaxb/ac/PhysicalVerificationType.java | 55 - .../jaxb/ac/PreviousSessionElement.java | 38 - .../common/jaxb/ac/PreviousSessionType.java | 56 - ...incipalAuthenticationMechanismElement.java | 28 - .../PrincipalAuthenticationMechanismType.java | 140 - .../jaxb/ac/PrivateKeyProtectionElement.java | 29 - .../jaxb/ac/PrivateKeyProtectionType.java | 119 - .../common/jaxb/ac/ResumeSessionElement.java | 38 - .../ws/common/jaxb/ac/ResumeSessionType.java | 56 - .../liberty/ws/common/jaxb/ac/SSLElement.java | 38 - .../liberty/ws/common/jaxb/ac/SSLType.java | 56 - .../jaxb/ac/SecretKeyProtectionElement.java | 29 - .../jaxb/ac/SecretKeyProtectionType.java | 98 - .../common/jaxb/ac/SecurityAuditElement.java | 26 - .../ws/common/jaxb/ac/SecurityAuditType.java | 77 - .../SharedSecretChallengeResponseElement.java | 38 - .../ac/SharedSecretChallengeResponseType.java | 56 - .../SharedSecretDynamicPlaintextElement.java | 38 - .../ac/SharedSecretDynamicPlaintextType.java | 56 - .../ws/common/jaxb/ac/SmartcardElement.java | 38 - .../ws/common/jaxb/ac/SmartcardType.java | 56 - .../ws/common/jaxb/ac/StatusElement.java | 27 - .../liberty/ws/common/jaxb/ac/StatusType.java | 110 - .../ws/common/jaxb/ac/SwitchAuditElement.java | 36 - .../ws/common/jaxb/ac/SwitchAuditType.java | 56 - .../jaxb/ac/TechnicalProtectionElement.java | 29 - .../jaxb/ac/TechnicalProtectionType.java | 98 - .../common/jaxb/ac/TimeSyncTokenElement.java | 32 - .../ws/common/jaxb/ac/TimeSyncTokenType.java | 100 - .../ws/common/jaxb/ac/TokenElement.java | 29 - .../liberty/ws/common/jaxb/ac/TokenType.java | 77 - .../ws/common/jaxb/ac/WTLSElement.java | 38 - .../liberty/ws/common/jaxb/ac/WTLSType.java | 56 - .../common/jaxb/ac/WrittenConsentElement.java | 36 - .../ws/common/jaxb/ac/WrittenConsentType.java | 56 - .../common/jaxb/ac/ZeroKnowledgeElement.java | 38 - .../ws/common/jaxb/ac/ZeroKnowledgeType.java | 56 - .../ActivationLimitDurationElementImpl.java | 260 -- .../impl/ActivationLimitDurationTypeImpl.java | 258 -- .../ac/impl/ActivationLimitElementImpl.java | 271 -- .../ActivationLimitSessionElementImpl.java | 233 -- .../impl/ActivationLimitSessionTypeImpl.java | 163 - .../jaxb/ac/impl/ActivationLimitTypeImpl.java | 455 --- .../ActivationLimitUsagesElementImpl.java | 269 -- .../impl/ActivationLimitUsagesTypeImpl.java | 267 -- .../ac/impl/ActivationPinElementImpl.java | 314 -- .../jaxb/ac/impl/ActivationPinTypeImpl.java | 795 ---- .../jaxb/ac/impl/AlphabetElementImpl.java | 319 -- .../common/jaxb/ac/impl/AlphabetTypeImpl.java | 434 --- .../impl/AsymmetricDecryptionElementImpl.java | 254 -- .../ac/impl/AsymmetricDecryptionTypeImpl.java | 291 -- .../AsymmetricKeyAgreementElementImpl.java | 254 -- .../impl/AsymmetricKeyAgreementTypeImpl.java | 291 -- .../AuthenticatingAuthorityElementImpl.java | 271 -- .../impl/AuthenticatingAuthorityTypeImpl.java | 332 -- ...enticationContextStatementElementImpl.java | 380 -- ...uthenticationContextStatementTypeImpl.java | 1048 ----- .../impl/AuthenticationMethodElementImpl.java | 301 -- .../ac/impl/AuthenticationMethodTypeImpl.java | 701 ---- .../ac/impl/AuthenticatorElementImpl.java | 388 -- ...enticatorTransportProtocolElementImpl.java | 343 -- ...uthenticatorTransportProtocolTypeImpl.java | 849 ----- .../jaxb/ac/impl/AuthenticatorTypeImpl.java | 1116 ------ .../DeactivationCallCenterElementImpl.java | 254 -- .../impl/DeactivationCallCenterTypeImpl.java | 291 -- .../jaxb/ac/impl/DigSigElementImpl.java | 254 -- .../common/jaxb/ac/impl/DigSigTypeImpl.java | 291 -- .../ws/common/jaxb/ac/impl/EmptyTypeImpl.java | 163 - .../jaxb/ac/impl/ExtensionElementImpl.java | 235 -- .../jaxb/ac/impl/ExtensionTypeImpl.java | 220 -- .../jaxb/ac/impl/GenerationElementImpl.java | 270 -- .../jaxb/ac/impl/GenerationTypeImpl.java | 268 -- .../GoverningAgreementRefElementImpl.java | 260 -- .../impl/GoverningAgreementRefTypeImpl.java | 258 -- .../impl/GoverningAgreementsElementImpl.java | 241 -- .../ac/impl/GoverningAgreementsTypeImpl.java | 310 -- .../common/jaxb/ac/impl/HTTPElementImpl.java | 254 -- .../ws/common/jaxb/ac/impl/HTTPTypeImpl.java | 291 -- .../jaxb/ac/impl/IPAddressElementImpl.java | 254 -- .../jaxb/ac/impl/IPAddressTypeImpl.java | 291 -- .../common/jaxb/ac/impl/IPSecElementImpl.java | 254 -- .../ws/common/jaxb/ac/impl/IPSecTypeImpl.java | 291 -- .../ac/impl/IdentificationElementImpl.java | 326 -- .../jaxb/ac/impl/IdentificationTypeImpl.java | 596 --- .../ws/common/jaxb/ac/impl/JAXBVersion.java | 15 - .../ac/impl/KeyActivationElementImpl.java | 255 -- .../jaxb/ac/impl/KeyActivationTypeImpl.java | 396 -- .../jaxb/ac/impl/KeySharingElementImpl.java | 259 -- .../jaxb/ac/impl/KeySharingTypeImpl.java | 269 -- .../jaxb/ac/impl/KeyStorageElementImpl.java | 270 -- .../jaxb/ac/impl/KeyStorageTypeImpl.java | 269 -- .../jaxb/ac/impl/LengthElementImpl.java | 298 -- .../common/jaxb/ac/impl/LengthTypeImpl.java | 357 -- ...eNetworkEndToEndEncryptionElementImpl.java | 254 -- ...bileNetworkEndToEndEncryptionTypeImpl.java | 291 -- .../MobileNetworkNoEncryptionElementImpl.java | 254 -- .../MobileNetworkNoEncryptionTypeImpl.java | 291 -- ...bileNetworkRadioEncryptionElementImpl.java | 254 -- .../MobileNetworkRadioEncryptionTypeImpl.java | 291 -- .../OperationalProtectionElementImpl.java | 285 -- .../impl/OperationalProtectionTypeImpl.java | 486 --- .../jaxb/ac/impl/PasswordElementImpl.java | 298 -- .../common/jaxb/ac/impl/PasswordTypeImpl.java | 699 ---- .../impl/PhysicalVerificationElementImpl.java | 275 -- .../ac/impl/PhysicalVerificationTypeImpl.java | 279 -- .../ac/impl/PreviousSessionElementImpl.java | 254 -- .../jaxb/ac/impl/PreviousSessionTypeImpl.java | 291 -- ...palAuthenticationMechanismElementImpl.java | 298 -- ...ncipalAuthenticationMechanismTypeImpl.java | 648 ---- .../impl/PrivateKeyProtectionElementImpl.java | 299 -- .../ac/impl/PrivateKeyProtectionTypeImpl.java | 595 --- .../ac/impl/ResumeSessionElementImpl.java | 254 -- .../jaxb/ac/impl/ResumeSessionTypeImpl.java | 291 -- .../common/jaxb/ac/impl/SSLElementImpl.java | 254 -- .../ws/common/jaxb/ac/impl/SSLTypeImpl.java | 291 -- .../impl/SecretKeyProtectionElementImpl.java | 270 -- .../ac/impl/SecretKeyProtectionTypeImpl.java | 474 --- .../ac/impl/SecurityAuditElementImpl.java | 269 -- .../jaxb/ac/impl/SecurityAuditTypeImpl.java | 384 -- ...redSecretChallengeResponseElementImpl.java | 254 -- ...SharedSecretChallengeResponseTypeImpl.java | 291 -- ...aredSecretDynamicPlaintextElementImpl.java | 254 -- .../SharedSecretDynamicPlaintextTypeImpl.java | 291 -- .../jaxb/ac/impl/SmartcardElementImpl.java | 254 -- .../jaxb/ac/impl/SmartcardTypeImpl.java | 291 -- .../jaxb/ac/impl/StatusElementImpl.java | 277 -- .../common/jaxb/ac/impl/StatusTypeImpl.java | 560 --- .../jaxb/ac/impl/SwitchAuditElementImpl.java | 254 -- .../jaxb/ac/impl/SwitchAuditTypeImpl.java | 291 -- .../impl/TechnicalProtectionElementImpl.java | 284 -- .../ac/impl/TechnicalProtectionTypeImpl.java | 486 --- .../ac/impl/TimeSyncTokenElementImpl.java | 281 -- .../jaxb/ac/impl/TimeSyncTokenTypeImpl.java | 437 --- .../common/jaxb/ac/impl/TokenElementImpl.java | 247 -- .../ws/common/jaxb/ac/impl/TokenTypeImpl.java | 380 -- .../common/jaxb/ac/impl/WTLSElementImpl.java | 254 -- .../ws/common/jaxb/ac/impl/WTLSTypeImpl.java | 291 -- .../ac/impl/WrittenConsentElementImpl.java | 254 -- .../jaxb/ac/impl/WrittenConsentTypeImpl.java | 291 -- .../ac/impl/ZeroKnowledgeElementImpl.java | 254 -- .../jaxb/ac/impl/ZeroKnowledgeTypeImpl.java | 291 -- .../liberty/ws/common/jaxb/ac/package.html | 1 - .../common/jaxb/assertion/ActionElement.java | 26 - .../ws/common/jaxb/assertion/ActionType.java | 66 - .../common/jaxb/assertion/AdviceElement.java | 26 - .../ws/common/jaxb/assertion/AdviceType.java | 59 - .../jaxb/assertion/AssertionElement.java | 26 - .../AssertionIDReferenceElement.java | 44 - .../common/jaxb/assertion/AssertionType.java | 226 -- .../assertion/AttributeDesignatorElement.java | 26 - .../assertion/AttributeDesignatorType.java | 67 - .../jaxb/assertion/AttributeElement.java | 26 - .../assertion/AttributeStatementElement.java | 26 - .../assertion/AttributeStatementType.java | 58 - .../common/jaxb/assertion/AttributeType.java | 58 - .../jaxb/assertion/AttributeValueElement.java | 26 - .../jaxb/assertion/AudienceElement.java | 44 - .../AudienceRestrictionConditionElement.java | 26 - .../AudienceRestrictionConditionType.java | 57 - .../AuthenticationStatementElement.java | 26 - .../AuthenticationStatementType.java | 117 - .../assertion/AuthorityBindingElement.java | 26 - .../jaxb/assertion/AuthorityBindingType.java | 86 - ...AuthorizationDecisionStatementElement.java | 26 - .../AuthorizationDecisionStatementType.java | 117 - .../jaxb/assertion/ConditionAbstractType.java | 29 - .../jaxb/assertion/ConditionElement.java | 26 - .../jaxb/assertion/ConditionsElement.java | 26 - .../common/jaxb/assertion/ConditionsType.java | 97 - .../assertion/ConfirmationMethodElement.java | 44 - .../assertion/DoNotCacheConditionElement.java | 26 - .../assertion/DoNotCacheConditionType.java | 31 - .../jaxb/assertion/EvidenceElement.java | 26 - .../common/jaxb/assertion/EvidenceType.java | 57 - .../jaxb/assertion/NameIdentifierElement.java | 26 - .../jaxb/assertion/NameIdentifierType.java | 85 - .../common/jaxb/assertion/ObjectFactory.java | 746 ---- .../jaxb/assertion/StatementAbstractType.java | 29 - .../jaxb/assertion/StatementElement.java | 26 - .../SubjectConfirmationDataElement.java | 26 - .../assertion/SubjectConfirmationElement.java | 26 - .../assertion/SubjectConfirmationType.java | 97 - .../common/jaxb/assertion/SubjectElement.java | 26 - .../assertion/SubjectLocalityElement.java | 26 - .../jaxb/assertion/SubjectLocalityType.java | 67 - .../SubjectStatementAbstractType.java | 58 - .../assertion/SubjectStatementElement.java | 26 - .../ws/common/jaxb/assertion/SubjectType.java | 82 - .../assertion/impl/ActionElementImpl.java | 265 -- .../jaxb/assertion/impl/ActionTypeImpl.java | 300 -- .../assertion/impl/AdviceElementImpl.java | 262 -- .../jaxb/assertion/impl/AdviceTypeImpl.java | 293 -- .../assertion/impl/AssertionElementImpl.java | 330 -- .../impl/AssertionIDReferenceElementImpl.java | 253 -- .../assertion/impl/AssertionTypeImpl.java | 1092 ------ .../impl/AttributeDesignatorElementImpl.java | 264 -- .../impl/AttributeDesignatorTypeImpl.java | 342 -- .../assertion/impl/AttributeElementImpl.java | 275 -- .../impl/AttributeStatementElementImpl.java | 273 -- .../impl/AttributeStatementTypeImpl.java | 358 -- .../assertion/impl/AttributeTypeImpl.java | 340 -- .../impl/AttributeValueElementImpl.java | 246 -- .../assertion/impl/AudienceElementImpl.java | 251 -- ...dienceRestrictionConditionElementImpl.java | 244 -- .../AudienceRestrictionConditionTypeImpl.java | 300 -- .../AuthenticationStatementElementImpl.java | 295 -- .../impl/AuthenticationStatementTypeImpl.java | 676 ---- .../impl/AuthorityBindingElementImpl.java | 262 -- .../impl/AuthorityBindingTypeImpl.java | 424 --- ...orizationDecisionStatementElementImpl.java | 302 -- ...uthorizationDecisionStatementTypeImpl.java | 610 --- .../impl/ConditionAbstractTypeImpl.java | 163 - .../assertion/impl/ConditionElementImpl.java | 233 -- .../assertion/impl/ConditionsElementImpl.java | 321 -- .../assertion/impl/ConditionsTypeImpl.java | 439 --- .../impl/ConfirmationMethodElementImpl.java | 251 -- .../impl/DoNotCacheConditionElementImpl.java | 234 -- .../impl/DoNotCacheConditionTypeImpl.java | 183 - .../assertion/impl/EvidenceElementImpl.java | 239 -- .../jaxb/assertion/impl/EvidenceTypeImpl.java | 227 -- .../jaxb/assertion/impl/JAXBVersion.java | 15 - .../impl/NameIdentifierElementImpl.java | 294 -- .../impl/NameIdentifierTypeImpl.java | 386 -- .../impl/StatementAbstractTypeImpl.java | 163 - .../assertion/impl/StatementElementImpl.java | 233 -- .../SubjectConfirmationDataElementImpl.java | 247 -- .../impl/SubjectConfirmationElementImpl.java | 248 -- .../impl/SubjectConfirmationTypeImpl.java | 518 --- .../assertion/impl/SubjectElementImpl.java | 267 -- .../impl/SubjectLocalityElementImpl.java | 296 -- .../impl/SubjectLocalityTypeImpl.java | 355 -- .../SubjectStatementAbstractTypeImpl.java | 297 -- .../impl/SubjectStatementElementImpl.java | 267 -- .../jaxb/assertion/impl/SubjectTypeImpl.java | 451 --- .../ws/common/jaxb/assertion/package.html | 1 - .../protocol/AssertionArtifactElement.java | 44 - .../jaxb/protocol/AttributeQueryElement.java | 26 - .../jaxb/protocol/AttributeQueryType.java | 77 - .../protocol/AuthenticationQueryElement.java | 26 - .../protocol/AuthenticationQueryType.java | 50 - .../AuthorizationDecisionQueryElement.java | 26 - .../AuthorizationDecisionQueryType.java | 98 - .../common/jaxb/protocol/ObjectFactory.java | 474 --- .../jaxb/protocol/QueryAbstractType.java | 29 - .../ws/common/jaxb/protocol/QueryElement.java | 26 - .../jaxb/protocol/RequestAbstractType.java | 152 - .../common/jaxb/protocol/RequestElement.java | 26 - .../ws/common/jaxb/protocol/RequestType.java | 186 - .../jaxb/protocol/RespondWithElement.java | 44 - .../jaxb/protocol/ResponseAbstractType.java | 166 - .../common/jaxb/protocol/ResponseElement.java | 26 - .../ws/common/jaxb/protocol/ResponseType.java | 79 - .../jaxb/protocol/StatusCodeElement.java | 26 - .../common/jaxb/protocol/StatusCodeType.java | 71 - .../jaxb/protocol/StatusDetailElement.java | 26 - .../jaxb/protocol/StatusDetailType.java | 55 - .../common/jaxb/protocol/StatusElement.java | 26 - .../jaxb/protocol/StatusMessageElement.java | 44 - .../ws/common/jaxb/protocol/StatusType.java | 92 - .../protocol/SubjectQueryAbstractType.java | 58 - .../jaxb/protocol/SubjectQueryElement.java | 26 - .../impl/AssertionArtifactElementImpl.java | 253 -- .../impl/AttributeQueryElementImpl.java | 306 -- .../protocol/impl/AttributeQueryTypeImpl.java | 460 --- .../impl/AuthenticationQueryElementImpl.java | 298 -- .../impl/AuthenticationQueryTypeImpl.java | 327 -- ...AuthorizationDecisionQueryElementImpl.java | 291 -- .../AuthorizationDecisionQueryTypeImpl.java | 519 --- .../jaxb/protocol/impl/JAXBVersion.java | 15 - .../protocol/impl/QueryAbstractTypeImpl.java | 163 - .../jaxb/protocol/impl/QueryElementImpl.java | 233 -- .../impl/RequestAbstractTypeImpl.java | 750 ---- .../protocol/impl/RequestElementImpl.java | 336 -- .../jaxb/protocol/impl/RequestTypeImpl.java | 954 ----- .../protocol/impl/RespondWithElementImpl.java | 255 -- .../impl/ResponseAbstractTypeImpl.java | 820 ---- .../protocol/impl/ResponseElementImpl.java | 338 -- .../jaxb/protocol/impl/ResponseTypeImpl.java | 490 --- .../protocol/impl/StatusCodeElementImpl.java | 269 -- .../protocol/impl/StatusCodeTypeImpl.java | 383 -- .../impl/StatusDetailElementImpl.java | 245 -- .../protocol/impl/StatusDetailTypeImpl.java | 233 -- .../jaxb/protocol/impl/StatusElementImpl.java | 253 -- .../impl/StatusMessageElementImpl.java | 253 -- .../jaxb/protocol/impl/StatusTypeImpl.java | 436 --- .../impl/SubjectQueryAbstractTypeImpl.java | 297 -- .../impl/SubjectQueryElementImpl.java | 267 -- .../ws/common/jaxb/protocol/package.html | 1 - .../common/jaxb/ps/AffiliationIDElement.java | 44 - .../ws/common/jaxb/ps/AssertionElement.java | 26 - .../ws/common/jaxb/ps/AssertionType.java | 50 - .../ps/AuthenticationStatementElement.java | 26 - .../jaxb/ps/AuthenticationStatementType.java | 92 - .../common/jaxb/ps/AuthnContextElement.java | 40 - .../ws/common/jaxb/ps/AuthnContextType.java | 92 - .../common/jaxb/ps/AuthnRequestElement.java | 26 - .../jaxb/ps/AuthnRequestEnvelopeElement.java | 26 - .../jaxb/ps/AuthnRequestEnvelopeType.java | 145 - .../ws/common/jaxb/ps/AuthnRequestType.java | 259 -- .../common/jaxb/ps/AuthnResponseElement.java | 26 - .../jaxb/ps/AuthnResponseEnvelopeElement.java | 26 - .../jaxb/ps/AuthnResponseEnvelopeType.java | 73 - .../ws/common/jaxb/ps/AuthnResponseType.java | 115 - .../liberty/ws/common/jaxb/ps/EmptyType.java | 30 - .../ps/EncryptableNameIdentifierElement.java | 26 - .../ps/EncryptableNameIdentifierType.java | 69 - .../ps/EncryptedNameIdentifierElement.java | 26 - .../jaxb/ps/EncryptedNameIdentifierType.java | 73 - .../ws/common/jaxb/ps/ExtensionElement.java | 27 - .../ws/common/jaxb/ps/ExtensionType.java | 56 - ...erationTerminationNotificationElement.java | 26 - ...FederationTerminationNotificationType.java | 119 - .../ws/common/jaxb/ps/GetCompleteElement.java | 44 - .../ws/common/jaxb/ps/IDPEntriesElement.java | 36 - .../ws/common/jaxb/ps/IDPEntriesType.java | 56 - .../ws/common/jaxb/ps/IDPEntryElement.java | 38 - .../ws/common/jaxb/ps/IDPEntryType.java | 88 - .../ws/common/jaxb/ps/IDPListElement.java | 26 - .../ws/common/jaxb/ps/IDPListType.java | 71 - .../ps/IDPProvidedNameIdentifierElement.java | 26 - .../common/jaxb/ps/LogoutRequestElement.java | 26 - .../ws/common/jaxb/ps/LogoutRequestType.java | 157 - .../common/jaxb/ps/LogoutResponseElement.java | 26 - .../common/jaxb/ps/NameIDPolicyElement.java | 44 - .../NameIdentifierMappingRequestElement.java | 26 - .../ps/NameIdentifierMappingRequestType.java | 138 - .../NameIdentifierMappingResponseElement.java | 26 - .../ps/NameIdentifierMappingResponseType.java | 121 - .../ws/common/jaxb/ps/ObjectFactory.java | 972 ----- .../ps/OldProvidedNameIdentifierElement.java | 26 - .../jaxb/ps/ProtocolProfileElement.java | 44 - .../ws/common/jaxb/ps/ProviderIDElement.java | 44 - .../RegisterNameIdentifierRequestElement.java | 26 - .../ps/RegisterNameIdentifierRequestType.java | 159 - ...RegisterNameIdentifierResponseElement.java | 26 - .../ws/common/jaxb/ps/RelayStateElement.java | 44 - .../jaxb/ps/RequestAuthnContextElement.java | 40 - .../jaxb/ps/RequestAuthnContextType.java | 100 - .../common/jaxb/ps/RequestEnvelopeType.java | 56 - .../common/jaxb/ps/ResponseEnvelopeType.java | 56 - .../ps/SPProvidedNameIdentifierElement.java | 26 - .../ws/common/jaxb/ps/ScopingElement.java | 26 - .../ws/common/jaxb/ps/ScopingType.java | 71 - .../ws/common/jaxb/ps/StatusElement.java | 27 - .../ws/common/jaxb/ps/StatusResponseType.java | 117 - .../liberty/ws/common/jaxb/ps/StatusType.java | 110 - .../ws/common/jaxb/ps/SubjectElement.java | 26 - .../ws/common/jaxb/ps/SubjectType.java | 54 - .../ps/impl/AffiliationIDElementImpl.java | 258 -- .../jaxb/ps/impl/AssertionElementImpl.java | 361 -- .../jaxb/ps/impl/AssertionTypeImpl.java | 390 -- .../AuthenticationStatementElementImpl.java | 365 -- .../impl/AuthenticationStatementTypeImpl.java | 532 --- .../jaxb/ps/impl/AuthnContextElementImpl.java | 255 -- .../jaxb/ps/impl/AuthnContextTypeImpl.java | 462 --- .../jaxb/ps/impl/AuthnRequestElementImpl.java | 375 -- .../impl/AuthnRequestEnvelopeElementImpl.java | 298 -- .../ps/impl/AuthnRequestEnvelopeTypeImpl.java | 662 ---- .../jaxb/ps/impl/AuthnRequestTypeImpl.java | 1142 ------ .../ps/impl/AuthnResponseElementImpl.java | 385 -- .../AuthnResponseEnvelopeElementImpl.java | 272 -- .../impl/AuthnResponseEnvelopeTypeImpl.java | 421 -- .../jaxb/ps/impl/AuthnResponseTypeImpl.java | 617 --- .../ws/common/jaxb/ps/impl/EmptyTypeImpl.java | 163 - .../EncryptableNameIdentifierElementImpl.java | 355 -- .../EncryptableNameIdentifierTypeImpl.java | 435 --- .../EncryptedNameIdentifierElementImpl.java | 248 -- .../impl/EncryptedNameIdentifierTypeImpl.java | 624 --- .../jaxb/ps/impl/ExtensionElementImpl.java | 235 -- .../jaxb/ps/impl/ExtensionTypeImpl.java | 220 -- ...ionTerminationNotificationElementImpl.java | 348 -- ...rationTerminationNotificationTypeImpl.java | 634 --- .../jaxb/ps/impl/GetCompleteElementImpl.java | 251 -- .../jaxb/ps/impl/IDPEntriesElementImpl.java | 240 -- .../jaxb/ps/impl/IDPEntriesTypeImpl.java | 278 -- .../jaxb/ps/impl/IDPEntryElementImpl.java | 243 -- .../common/jaxb/ps/impl/IDPEntryTypeImpl.java | 358 -- .../jaxb/ps/impl/IDPListElementImpl.java | 244 -- .../common/jaxb/ps/impl/IDPListTypeImpl.java | 316 -- .../IDPProvidedNameIdentifierElementImpl.java | 294 -- .../ws/common/jaxb/ps/impl/JAXBVersion.java | 15 - .../ps/impl/LogoutRequestElementImpl.java | 354 -- .../jaxb/ps/impl/LogoutRequestTypeImpl.java | 762 ---- .../ps/impl/LogoutResponseElementImpl.java | 348 -- .../jaxb/ps/impl/NameIDPolicyElementImpl.java | 261 -- ...meIdentifierMappingRequestElementImpl.java | 350 -- .../NameIdentifierMappingRequestTypeImpl.java | 682 ---- ...eIdentifierMappingResponseElementImpl.java | 355 -- ...NameIdentifierMappingResponseTypeImpl.java | 654 ---- .../OldProvidedNameIdentifierElementImpl.java | 294 -- .../ps/impl/ProtocolProfileElementImpl.java | 251 -- .../jaxb/ps/impl/ProviderIDElementImpl.java | 258 -- ...isterNameIdentifierRequestElementImpl.java | 331 -- ...RegisterNameIdentifierRequestTypeImpl.java | 837 ---- ...sterNameIdentifierResponseElementImpl.java | 348 -- .../jaxb/ps/impl/RelayStateElementImpl.java | 252 -- .../impl/RequestAuthnContextElementImpl.java | 251 -- .../ps/impl/RequestAuthnContextTypeImpl.java | 458 --- .../jaxb/ps/impl/RequestEnvelopeTypeImpl.java | 291 -- .../ps/impl/ResponseEnvelopeTypeImpl.java | 291 -- .../SPProvidedNameIdentifierElementImpl.java | 294 -- .../jaxb/ps/impl/ScopingElementImpl.java | 278 -- .../common/jaxb/ps/impl/ScopingTypeImpl.java | 352 -- .../jaxb/ps/impl/StatusElementImpl.java | 277 -- .../jaxb/ps/impl/StatusResponseTypeImpl.java | 574 --- .../common/jaxb/ps/impl/StatusTypeImpl.java | 560 --- .../jaxb/ps/impl/SubjectElementImpl.java | 274 -- .../common/jaxb/ps/impl/SubjectTypeImpl.java | 358 -- .../liberty/ws/common/jaxb/ps/package.html | 1 - .../common/jaxb/secext/AttributedString.java | 67 - .../secext/BinarySecurityTokenElement.java | 27 - .../jaxb/secext/BinarySecurityTokenType.java | 51 - .../common/jaxb/secext/EmbeddedElement.java | 27 - .../ws/common/jaxb/secext/EmbeddedType.java | 75 - .../ws/common/jaxb/secext/EncodedString.java | 51 - .../jaxb/secext/KeyIdentifierElement.java | 27 - .../common/jaxb/secext/KeyIdentifierType.java | 51 - .../ws/common/jaxb/secext/NonceElement.java | 26 - .../ws/common/jaxb/secext/ObjectFactory.java | 356 -- .../common/jaxb/secext/PasswordElement.java | 26 - .../ws/common/jaxb/secext/PasswordString.java | 51 - .../common/jaxb/secext/ReferenceElement.java | 27 - .../ws/common/jaxb/secext/ReferenceType.java | 68 - .../common/jaxb/secext/SecurityElement.java | 27 - .../jaxb/secext/SecurityHeaderType.java | 56 - .../secext/SecurityTokenReferenceElement.java | 27 - .../secext/SecurityTokenReferenceType.java | 99 - .../jaxb/secext/UsernameTokenElement.java | 27 - .../common/jaxb/secext/UsernameTokenType.java | 94 - .../secext/impl/AttributedStringImpl.java | 309 -- .../impl/BinarySecurityTokenElementImpl.java | 325 -- .../impl/BinarySecurityTokenTypeImpl.java | 357 -- .../jaxb/secext/impl/EmbeddedElementImpl.java | 275 -- .../jaxb/secext/impl/EmbeddedTypeImpl.java | 342 -- .../jaxb/secext/impl/EncodedStringImpl.java | 328 -- .../common/jaxb/secext/impl/JAXBVersion.java | 15 - .../secext/impl/KeyIdentifierElementImpl.java | 325 -- .../secext/impl/KeyIdentifierTypeImpl.java | 357 -- .../jaxb/secext/impl/NonceElementImpl.java | 296 -- .../jaxb/secext/impl/PasswordElementImpl.java | 296 -- .../jaxb/secext/impl/PasswordStringImpl.java | 328 -- .../secext/impl/ReferenceElementImpl.java | 294 -- .../jaxb/secext/impl/ReferenceTypeImpl.java | 364 -- .../jaxb/secext/impl/SecurityElementImpl.java | 245 -- .../secext/impl/SecurityHeaderTypeImpl.java | 233 -- .../SecurityTokenReferenceElementImpl.java | 311 -- .../impl/SecurityTokenReferenceTypeImpl.java | 453 --- .../secext/impl/UsernameTokenElementImpl.java | 279 -- .../secext/impl/UsernameTokenTypeImpl.java | 421 -- .../ws/common/jaxb/secext/package.html | 1 - .../MessageAuthenticationElement.java | 44 - .../common/jaxb/security/ObjectFactory.java | 315 -- .../ProxyInfoConfirmationDataElement.java | 26 - .../security/ProxyInfoConfirmationType.java | 128 - .../jaxb/security/ProxySubjectElement.java | 26 - .../ProxyTransitedStatementElement.java | 26 - .../RequesterAuthorizationElement.java | 44 - .../ResourceAccessStatementElement.java | 26 - .../security/ResourceAccessStatementType.java | 116 - .../jaxb/security/SessionContextElement.java | 26 - .../SessionContextStatementElement.java | 26 - .../security/SessionContextStatementType.java | 73 - .../jaxb/security/SessionContextType.java | 128 - .../ValidityRestrictionConditionElement.java | 26 - .../ValidityRestrictionConditionType.java | 52 - .../jaxb/security/impl/JAXBVersion.java | 15 - .../MessageAuthenticationElementImpl.java | 255 -- .../ProxyInfoConfirmationDataElementImpl.java | 290 -- .../impl/ProxyInfoConfirmationTypeImpl.java | 551 --- .../impl/ProxySubjectElementImpl.java | 268 -- .../ProxyTransitedStatementElementImpl.java | 267 -- .../RequesterAuthorizationElementImpl.java | 255 -- .../ResourceAccessStatementElementImpl.java | 292 -- .../impl/ResourceAccessStatementTypeImpl.java | 600 --- .../impl/SessionContextElementImpl.java | 288 -- .../SessionContextStatementElementImpl.java | 277 -- .../impl/SessionContextStatementTypeImpl.java | 399 -- .../security/impl/SessionContextTypeImpl.java | 553 --- ...lidityRestrictionConditionElementImpl.java | 251 -- .../ValidityRestrictionConditionTypeImpl.java | 265 -- .../ws/common/jaxb/security/package.html | 1 - .../ws/common/jaxb/soap/BodyElement.java | 26 - .../liberty/ws/common/jaxb/soap/BodyType.java | 55 - .../liberty/ws/common/jaxb/soap/Detail.java | 55 - .../ws/common/jaxb/soap/EnvelopeElement.java | 26 - .../ws/common/jaxb/soap/EnvelopeType.java | 97 - .../ws/common/jaxb/soap/FaultElement.java | 26 - .../ws/common/jaxb/soap/FaultType.java | 109 - .../ws/common/jaxb/soap/HeaderElement.java | 26 - .../ws/common/jaxb/soap/HeaderType.java | 55 - .../ws/common/jaxb/soap/ObjectFactory.java | 221 -- .../jaxb/soap/impl/BodyElementImpl.java | 245 -- .../common/jaxb/soap/impl/BodyTypeImpl.java | 233 -- .../ws/common/jaxb/soap/impl/DetailImpl.java | 233 -- .../jaxb/soap/impl/EnvelopeElementImpl.java | 261 -- .../jaxb/soap/impl/EnvelopeTypeImpl.java | 411 -- .../jaxb/soap/impl/FaultElementImpl.java | 244 -- .../common/jaxb/soap/impl/FaultTypeImpl.java | 427 --- .../jaxb/soap/impl/HeaderElementImpl.java | 248 -- .../common/jaxb/soap/impl/HeaderTypeImpl.java | 237 -- .../ws/common/jaxb/soap/impl/JAXBVersion.java | 15 - .../liberty/ws/common/jaxb/soap/package.html | 1 - .../jaxb/utility/AttributedDateTime.java | 87 - .../ws/common/jaxb/utility/AttributedURI.java | 68 - .../common/jaxb/utility/CreatedElement.java | 28 - .../common/jaxb/utility/ExpiresElement.java | 28 - .../ws/common/jaxb/utility/ObjectFactory.java | 235 -- .../common/jaxb/utility/ReceivedElement.java | 28 - .../ws/common/jaxb/utility/ReceivedType.java | 65 - .../common/jaxb/utility/TimestampElement.java | 29 - .../jaxb/utility/TimestampTraceElement.java | 28 - .../jaxb/utility/TimestampTraceType.java | 80 - .../ws/common/jaxb/utility/TimestampType.java | 120 - .../utility/impl/AttributedDateTimeImpl.java | 404 -- .../jaxb/utility/impl/AttributedURIImpl.java | 309 -- .../jaxb/utility/impl/CreatedElementImpl.java | 295 -- .../jaxb/utility/impl/ExpiresElementImpl.java | 295 -- .../common/jaxb/utility/impl/JAXBVersion.java | 15 - .../utility/impl/ReceivedElementImpl.java | 292 -- .../jaxb/utility/impl/ReceivedTypeImpl.java | 456 --- .../utility/impl/TimestampElementImpl.java | 311 -- .../impl/TimestampTraceElementImpl.java | 289 -- .../utility/impl/TimestampTraceTypeImpl.java | 392 -- .../jaxb/utility/impl/TimestampTypeImpl.java | 624 --- .../ws/common/jaxb/utility/package.html | 1 - .../jaxb/xmlenc/AgreementMethodElement.java | 26 - .../jaxb/xmlenc/AgreementMethodType.java | 150 - .../common/jaxb/xmlenc/CipherDataElement.java | 26 - .../ws/common/jaxb/xmlenc/CipherDataType.java | 71 - .../jaxb/xmlenc/CipherReferenceElement.java | 26 - .../jaxb/xmlenc/CipherReferenceType.java | 69 - .../jaxb/xmlenc/EncryptedDataElement.java | 26 - .../common/jaxb/xmlenc/EncryptedDataType.java | 31 - .../jaxb/xmlenc/EncryptedKeyElement.java | 26 - .../common/jaxb/xmlenc/EncryptedKeyType.java | 92 - .../ws/common/jaxb/xmlenc/EncryptedType.java | 189 - .../jaxb/xmlenc/EncryptionMethodType.java | 149 - .../xmlenc/EncryptionPropertiesElement.java | 26 - .../jaxb/xmlenc/EncryptionPropertiesType.java | 75 - .../xmlenc/EncryptionPropertyElement.java | 26 - .../jaxb/xmlenc/EncryptionPropertyType.java | 94 - .../ws/common/jaxb/xmlenc/ObjectFactory.java | 495 --- .../jaxb/xmlenc/ReferenceListElement.java | 37 - .../common/jaxb/xmlenc/ReferenceListType.java | 91 - .../ws/common/jaxb/xmlenc/ReferenceType.java | 74 - .../ws/common/jaxb/xmlenc/TransformsType.java | 56 - .../impl/AgreementMethodElementImpl.java | 281 -- .../xmlenc/impl/AgreementMethodTypeImpl.java | 1454 ------- .../xmlenc/impl/CipherDataElementImpl.java | 249 -- .../jaxb/xmlenc/impl/CipherDataTypeImpl.java | 342 -- .../impl/CipherReferenceElementImpl.java | 268 -- .../xmlenc/impl/CipherReferenceTypeImpl.java | 331 -- .../xmlenc/impl/EncryptedDataElementImpl.java | 404 -- .../xmlenc/impl/EncryptedDataTypeImpl.java | 377 -- .../xmlenc/impl/EncryptedKeyElementImpl.java | 443 --- .../xmlenc/impl/EncryptedKeyTypeImpl.java | 607 --- .../jaxb/xmlenc/impl/EncryptedTypeImpl.java | 962 ----- .../xmlenc/impl/EncryptionMethodTypeImpl.java | 1041 ----- .../impl/EncryptionPropertiesElementImpl.java | 282 -- .../impl/EncryptionPropertiesTypeImpl.java | 442 --- .../impl/EncryptionPropertyElementImpl.java | 313 -- .../impl/EncryptionPropertyTypeImpl.java | 467 --- .../common/jaxb/xmlenc/impl/JAXBVersion.java | 15 - .../xmlenc/impl/ReferenceListElementImpl.java | 240 -- .../xmlenc/impl/ReferenceListTypeImpl.java | 749 ---- .../jaxb/xmlenc/impl/ReferenceTypeImpl.java | 331 -- .../jaxb/xmlenc/impl/TransformsTypeImpl.java | 310 -- .../ws/common/jaxb/xmlenc/package.html | 1 - .../xmlsig/CanonicalizationMethodElement.java | 26 - .../xmlsig/CanonicalizationMethodType.java | 75 - .../jaxb/xmlsig/DSAKeyValueElement.java | 26 - .../common/jaxb/xmlsig/DSAKeyValueType.java | 168 - .../jaxb/xmlsig/DigestMethodElement.java | 26 - .../common/jaxb/xmlsig/DigestMethodType.java | 75 - .../jaxb/xmlsig/DigestValueElement.java | 44 - .../ws/common/jaxb/xmlsig/KeyInfoElement.java | 26 - .../ws/common/jaxb/xmlsig/KeyInfoType.java | 89 - .../ws/common/jaxb/xmlsig/KeyNameElement.java | 44 - .../common/jaxb/xmlsig/KeyValueElement.java | 26 - .../ws/common/jaxb/xmlsig/KeyValueType.java | 60 - .../common/jaxb/xmlsig/ManifestElement.java | 26 - .../ws/common/jaxb/xmlsig/ManifestType.java | 75 - .../common/jaxb/xmlsig/MgmtDataElement.java | 44 - .../ws/common/jaxb/xmlsig/ObjectElement.java | 26 - .../ws/common/jaxb/xmlsig/ObjectFactory.java | 946 ----- .../ws/common/jaxb/xmlsig/ObjectType.java | 113 - .../ws/common/jaxb/xmlsig/PGPDataElement.java | 26 - .../ws/common/jaxb/xmlsig/PGPDataType.java | 100 - .../jaxb/xmlsig/RSAKeyValueElement.java | 26 - .../common/jaxb/xmlsig/RSAKeyValueType.java | 69 - .../common/jaxb/xmlsig/ReferenceElement.java | 26 - .../ws/common/jaxb/xmlsig/ReferenceType.java | 149 - .../jaxb/xmlsig/RetrievalMethodElement.java | 26 - .../jaxb/xmlsig/RetrievalMethodType.java | 90 - .../common/jaxb/xmlsig/SPKIDataElement.java | 26 - .../ws/common/jaxb/xmlsig/SPKIDataType.java | 92 - .../common/jaxb/xmlsig/SignatureElement.java | 26 - .../jaxb/xmlsig/SignatureMethodElement.java | 26 - .../jaxb/xmlsig/SignatureMethodType.java | 112 - .../xmlsig/SignaturePropertiesElement.java | 26 - .../jaxb/xmlsig/SignaturePropertiesType.java | 75 - .../jaxb/xmlsig/SignaturePropertyElement.java | 26 - .../jaxb/xmlsig/SignaturePropertyType.java | 94 - .../ws/common/jaxb/xmlsig/SignatureType.java | 138 - .../jaxb/xmlsig/SignatureValueElement.java | 26 - .../jaxb/xmlsig/SignatureValueType.java | 66 - .../common/jaxb/xmlsig/SignedInfoElement.java | 26 - .../ws/common/jaxb/xmlsig/SignedInfoType.java | 117 - .../common/jaxb/xmlsig/TransformElement.java | 26 - .../ws/common/jaxb/xmlsig/TransformType.java | 112 - .../common/jaxb/xmlsig/TransformsElement.java | 26 - .../ws/common/jaxb/xmlsig/TransformsType.java | 56 - .../common/jaxb/xmlsig/X509DataElement.java | 26 - .../ws/common/jaxb/xmlsig/X509DataType.java | 224 -- .../jaxb/xmlsig/X509IssuerSerialType.java | 69 - .../CanonicalizationMethodElementImpl.java | 268 -- .../impl/CanonicalizationMethodTypeImpl.java | 362 -- .../xmlsig/impl/DSAKeyValueElementImpl.java | 252 -- .../jaxb/xmlsig/impl/DSAKeyValueTypeImpl.java | 588 --- .../xmlsig/impl/DigestMethodElementImpl.java | 271 -- .../xmlsig/impl/DigestMethodTypeImpl.java | 366 -- .../xmlsig/impl/DigestValueElementImpl.java | 256 -- .../common/jaxb/xmlsig/impl/JAXBVersion.java | 15 - .../jaxb/xmlsig/impl/KeyInfoElementImpl.java | 328 -- .../jaxb/xmlsig/impl/KeyInfoTypeImpl.java | 437 --- .../jaxb/xmlsig/impl/KeyNameElementImpl.java | 253 -- .../jaxb/xmlsig/impl/KeyValueElementImpl.java | 262 -- .../jaxb/xmlsig/impl/KeyValueTypeImpl.java | 298 -- .../jaxb/xmlsig/impl/ManifestElementImpl.java | 282 -- .../jaxb/xmlsig/impl/ManifestTypeImpl.java | 476 --- .../jaxb/xmlsig/impl/MgmtDataElementImpl.java | 253 -- .../jaxb/xmlsig/impl/ObjectElementImpl.java | 342 -- .../jaxb/xmlsig/impl/ObjectTypeImpl.java | 552 --- .../jaxb/xmlsig/impl/PGPDataElementImpl.java | 250 -- .../jaxb/xmlsig/impl/PGPDataTypeImpl.java | 458 --- .../xmlsig/impl/RSAKeyValueElementImpl.java | 235 -- .../jaxb/xmlsig/impl/RSAKeyValueTypeImpl.java | 288 -- .../xmlsig/impl/ReferenceElementImpl.java | 365 -- .../jaxb/xmlsig/impl/ReferenceTypeImpl.java | 682 ---- .../impl/RetrievalMethodElementImpl.java | 314 -- .../xmlsig/impl/RetrievalMethodTypeImpl.java | 445 --- .../jaxb/xmlsig/impl/SPKIDataElementImpl.java | 238 -- .../jaxb/xmlsig/impl/SPKIDataTypeImpl.java | 562 --- .../xmlsig/impl/SignatureElementImpl.java | 303 -- .../impl/SignatureMethodElementImpl.java | 274 -- .../xmlsig/impl/SignatureMethodTypeImpl.java | 772 ---- .../impl/SignaturePropertiesElementImpl.java | 282 -- .../impl/SignaturePropertiesTypeImpl.java | 433 --- .../impl/SignaturePropertyElementImpl.java | 304 -- .../impl/SignaturePropertyTypeImpl.java | 460 --- .../jaxb/xmlsig/impl/SignatureTypeImpl.java | 814 ---- .../impl/SignatureValueElementImpl.java | 267 -- .../xmlsig/impl/SignatureValueTypeImpl.java | 306 -- .../xmlsig/impl/SignedInfoElementImpl.java | 296 -- .../jaxb/xmlsig/impl/SignedInfoTypeImpl.java | 654 ---- .../xmlsig/impl/TransformElementImpl.java | 274 -- .../jaxb/xmlsig/impl/TransformTypeImpl.java | 629 --- .../xmlsig/impl/TransformsElementImpl.java | 240 -- .../jaxb/xmlsig/impl/TransformsTypeImpl.java | 310 -- .../jaxb/xmlsig/impl/X509DataElementImpl.java | 269 -- .../jaxb/xmlsig/impl/X509DataTypeImpl.java | 1518 -------- .../xmlsig/impl/X509IssuerSerialTypeImpl.java | 297 -- .../ws/common/jaxb/xmlsig/package.html | 1 - .../jaxb/AuthenticateRequesterElement.java | 26 - .../AuthenticateSessionContextElement.java | 26 - .../disco/jaxb/AuthorizeRequesterElement.java | 26 - .../ws/disco/jaxb/DescriptionType.java | 174 - .../liberty/ws/disco/jaxb/DirectiveType.java | 53 - .../liberty/ws/disco/jaxb/EmptyType.java | 30 - .../disco/jaxb/EncryptResourceIDElement.java | 26 - .../jaxb/EncryptedResourceIDElement.java | 26 - .../disco/jaxb/EncryptedResourceIDType.java | 73 - .../ws/disco/jaxb/ExtensionElement.java | 27 - .../liberty/ws/disco/jaxb/ExtensionType.java | 56 - .../ws/disco/jaxb/InsertEntryType.java | 76 - .../liberty/ws/disco/jaxb/ModifyElement.java | 26 - .../ws/disco/jaxb/ModifyResponseElement.java | 26 - .../ws/disco/jaxb/ModifyResponseType.java | 120 - .../liberty/ws/disco/jaxb/ModifyType.java | 139 - .../liberty/ws/disco/jaxb/ObjectFactory.java | 556 --- .../liberty/ws/disco/jaxb/OptionsElement.java | 26 - .../liberty/ws/disco/jaxb/OptionsType.java | 55 - .../liberty/ws/disco/jaxb/QueryElement.java | 26 - .../ws/disco/jaxb/QueryResponseElement.java | 26 - .../ws/disco/jaxb/QueryResponseType.java | 171 - .../liberty/ws/disco/jaxb/QueryType.java | 188 - .../ws/disco/jaxb/RemoveEntryType.java | 48 - .../ws/disco/jaxb/ResourceIDElement.java | 26 - .../liberty/ws/disco/jaxb/ResourceIDType.java | 66 - .../disco/jaxb/ResourceOfferingElement.java | 26 - .../ws/disco/jaxb/ResourceOfferingType.java | 150 - .../ws/disco/jaxb/ServiceInstanceType.java | 93 - .../ws/disco/jaxb/ServiceTypeElement.java | 44 - .../liberty/ws/disco/jaxb/StatusElement.java | 27 - .../liberty/ws/disco/jaxb/StatusType.java | 114 - .../AuthenticateRequesterElementImpl.java | 278 -- ...AuthenticateSessionContextElementImpl.java | 278 -- .../impl/AuthorizeRequesterElementImpl.java | 278 -- .../disco/jaxb/impl/DescriptionTypeImpl.java | 702 ---- .../ws/disco/jaxb/impl/DirectiveTypeImpl.java | 308 -- .../ws/disco/jaxb/impl/EmptyTypeImpl.java | 163 - .../impl/EncryptResourceIDElementImpl.java | 278 -- .../impl/EncryptedResourceIDElementImpl.java | 248 -- .../impl/EncryptedResourceIDTypeImpl.java | 605 --- .../disco/jaxb/impl/ExtensionElementImpl.java | 235 -- .../ws/disco/jaxb/impl/ExtensionTypeImpl.java | 220 -- .../disco/jaxb/impl/InsertEntryTypeImpl.java | 358 -- .../ws/disco/jaxb/impl/JAXBVersion.java | 15 - .../ws/disco/jaxb/impl/ModifyElementImpl.java | 319 -- .../jaxb/impl/ModifyResponseElementImpl.java | 324 -- .../jaxb/impl/ModifyResponseTypeImpl.java | 558 --- .../ws/disco/jaxb/impl/ModifyTypeImpl.java | 653 ---- .../disco/jaxb/impl/OptionsElementImpl.java | 244 -- .../ws/disco/jaxb/impl/OptionsTypeImpl.java | 293 -- .../ws/disco/jaxb/impl/QueryElementImpl.java | 311 -- .../jaxb/impl/QueryResponseElementImpl.java | 293 -- .../jaxb/impl/QueryResponseTypeImpl.java | 819 ---- .../ws/disco/jaxb/impl/QueryTypeImpl.java | 860 ----- .../disco/jaxb/impl/RemoveEntryTypeImpl.java | 262 -- .../jaxb/impl/ResourceIDElementImpl.java | 265 -- .../disco/jaxb/impl/ResourceIDTypeImpl.java | 305 -- .../impl/ResourceOfferingElementImpl.java | 316 -- .../jaxb/impl/ResourceOfferingTypeImpl.java | 653 ---- .../jaxb/impl/ServiceInstanceTypeImpl.java | 396 -- .../jaxb/impl/ServiceTypeElementImpl.java | 251 -- .../ws/disco/jaxb/impl/StatusElementImpl.java | 277 -- .../ws/disco/jaxb/impl/StatusTypeImpl.java | 585 --- .../liberty/ws/disco/jaxb/package.html | 1 - .../liberty/ws/disco/jaxb11/EmptyType.java | 30 - .../ws/disco/jaxb11/ExtensionElement.java | 27 - .../ws/disco/jaxb11/ExtensionType.java | 56 - .../jaxb11/GenerateBearerTokenElement.java | 26 - .../liberty/ws/disco/jaxb11/KeysElement.java | 26 - .../liberty/ws/disco/jaxb11/KeysType.java | 56 - .../ws/disco/jaxb11/ObjectFactory.java | 222 -- .../disco/jaxb11/SendSingleLogOutElement.java | 26 - .../ws/disco/jaxb11/StatusElement.java | 27 - .../liberty/ws/disco/jaxb11/StatusType.java | 114 - .../ws/disco/jaxb11/impl/EmptyTypeImpl.java | 163 - .../jaxb11/impl/ExtensionElementImpl.java | 235 -- .../disco/jaxb11/impl/ExtensionTypeImpl.java | 220 -- .../impl/GenerateBearerTokenElementImpl.java | 278 -- .../ws/disco/jaxb11/impl/JAXBVersion.java | 15 - .../ws/disco/jaxb11/impl/KeysElementImpl.java | 241 -- .../ws/disco/jaxb11/impl/KeysTypeImpl.java | 339 -- .../impl/SendSingleLogOutElementImpl.java | 278 -- .../disco/jaxb11/impl/StatusElementImpl.java | 277 -- .../ws/disco/jaxb11/impl/StatusTypeImpl.java | 585 --- .../liberty/ws/disco/jaxb11/package.html | 1 - .../disco/plugins/jaxb/DiscoEntryElement.java | 26 - .../ws/disco/plugins/jaxb/ObjectFactory.java | 114 - .../jaxb/impl/DiscoEntryElementImpl.java | 244 -- .../disco/plugins/jaxb/impl/JAXBVersion.java | 15 - .../ws/disco/plugins/jaxb/package.html | 1 - .../liberty/ws/idpp/jaxb/AddrTypeElement.java | 26 - .../ws/idpp/jaxb/AddressCardElement.java | 26 - .../liberty/ws/idpp/jaxb/AddressCardType.java | 202 - .../liberty/ws/idpp/jaxb/AddressElement.java | 26 - .../liberty/ws/idpp/jaxb/AddressType.java | 269 -- .../liberty/ws/idpp/jaxb/AgeElement.java | 26 - .../liberty/ws/idpp/jaxb/AltCNElement.java | 26 - .../liberty/ws/idpp/jaxb/AltIDElement.java | 26 - .../liberty/ws/idpp/jaxb/AltIDType.java | 131 - .../liberty/ws/idpp/jaxb/AltLOElement.java | 26 - .../liberty/ws/idpp/jaxb/AltOElement.java | 26 - .../ws/idpp/jaxb/AnalyzedNameElement.java | 26 - .../ws/idpp/jaxb/AnalyzedNameType.java | 292 -- .../liberty/ws/idpp/jaxb/BirthdayElement.java | 26 - .../liberty/ws/idpp/jaxb/CElement.java | 26 - .../liberty/ws/idpp/jaxb/CNElement.java | 26 - .../ws/idpp/jaxb/CommonNameElement.java | 26 - .../liberty/ws/idpp/jaxb/CommonNameType.java | 206 - .../liberty/ws/idpp/jaxb/DOBElement.java | 26 - .../liberty/ws/idpp/jaxb/DSTDate.java | 138 - .../liberty/ws/idpp/jaxb/DSTInteger.java | 138 - .../ws/idpp/jaxb/DSTLocalizedString.java | 174 - .../liberty/ws/idpp/jaxb/DSTMonthDay.java | 138 - .../liberty/ws/idpp/jaxb/DSTString.java | 138 - .../identity/liberty/ws/idpp/jaxb/DSTURI.java | 138 - .../ws/idpp/jaxb/DemographicsElement.java | 26 - .../ws/idpp/jaxb/DemographicsType.java | 198 - .../ws/idpp/jaxb/DisplayLanguageElement.java | 26 - .../ws/idpp/jaxb/EmergencyContactElement.java | 26 - .../idpp/jaxb/EmploymentIdentityElement.java | 26 - .../ws/idpp/jaxb/EmploymentIdentityType.java | 227 -- .../liberty/ws/idpp/jaxb/EmptyType.java | 30 - .../ws/idpp/jaxb/EncryptKeyElement.java | 26 - .../idpp/jaxb/EncryptedResourceIDElement.java | 26 - .../ws/idpp/jaxb/ExtensionElement.java | 27 - .../liberty/ws/idpp/jaxb/ExtensionType.java | 56 - .../liberty/ws/idpp/jaxb/FNElement.java | 26 - .../liberty/ws/idpp/jaxb/FacadeElement.java | 26 - .../liberty/ws/idpp/jaxb/FacadeType.java | 194 - .../liberty/ws/idpp/jaxb/GenderElement.java | 26 - .../ws/idpp/jaxb/GreetMeSoundElement.java | 26 - .../ws/idpp/jaxb/GreetSoundElement.java | 26 - .../liberty/ws/idpp/jaxb/IDTypeElement.java | 26 - .../liberty/ws/idpp/jaxb/IDValueElement.java | 26 - .../ws/idpp/jaxb/InformalNameElement.java | 26 - .../liberty/ws/idpp/jaxb/JobTitleElement.java | 26 - .../liberty/ws/idpp/jaxb/KeyInfoType.java | 107 - .../liberty/ws/idpp/jaxb/LAltCNElement.java | 26 - .../liberty/ws/idpp/jaxb/LCNElement.java | 26 - .../liberty/ws/idpp/jaxb/LCommentElement.java | 26 - .../liberty/ws/idpp/jaxb/LElement.java | 26 - .../idpp/jaxb/LEmergencyContactElement.java | 26 - .../liberty/ws/idpp/jaxb/LFNElement.java | 26 - .../ws/idpp/jaxb/LInformalNameElement.java | 26 - .../ws/idpp/jaxb/LJobTitleElement.java | 26 - .../liberty/ws/idpp/jaxb/LLElement.java | 26 - .../ws/idpp/jaxb/LLegalNameElement.java | 26 - .../liberty/ws/idpp/jaxb/LMNElement.java | 26 - .../liberty/ws/idpp/jaxb/LNickElement.java | 26 - .../liberty/ws/idpp/jaxb/LOElement.java | 26 - .../ws/idpp/jaxb/LPersonalTitleElement.java | 26 - .../ws/idpp/jaxb/LPostalAddressElement.java | 26 - .../liberty/ws/idpp/jaxb/LSNElement.java | 26 - .../liberty/ws/idpp/jaxb/LStElement.java | 26 - .../liberty/ws/idpp/jaxb/LanguageElement.java | 26 - .../ws/idpp/jaxb/LegalIdentityElement.java | 26 - .../ws/idpp/jaxb/LegalIdentityType.java | 265 -- .../ws/idpp/jaxb/LegalNameElement.java | 26 - .../liberty/ws/idpp/jaxb/MNElement.java | 26 - .../ws/idpp/jaxb/MaritalStatusElement.java | 26 - .../liberty/ws/idpp/jaxb/ModifyElement.java | 26 - .../ws/idpp/jaxb/ModifyResponseElement.java | 26 - .../liberty/ws/idpp/jaxb/ModifyType.java | 350 -- .../ws/idpp/jaxb/MsgAccountElement.java | 26 - .../ws/idpp/jaxb/MsgContactElement.java | 26 - .../liberty/ws/idpp/jaxb/MsgContactType.java | 294 -- .../ws/idpp/jaxb/MsgMethodElement.java | 26 - .../ws/idpp/jaxb/MsgProviderElement.java | 26 - .../ws/idpp/jaxb/MsgSubaccountElement.java | 26 - .../ws/idpp/jaxb/MsgTechnologyElement.java | 34 - .../ws/idpp/jaxb/MsgTechnologyType.java | 50 - .../liberty/ws/idpp/jaxb/MsgTypeElement.java | 26 - .../liberty/ws/idpp/jaxb/MugShotElement.java | 26 - .../ws/idpp/jaxb/NamePronouncedElement.java | 26 - .../liberty/ws/idpp/jaxb/NickElement.java | 26 - .../liberty/ws/idpp/jaxb/OElement.java | 26 - .../liberty/ws/idpp/jaxb/ObjectFactory.java | 1609 -------- .../liberty/ws/idpp/jaxb/PPElement.java | 26 - .../identity/liberty/ws/idpp/jaxb/PPType.java | 378 -- .../ws/idpp/jaxb/PersonalTitleElement.java | 26 - .../ws/idpp/jaxb/PostalAddressElement.java | 26 - .../ws/idpp/jaxb/PostalCodeElement.java | 26 - .../liberty/ws/idpp/jaxb/QueryElement.java | 26 - .../ws/idpp/jaxb/QueryResponseElement.java | 26 - .../ws/idpp/jaxb/QueryResponseType.java | 254 -- .../liberty/ws/idpp/jaxb/QueryType.java | 284 -- .../ws/idpp/jaxb/ResourceIDElement.java | 26 - .../liberty/ws/idpp/jaxb/ResponseType.java | 134 - .../liberty/ws/idpp/jaxb/SNElement.java | 26 - .../liberty/ws/idpp/jaxb/SignKeyElement.java | 26 - .../liberty/ws/idpp/jaxb/StElement.java | 26 - .../liberty/ws/idpp/jaxb/StatusElement.java | 27 - .../liberty/ws/idpp/jaxb/StatusType.java | 114 - .../liberty/ws/idpp/jaxb/TimeZoneElement.java | 26 - .../liberty/ws/idpp/jaxb/VATElement.java | 26 - .../liberty/ws/idpp/jaxb/VATType.java | 131 - .../liberty/ws/idpp/jaxb/WebSiteElement.java | 26 - .../idpp/jaxb/impl/AddrTypeElementImpl.java | 394 -- .../jaxb/impl/AddressCardElementImpl.java | 394 -- .../idpp/jaxb/impl/AddressCardTypeImpl.java | 1624 -------- .../ws/idpp/jaxb/impl/AddressElementImpl.java | 434 --- .../ws/idpp/jaxb/impl/AddressTypeImpl.java | 2368 ------------ .../ws/idpp/jaxb/impl/AgeElementImpl.java | 401 -- .../ws/idpp/jaxb/impl/AltCNElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/AltIDElementImpl.java | 328 -- .../ws/idpp/jaxb/impl/AltIDTypeImpl.java | 876 ----- .../ws/idpp/jaxb/impl/AltLOElementImpl.java | 427 --- .../ws/idpp/jaxb/impl/AltOElementImpl.java | 395 -- .../jaxb/impl/AnalyzedNameElementImpl.java | 465 --- .../idpp/jaxb/impl/AnalyzedNameTypeImpl.java | 2508 ------------ .../idpp/jaxb/impl/BirthdayElementImpl.java | 396 -- .../ws/idpp/jaxb/impl/CElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/CNElementImpl.java | 394 -- .../idpp/jaxb/impl/CommonNameElementImpl.java | 393 -- .../ws/idpp/jaxb/impl/CommonNameTypeImpl.java | 1703 --------- .../ws/idpp/jaxb/impl/DOBElementImpl.java | 396 -- .../ws/idpp/jaxb/impl/DSTDateImpl.java | 675 ---- .../ws/idpp/jaxb/impl/DSTIntegerImpl.java | 681 ---- .../jaxb/impl/DSTLocalizedStringImpl.java | 846 ---- .../ws/idpp/jaxb/impl/DSTMonthDayImpl.java | 675 ---- .../ws/idpp/jaxb/impl/DSTStringImpl.java | 674 ---- .../liberty/ws/idpp/jaxb/impl/DSTURIImpl.java | 673 ---- .../jaxb/impl/DemographicsElementImpl.java | 393 -- .../idpp/jaxb/impl/DemographicsTypeImpl.java | 1580 -------- .../jaxb/impl/DisplayLanguageElementImpl.java | 395 -- .../impl/EmergencyContactElementImpl.java | 395 -- .../impl/EmploymentIdentityElementImpl.java | 406 -- .../jaxb/impl/EmploymentIdentityTypeImpl.java | 1929 ---------- .../ws/idpp/jaxb/impl/EmptyTypeImpl.java | 163 - .../idpp/jaxb/impl/EncryptKeyElementImpl.java | 458 --- .../impl/EncryptedResourceIDElementImpl.java | 248 -- .../idpp/jaxb/impl/ExtensionElementImpl.java | 235 -- .../ws/idpp/jaxb/impl/ExtensionTypeImpl.java | 220 -- .../ws/idpp/jaxb/impl/FNElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/FacadeElementImpl.java | 391 -- .../ws/idpp/jaxb/impl/FacadeTypeImpl.java | 1555 -------- .../ws/idpp/jaxb/impl/GenderElementImpl.java | 394 -- .../jaxb/impl/GreetMeSoundElementImpl.java | 394 -- .../idpp/jaxb/impl/GreetSoundElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/IDTypeElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/IDValueElementImpl.java | 395 -- .../jaxb/impl/InformalNameElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/JAXBVersion.java | 15 - .../idpp/jaxb/impl/JobTitleElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/KeyInfoTypeImpl.java | 668 ---- .../ws/idpp/jaxb/impl/LAltCNElementImpl.java | 427 --- .../ws/idpp/jaxb/impl/LCNElementImpl.java | 426 --- .../idpp/jaxb/impl/LCommentElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/LElementImpl.java | 394 -- .../impl/LEmergencyContactElementImpl.java | 427 --- .../ws/idpp/jaxb/impl/LFNElementImpl.java | 426 --- .../jaxb/impl/LInformalNameElementImpl.java | 427 --- .../idpp/jaxb/impl/LJobTitleElementImpl.java | 427 --- .../ws/idpp/jaxb/impl/LLElementImpl.java | 426 --- .../idpp/jaxb/impl/LLegalNameElementImpl.java | 427 --- .../ws/idpp/jaxb/impl/LMNElementImpl.java | 426 --- .../ws/idpp/jaxb/impl/LNickElementImpl.java | 427 --- .../ws/idpp/jaxb/impl/LOElementImpl.java | 426 --- .../jaxb/impl/LPersonalTitleElementImpl.java | 427 --- .../jaxb/impl/LPostalAddressElementImpl.java | 427 --- .../ws/idpp/jaxb/impl/LSNElementImpl.java | 426 --- .../ws/idpp/jaxb/impl/LStElementImpl.java | 426 --- .../idpp/jaxb/impl/LanguageElementImpl.java | 395 -- .../jaxb/impl/LegalIdentityElementImpl.java | 438 --- .../idpp/jaxb/impl/LegalIdentityTypeImpl.java | 2160 ----------- .../idpp/jaxb/impl/LegalNameElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/MNElementImpl.java | 394 -- .../jaxb/impl/MaritalStatusElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/ModifyElementImpl.java | 346 -- .../jaxb/impl/ModifyResponseElementImpl.java | 355 -- .../ws/idpp/jaxb/impl/ModifyTypeImpl.java | 1616 -------- .../idpp/jaxb/impl/MsgAccountElementImpl.java | 395 -- .../idpp/jaxb/impl/MsgContactElementImpl.java | 451 --- .../ws/idpp/jaxb/impl/MsgContactTypeImpl.java | 2589 ------------- .../idpp/jaxb/impl/MsgMethodElementImpl.java | 394 -- .../jaxb/impl/MsgProviderElementImpl.java | 395 -- .../jaxb/impl/MsgSubaccountElementImpl.java | 395 -- .../jaxb/impl/MsgTechnologyElementImpl.java | 431 --- .../idpp/jaxb/impl/MsgTechnologyTypeImpl.java | 455 --- .../ws/idpp/jaxb/impl/MsgTypeElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/MugShotElementImpl.java | 394 -- .../jaxb/impl/NamePronouncedElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/NickElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/OElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/PPElementImpl.java | 513 --- .../liberty/ws/idpp/jaxb/impl/PPTypeImpl.java | 3386 ----------------- .../jaxb/impl/PersonalTitleElementImpl.java | 395 -- .../jaxb/impl/PostalAddressElementImpl.java | 395 -- .../idpp/jaxb/impl/PostalCodeElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/QueryElementImpl.java | 346 -- .../jaxb/impl/QueryResponseElementImpl.java | 359 -- .../idpp/jaxb/impl/QueryResponseTypeImpl.java | 1225 ------ .../ws/idpp/jaxb/impl/QueryTypeImpl.java | 1434 ------- .../idpp/jaxb/impl/ResourceIDElementImpl.java | 265 -- .../ws/idpp/jaxb/impl/ResponseTypeImpl.java | 654 ---- .../ws/idpp/jaxb/impl/SNElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/SignKeyElementImpl.java | 458 --- .../ws/idpp/jaxb/impl/StElementImpl.java | 394 -- .../ws/idpp/jaxb/impl/StatusElementImpl.java | 277 -- .../ws/idpp/jaxb/impl/StatusTypeImpl.java | 585 --- .../idpp/jaxb/impl/TimeZoneElementImpl.java | 395 -- .../ws/idpp/jaxb/impl/VATElementImpl.java | 328 -- .../ws/idpp/jaxb/impl/VATTypeImpl.java | 876 ----- .../ws/idpp/jaxb/impl/WebSiteElementImpl.java | 394 -- .../liberty/ws/idpp/jaxb/package.html | 1 - .../ws/idpp/plugin/jaxb/ObjectFactory.java | 127 - .../plugin/jaxb/PPISExtensionElement.java | 34 - .../idpp/plugin/jaxb/PPISExtensionType.java | 66 - .../ws/idpp/plugin/jaxb/impl/JAXBVersion.java | 15 - .../jaxb/impl/PPISExtensionElementImpl.java | 261 -- .../jaxb/impl/PPISExtensionTypeImpl.java | 288 -- .../liberty/ws/idpp/plugin/jaxb/package.html | 1 - .../ws/interaction/jaxb/EmptyType.java | 30 - .../jaxb/EncryptedResourceIDElement.java | 26 - .../ws/interaction/jaxb/ExtensionElement.java | 27 - .../ws/interaction/jaxb/ExtensionType.java | 56 - .../ws/interaction/jaxb/HelpElement.java | 26 - .../liberty/ws/interaction/jaxb/HelpType.java | 86 - .../ws/interaction/jaxb/HintElement.java | 44 - .../ws/interaction/jaxb/InquiryElement.java | 26 - .../interaction/jaxb/InquiryElementType.java | 128 - .../ws/interaction/jaxb/InquiryType.java | 137 - .../jaxb/InteractionRequestElement.java | 26 - .../jaxb/InteractionRequestType.java | 199 - .../jaxb/InteractionResponseElement.java | 26 - .../jaxb/InteractionResponseType.java | 102 - .../jaxb/InteractionStatementType.java | 73 - .../ws/interaction/jaxb/ObjectFactory.java | 502 --- .../ws/interaction/jaxb/ParameterType.java | 67 - .../jaxb/RedirectRequestElement.java | 26 - .../interaction/jaxb/RedirectRequestType.java | 48 - .../interaction/jaxb/ResourceIDElement.java | 26 - .../ws/interaction/jaxb/SelectElement.java | 26 - .../ws/interaction/jaxb/SelectType.java | 161 - .../ws/interaction/jaxb/StatusElement.java | 27 - .../ws/interaction/jaxb/StatusType.java | 114 - .../ws/interaction/jaxb/TextElement.java | 26 - .../liberty/ws/interaction/jaxb/TextType.java | 88 - .../jaxb/UserInteractionElement.java | 26 - .../jaxb/UserInteractionHeaderType.java | 176 - .../interaction/jaxb/impl/EmptyTypeImpl.java | 163 - .../impl/EncryptedResourceIDElementImpl.java | 248 -- .../jaxb/impl/ExtensionElementImpl.java | 235 -- .../jaxb/impl/ExtensionTypeImpl.java | 220 -- .../jaxb/impl/HelpElementImpl.java | 326 -- .../interaction/jaxb/impl/HelpTypeImpl.java | 444 --- .../jaxb/impl/HintElementImpl.java | 252 -- .../jaxb/impl/InquiryElementImpl.java | 339 -- .../jaxb/impl/InquiryElementTypeImpl.java | 641 ---- .../jaxb/impl/InquiryTypeImpl.java | 898 ----- .../impl/InteractionRequestElementImpl.java | 427 --- .../jaxb/impl/InteractionRequestTypeImpl.java | 1078 ------ .../impl/InteractionResponseElementImpl.java | 249 -- .../impl/InteractionResponseTypeImpl.java | 470 --- .../impl/InteractionStatementTypeImpl.java | 430 --- .../ws/interaction/jaxb/impl/JAXBVersion.java | 15 - .../jaxb/impl/ParameterTypeImpl.java | 347 -- .../jaxb/impl/RedirectRequestElementImpl.java | 260 -- .../jaxb/impl/RedirectRequestTypeImpl.java | 258 -- .../jaxb/impl/ResourceIDElementImpl.java | 265 -- .../jaxb/impl/SelectElementImpl.java | 325 -- .../interaction/jaxb/impl/SelectTypeImpl.java | 893 ----- .../jaxb/impl/StatusElementImpl.java | 277 -- .../interaction/jaxb/impl/StatusTypeImpl.java | 585 --- .../jaxb/impl/TextElementImpl.java | 383 -- .../interaction/jaxb/impl/TextTypeImpl.java | 526 --- .../jaxb/impl/UserInteractionElementImpl.java | 482 --- .../impl/UserInteractionHeaderTypeImpl.java | 983 ----- .../liberty/ws/interaction/jaxb/package.html | 1 - .../jaxb/AdditionalMetadataLocationType.java | 66 - .../meta/jaxb/AffiliationDescriptorType.java | 217 -- .../liberty/ws/meta/jaxb/ContactType.java | 195 - .../liberty/ws/meta/jaxb/EmptyType.java | 30 - .../meta/jaxb/EntitiesDescriptorElement.java | 26 - .../ws/meta/jaxb/EntitiesDescriptorType.java | 56 - .../ws/meta/jaxb/EntityDescriptorElement.java | 26 - .../ws/meta/jaxb/EntityDescriptorType.java | 257 -- .../ws/meta/jaxb/ExtensionElement.java | 27 - .../liberty/ws/meta/jaxb/ExtensionType.java | 56 - .../ws/meta/jaxb/IDPDescriptorElement.java | 26 - .../ws/meta/jaxb/IDPDescriptorType.java | 95 - .../ws/meta/jaxb/KeyDescriptorElement.java | 26 - .../ws/meta/jaxb/KeyDescriptorType.java | 130 - .../ws/meta/jaxb/LocalizedURIType.java | 66 - .../liberty/ws/meta/jaxb/ObjectFactory.java | 419 -- .../jaxb/OrganizationDisplayNameType.java | 66 - .../ws/meta/jaxb/OrganizationNameType.java | 66 - .../ws/meta/jaxb/OrganizationType.java | 124 - .../ws/meta/jaxb/ProviderDescriptorType.java | 499 --- .../ws/meta/jaxb/SPDescriptorElement.java | 26 - .../ws/meta/jaxb/SPDescriptorType.java | 149 - .../liberty/ws/meta/jaxb/StatusElement.java | 27 - .../liberty/ws/meta/jaxb/StatusType.java | 110 - .../AdditionalMetadataLocationTypeImpl.java | 297 -- .../impl/AffiliationDescriptorTypeImpl.java | 1086 ------ .../ws/meta/jaxb/impl/ContactTypeImpl.java | 844 ---- .../ws/meta/jaxb/impl/EmptyTypeImpl.java | 163 - .../impl/EntitiesDescriptorElementImpl.java | 250 -- .../jaxb/impl/EntitiesDescriptorTypeImpl.java | 375 -- .../impl/EntityDescriptorElementImpl.java | 379 -- .../jaxb/impl/EntityDescriptorTypeImpl.java | 1376 ------- .../meta/jaxb/impl/ExtensionElementImpl.java | 235 -- .../ws/meta/jaxb/impl/ExtensionTypeImpl.java | 220 -- .../jaxb/impl/IDPDescriptorElementImpl.java | 419 -- .../meta/jaxb/impl/IDPDescriptorTypeImpl.java | 587 --- .../ws/meta/jaxb/impl/JAXBVersion.java | 15 - .../jaxb/impl/KeyDescriptorElementImpl.java | 330 -- .../meta/jaxb/impl/KeyDescriptorTypeImpl.java | 645 ---- .../meta/jaxb/impl/LocalizedURITypeImpl.java | 293 -- .../impl/OrganizationDisplayNameTypeImpl.java | 293 -- .../jaxb/impl/OrganizationNameTypeImpl.java | 305 -- .../meta/jaxb/impl/OrganizationTypeImpl.java | 557 --- .../jaxb/impl/ProviderDescriptorTypeImpl.java | 2172 ----------- .../jaxb/impl/SPDescriptorElementImpl.java | 422 -- .../meta/jaxb/impl/SPDescriptorTypeImpl.java | 928 ----- .../ws/meta/jaxb/impl/StatusElementImpl.java | 277 -- .../ws/meta/jaxb/impl/StatusTypeImpl.java | 560 --- .../liberty/ws/meta/jaxb/package.html | 1 - .../liberty/ws/paos/jaxb/EmptyType.java | 30 - .../ws/paos/jaxb/ExtensionElement.java | 27 - .../liberty/ws/paos/jaxb/ExtensionType.java | 56 - .../liberty/ws/paos/jaxb/ObjectFactory.java | 221 -- .../liberty/ws/paos/jaxb/RequestElement.java | 26 - .../liberty/ws/paos/jaxb/RequestType.java | 118 - .../liberty/ws/paos/jaxb/ResponseElement.java | 26 - .../liberty/ws/paos/jaxb/ResponseType.java | 80 - .../liberty/ws/paos/jaxb/StatusElement.java | 27 - .../liberty/ws/paos/jaxb/StatusType.java | 110 - .../ws/paos/jaxb/impl/EmptyTypeImpl.java | 163 - .../paos/jaxb/impl/ExtensionElementImpl.java | 235 -- .../ws/paos/jaxb/impl/ExtensionTypeImpl.java | 220 -- .../ws/paos/jaxb/impl/JAXBVersion.java | 15 - .../ws/paos/jaxb/impl/RequestElementImpl.java | 307 -- .../ws/paos/jaxb/impl/RequestTypeImpl.java | 615 --- .../paos/jaxb/impl/ResponseElementImpl.java | 306 -- .../ws/paos/jaxb/impl/ResponseTypeImpl.java | 457 --- .../ws/paos/jaxb/impl/StatusElementImpl.java | 277 -- .../ws/paos/jaxb/impl/StatusTypeImpl.java | 560 --- .../liberty/ws/paos/jaxb/package.html | 1 - .../ws/soapbinding/jaxb/ConsentElement.java | 26 - .../ws/soapbinding/jaxb/ConsentType.java | 118 - .../soapbinding/jaxb/CorrelationElement.java | 26 - .../ws/soapbinding/jaxb/CorrelationType.java | 137 - .../ws/soapbinding/jaxb/EmptyType.java | 30 - .../ws/soapbinding/jaxb/ExtensionElement.java | 27 - .../ws/soapbinding/jaxb/ExtensionType.java | 56 - .../ws/soapbinding/jaxb/ObjectFactory.java | 302 -- .../jaxb/ProcessingContextElement.java | 26 - .../jaxb/ProcessingContextType.java | 98 - .../ws/soapbinding/jaxb/ProviderElement.java | 26 - .../ws/soapbinding/jaxb/ProviderType.java | 118 - .../ws/soapbinding/jaxb/StatusElement.java | 27 - .../ws/soapbinding/jaxb/StatusType.java | 114 - .../jaxb/UsageDirectiveElement.java | 26 - .../soapbinding/jaxb/UsageDirectiveType.java | 125 - .../jaxb/impl/ConsentElementImpl.java | 337 -- .../jaxb/impl/ConsentTypeImpl.java | 636 ---- .../jaxb/impl/CorrelationElementImpl.java | 315 -- .../jaxb/impl/CorrelationTypeImpl.java | 720 ---- .../soapbinding/jaxb/impl/EmptyTypeImpl.java | 163 - .../jaxb/impl/ExtensionElementImpl.java | 235 -- .../jaxb/impl/ExtensionTypeImpl.java | 220 -- .../ws/soapbinding/jaxb/impl/JAXBVersion.java | 15 - .../impl/ProcessingContextElementImpl.java | 334 -- .../jaxb/impl/ProcessingContextTypeImpl.java | 497 --- .../jaxb/impl/ProviderElementImpl.java | 335 -- .../jaxb/impl/ProviderTypeImpl.java | 634 --- .../jaxb/impl/StatusElementImpl.java | 277 -- .../soapbinding/jaxb/impl/StatusTypeImpl.java | 585 --- .../jaxb/impl/UsageDirectiveElementImpl.java | 317 -- .../jaxb/impl/UsageDirectiveTypeImpl.java | 613 --- .../liberty/ws/soapbinding/jaxb/package.html | 1 - .../jaxb11/CredentialsContextElement.java | 26 - .../jaxb11/CredentialsContextType.java | 127 - .../ws/soapbinding/jaxb11/EmptyType.java | 30 - .../soapbinding/jaxb11/ExtensionElement.java | 27 - .../ws/soapbinding/jaxb11/ExtensionType.java | 56 - .../ws/soapbinding/jaxb11/ObjectFactory.java | 261 -- .../jaxb11/ServiceInstanceUpdateElement.java | 26 - .../jaxb11/ServiceInstanceUpdateType.java | 220 -- .../ws/soapbinding/jaxb11/StatusElement.java | 27 - .../ws/soapbinding/jaxb11/StatusType.java | 114 - .../ws/soapbinding/jaxb11/TimeoutElement.java | 26 - .../ws/soapbinding/jaxb11/TimeoutType.java | 99 - .../impl/CredentialsContextElementImpl.java | 364 -- .../impl/CredentialsContextTypeImpl.java | 663 ---- .../jaxb11/impl/EmptyTypeImpl.java | 163 - .../jaxb11/impl/ExtensionElementImpl.java | 235 -- .../jaxb11/impl/ExtensionTypeImpl.java | 220 -- .../soapbinding/jaxb11/impl/JAXBVersion.java | 15 - .../ServiceInstanceUpdateElementImpl.java | 364 -- .../impl/ServiceInstanceUpdateTypeImpl.java | 1046 ----- .../jaxb11/impl/StatusElementImpl.java | 277 -- .../jaxb11/impl/StatusTypeImpl.java | 585 --- .../jaxb11/impl/TimeoutElementImpl.java | 312 -- .../jaxb11/impl/TimeoutTypeImpl.java | 554 --- .../ws/soapbinding/jaxb11/package.html | 1 - .../main/java/com/sun/xml/bind/Messages.java | 82 - .../java/org/w3/_2001/xmlschema/AnyType.java | 56 - .../org/w3/_2001/xmlschema/ObjectFactory.java | 113 - .../w3/_2001/xmlschema/impl/AnyTypeImpl.java | 268 -- .../w3/_2001/xmlschema/impl/JAXBVersion.java | 15 - .../identity/federation/jaxb/jaxb.properties | 3 +- .../liberty/ws/authnsvc/jaxb/jaxb.properties | 3 +- .../liberty/ws/common/jaxb/ac/jaxb.properties | 3 +- .../ws/common/jaxb/assertion/jaxb.properties | 3 +- .../liberty/ws/common/jaxb/jaxb.properties | 3 +- .../ws/common/jaxb/protocol/jaxb.properties | 3 +- .../liberty/ws/common/jaxb/ps/jaxb.properties | 3 +- .../ws/common/jaxb/secext/jaxb.properties | 3 +- .../ws/common/jaxb/security/jaxb.properties | 3 +- .../ws/common/jaxb/soap/jaxb.properties | 3 +- .../ws/common/jaxb/utility/jaxb.properties | 3 +- .../ws/common/jaxb/xmlsec/jaxb.properties | 3 +- .../ws/common/jaxb/xmlsig/jaxb.properties | 3 +- .../liberty/ws/disco/jaxb/jaxb.properties | 3 +- .../liberty/ws/disco/jaxb11/jaxb.properties | 3 +- .../ws/disco/plugins/jaxb/jaxb.properties | 3 +- .../liberty/ws/idpp/jaxb/jaxb.properties | 3 +- .../ws/idpp/plugin/jaxb/jaxb.properties | 3 +- .../ws/interaction/jaxb/jaxb.properties | 3 +- .../liberty/ws/meta/jaxb/jaxb.properties | 3 +- .../liberty/ws/paos/jaxb/jaxb.properties | 3 +- .../ws/soapbinding/jaxb/jaxb.properties | 3 +- .../ws/soapbinding/jaxb11/jaxb.properties | 3 +- .../org/w3/_2001/xmlschema/jaxb.properties | 3 +- .../src/main/xjb/liberty.xjb | 224 +- .../main/xsd/idff-entity-config-schema.xsd | 4 +- openam-schema/openam-saml2-schema/pom.xml | 34 +- .../saml2/jaxb/assertion/ActionElement.java | 26 - .../saml2/jaxb/assertion/ActionType.java | 66 - .../saml2/jaxb/assertion/AdviceElement.java | 26 - .../saml2/jaxb/assertion/AdviceType.java | 63 - .../jaxb/assertion/AssertionElement.java | 26 - .../jaxb/assertion/AssertionIDRefElement.java | 44 - .../saml2/jaxb/assertion/AssertionType.java | 225 -- .../assertion/AssertionURIRefElement.java | 44 - .../jaxb/assertion/AttributeElement.java | 26 - .../assertion/AttributeStatementElement.java | 26 - .../assertion/AttributeStatementType.java | 59 - .../saml2/jaxb/assertion/AttributeType.java | 114 - .../jaxb/assertion/AttributeValueElement.java | 40 - .../saml2/jaxb/assertion/AudienceElement.java | 44 - .../assertion/AudienceRestrictionElement.java | 26 - .../assertion/AudienceRestrictionType.java | 57 - .../AuthenticatingAuthorityElement.java | 44 - .../AuthnContextClassRefElement.java | 44 - .../assertion/AuthnContextDeclElement.java | 26 - .../assertion/AuthnContextDeclRefElement.java | 44 - .../jaxb/assertion/AuthnContextElement.java | 26 - .../jaxb/assertion/AuthnContextType.java | 130 - .../jaxb/assertion/AuthnStatementElement.java | 26 - .../jaxb/assertion/AuthnStatementType.java | 132 - .../AuthzDecisionStatementElement.java | 26 - .../assertion/AuthzDecisionStatementType.java | 117 - .../jaxb/assertion/BaseIDAbstractType.java | 66 - .../saml2/jaxb/assertion/BaseIDElement.java | 26 - .../jaxb/assertion/ConditionAbstractType.java | 29 - .../jaxb/assertion/ConditionElement.java | 26 - .../jaxb/assertion/ConditionsElement.java | 26 - .../saml2/jaxb/assertion/ConditionsType.java | 99 - .../assertion/EncryptedAssertionElement.java | 26 - .../assertion/EncryptedAttributeElement.java | 26 - .../jaxb/assertion/EncryptedElementType.java | 77 - .../jaxb/assertion/EncryptedIDElement.java | 26 - .../saml2/jaxb/assertion/EvidenceElement.java | 26 - .../saml2/jaxb/assertion/EvidenceType.java | 61 - .../saml2/jaxb/assertion/IssuerElement.java | 26 - .../KeyInfoConfirmationDataType.java | 34 - .../saml2/jaxb/assertion/NameIDElement.java | 26 - .../saml2/jaxb/assertion/NameIDType.java | 122 - .../saml2/jaxb/assertion/ObjectFactory.java | 933 ----- .../jaxb/assertion/OneTimeUseElement.java | 26 - .../saml2/jaxb/assertion/OneTimeUseType.java | 31 - .../assertion/ProxyRestrictionElement.java | 26 - .../jaxb/assertion/ProxyRestrictionType.java | 76 - .../jaxb/assertion/StatementAbstractType.java | 29 - .../jaxb/assertion/StatementElement.java | 26 - .../SubjectConfirmationDataElement.java | 26 - .../SubjectConfirmationDataType.java | 151 - .../assertion/SubjectConfirmationElement.java | 26 - .../assertion/SubjectConfirmationType.java | 136 - .../saml2/jaxb/assertion/SubjectElement.java | 26 - .../assertion/SubjectLocalityElement.java | 26 - .../jaxb/assertion/SubjectLocalityType.java | 67 - .../saml2/jaxb/assertion/SubjectType.java | 126 - .../assertion/impl/ActionElementImpl.java | 263 -- .../jaxb/assertion/impl/ActionTypeImpl.java | 291 -- .../assertion/impl/AdviceElementImpl.java | 275 -- .../jaxb/assertion/impl/AdviceTypeImpl.java | 314 -- .../assertion/impl/AssertionElementImpl.java | 318 -- .../impl/AssertionIDRefElementImpl.java | 253 -- .../assertion/impl/AssertionTypeImpl.java | 1180 ------ .../impl/AssertionURIRefElementImpl.java | 251 -- .../assertion/impl/AttributeElementImpl.java | 309 -- .../impl/AttributeStatementElementImpl.java | 252 -- .../impl/AttributeStatementTypeImpl.java | 246 -- .../assertion/impl/AttributeTypeImpl.java | 685 ---- .../impl/AttributeValueElementImpl.java | 327 -- .../assertion/impl/AudienceElementImpl.java | 251 -- .../impl/AudienceRestrictionElementImpl.java | 244 -- .../impl/AudienceRestrictionTypeImpl.java | 300 -- .../AuthenticatingAuthorityElementImpl.java | 251 -- .../impl/AuthnContextClassRefElementImpl.java | 251 -- .../impl/AuthnContextDeclElementImpl.java | 246 -- .../impl/AuthnContextDeclRefElementImpl.java | 251 -- .../impl/AuthnContextElementImpl.java | 263 -- .../assertion/impl/AuthnContextTypeImpl.java | 593 --- .../impl/AuthnStatementElementImpl.java | 284 -- .../impl/AuthnStatementTypeImpl.java | 678 ---- .../AuthzDecisionStatementElementImpl.java | 290 -- .../impl/AuthzDecisionStatementTypeImpl.java | 588 --- .../impl/BaseIDAbstractTypeImpl.java | 355 -- .../assertion/impl/BaseIDElementImpl.java | 296 -- .../impl/ConditionAbstractTypeImpl.java | 163 - .../assertion/impl/ConditionElementImpl.java | 233 -- .../assertion/impl/ConditionsElementImpl.java | 327 -- .../assertion/impl/ConditionsTypeImpl.java | 448 --- .../impl/EncryptedAssertionElementImpl.java | 248 -- .../impl/EncryptedAttributeElementImpl.java | 248 -- .../impl/EncryptedElementTypeImpl.java | 648 ---- .../impl/EncryptedIDElementImpl.java | 248 -- .../assertion/impl/EvidenceElementImpl.java | 252 -- .../jaxb/assertion/impl/EvidenceTypeImpl.java | 247 -- .../assertion/impl/IssuerElementImpl.java | 352 -- .../jaxb/assertion/impl/JAXBVersion.java | 15 - .../impl/KeyInfoConfirmationDataTypeImpl.java | 371 -- .../assertion/impl/NameIDElementImpl.java | 352 -- .../jaxb/assertion/impl/NameIDTypeImpl.java | 559 --- .../assertion/impl/OneTimeUseElementImpl.java | 233 -- .../assertion/impl/OneTimeUseTypeImpl.java | 183 - .../impl/ProxyRestrictionElementImpl.java | 292 -- .../impl/ProxyRestrictionTypeImpl.java | 418 -- .../impl/StatementAbstractTypeImpl.java | 163 - .../assertion/impl/StatementElementImpl.java | 233 -- .../SubjectConfirmationDataElementImpl.java | 402 -- .../impl/SubjectConfirmationDataTypeImpl.java | 723 ---- .../impl/SubjectConfirmationElementImpl.java | 292 -- .../impl/SubjectConfirmationTypeImpl.java | 890 ----- .../assertion/impl/SubjectElementImpl.java | 289 -- .../impl/SubjectLocalityElementImpl.java | 296 -- .../impl/SubjectLocalityTypeImpl.java | 355 -- .../jaxb/assertion/impl/SubjectTypeImpl.java | 806 ---- ...AbstractUnmarshallingEventHandlerImpl.java | 351 -- .../impl/runtime/ContentHandlerAdaptor.java | 123 - .../impl/runtime/DefaultJAXBContextImpl.java | 172 - .../assertion/impl/runtime/Discarder.java | 57 - .../impl/runtime/ErrorHandlerAdaptor.java | 83 - .../assertion/impl/runtime/GrammarInfo.java | 90 - .../impl/runtime/GrammarInfoFacade.java | 289 -- .../impl/runtime/GrammarInfoImpl.java | 183 - .../impl/runtime/IdentityHashSet.java | 103 - .../impl/runtime/InterleaveDispatcher.java | 426 --- .../runtime/InterningUnmarshallerHandler.java | 42 - .../assertion/impl/runtime/MSVValidator.java | 460 --- .../impl/runtime/MarshallerImpl.java | 292 -- .../impl/runtime/NamespaceContext2.java | 59 - .../impl/runtime/NamespaceContextImpl.java | 290 -- .../impl/runtime/PrefixCallback.java | 13 - .../assertion/impl/runtime/SAXMarshaller.java | 464 --- .../impl/runtime/SAXUnmarshallerHandler.java | 39 - .../runtime/SAXUnmarshallerHandlerImpl.java | 626 --- .../impl/runtime/UnmarshallableObject.java | 23 - .../impl/runtime/UnmarshallerImpl.java | 186 - .../impl/runtime/UnmarshallingContext.java | 224 -- .../runtime/UnmarshallingEventHandler.java | 43 - .../UnmarshallingEventHandlerAdaptor.java | 128 - .../jaxb/assertion/impl/runtime/Util.java | 73 - .../impl/runtime/ValidatableObject.java | 28 - .../impl/runtime/ValidatingUnmarshaller.java | 110 - .../impl/runtime/ValidationContext.java | 205 - .../assertion/impl/runtime/ValidatorImpl.java | 179 - .../impl/runtime/XMLSerializable.java | 37 - .../assertion/impl/runtime/XMLSerializer.java | 233 -- .../saml2/jaxb/assertion/package.html | 1 - .../AffiliationConfigElement.java | 26 - .../AttributeAuthorityConfigElement.java | 26 - .../jaxb/entityconfig/AttributeElement.java | 26 - .../AttributeQueryConfigElement.java | 26 - .../jaxb/entityconfig/AttributeType.java | 74 - .../AuthnAuthorityConfigElement.java | 26 - .../jaxb/entityconfig/BaseConfigType.java | 75 - .../entityconfig/EntityConfigElement.java | 26 - .../jaxb/entityconfig/EntityConfigType.java | 191 - .../entityconfig/IDPSSOConfigElement.java | 26 - .../jaxb/entityconfig/ObjectFactory.java | 319 -- .../jaxb/entityconfig/PDPConfigElement.java | 26 - .../jaxb/entityconfig/SPSSOConfigElement.java | 26 - .../saml2/jaxb/entityconfig/ValueElement.java | 44 - .../XACMLAuthzDecisionQueryConfigElement.java | 26 - .../entityconfig/XACMLPDPConfigElement.java | 26 - .../impl/AffiliationConfigElementImpl.java | 286 -- .../AttributeAuthorityConfigElementImpl.java | 286 -- .../impl/AttributeElementImpl.java | 265 -- .../impl/AttributeQueryConfigElementImpl.java | 286 -- .../entityconfig/impl/AttributeTypeImpl.java | 374 -- .../impl/AuthnAuthorityConfigElementImpl.java | 286 -- .../entityconfig/impl/BaseConfigTypeImpl.java | 413 -- .../impl/EntityConfigElementImpl.java | 343 -- .../impl/EntityConfigTypeImpl.java | 934 ----- .../impl/IDPSSOConfigElementImpl.java | 286 -- .../jaxb/entityconfig/impl/JAXBVersion.java | 15 - .../impl/PDPConfigElementImpl.java | 286 -- .../impl/SPSSOConfigElementImpl.java | 286 -- .../entityconfig/impl/ValueElementImpl.java | 252 -- ...MLAuthzDecisionQueryConfigElementImpl.java | 286 -- .../impl/XACMLPDPConfigElementImpl.java | 286 -- .../saml2/jaxb/entityconfig/package.html | 1 - .../AdditionalMetadataLocationElement.java | 26 - .../AdditionalMetadataLocationType.java | 66 - .../jaxb/metadata/AffiliateMemberElement.java | 44 - .../AffiliationDescriptorElement.java | 26 - .../metadata/AffiliationDescriptorType.java | 198 - .../ArtifactResolutionServiceElement.java | 26 - .../AssertionConsumerServiceElement.java | 26 - .../AssertionIDRequestServiceElement.java | 26 - .../AttributeAuthorityDescriptorElement.java | 26 - .../AttributeAuthorityDescriptorType.java | 156 - .../AttributeConsumingServiceElement.java | 26 - .../AttributeConsumingServiceType.java | 132 - .../metadata/AttributeProfileElement.java | 44 - .../metadata/AttributeServiceElement.java | 26 - .../jaxb/metadata/AttributeServiceType.java | 57 - .../AuthnAuthorityDescriptorElement.java | 26 - .../AuthnAuthorityDescriptorType.java | 107 - .../metadata/AuthnQueryServiceElement.java | 26 - .../jaxb/metadata/AuthzServiceElement.java | 26 - .../saml2/jaxb/metadata/CompanyElement.java | 44 - .../jaxb/metadata/ContactPersonElement.java | 26 - .../saml2/jaxb/metadata/ContactType.java | 176 - .../jaxb/metadata/EmailAddressElement.java | 44 - .../metadata/EncryptionMethodElement.java | 26 - .../saml2/jaxb/metadata/EndpointType.java | 112 - .../metadata/EntitiesDescriptorElement.java | 26 - .../jaxb/metadata/EntitiesDescriptorType.java | 177 - .../metadata/EntityDescriptorElement.java | 26 - .../jaxb/metadata/EntityDescriptorType.java | 287 -- .../jaxb/metadata/ExtensionsElement.java | 26 - .../saml2/jaxb/metadata/ExtensionsType.java | 55 - .../saml2/jaxb/metadata/GivenNameElement.java | 44 - .../metadata/IDPSSODescriptorElement.java | 26 - .../jaxb/metadata/IDPSSODescriptorType.java | 170 - .../jaxb/metadata/IndexedEndpointType.java | 57 - .../jaxb/metadata/KeyDescriptorElement.java | 26 - .../jaxb/metadata/KeyDescriptorType.java | 96 - .../jaxb/metadata/LocalizedNameType.java | 66 - .../saml2/jaxb/metadata/LocalizedURIType.java | 66 - .../metadata/ManageNameIDServiceElement.java | 26 - .../jaxb/metadata/NameIDFormatElement.java | 44 - .../metadata/NameIDMappingServiceElement.java | 26 - .../saml2/jaxb/metadata/ObjectFactory.java | 1137 ------ .../OrganizationDisplayNameElement.java | 26 - .../jaxb/metadata/OrganizationElement.java | 26 - .../metadata/OrganizationNameElement.java | 26 - .../saml2/jaxb/metadata/OrganizationType.java | 127 - .../jaxb/metadata/OrganizationURLElement.java | 26 - .../jaxb/metadata/PDPDescriptorElement.java | 26 - .../jaxb/metadata/PDPDescriptorType.java | 107 - .../jaxb/metadata/QueryDescriptorElement.java | 26 - .../jaxb/metadata/QueryDescriptorType.java | 70 - .../metadata/RequestedAttributeElement.java | 26 - .../jaxb/metadata/RequestedAttributeType.java | 44 - .../jaxb/metadata/RoleDescriptorElement.java | 26 - .../jaxb/metadata/RoleDescriptorType.java | 244 -- .../jaxb/metadata/SPSSODescriptorElement.java | 26 - .../jaxb/metadata/SPSSODescriptorType.java | 109 - .../jaxb/metadata/SSODescriptorType.java | 132 - .../metadata/ServiceDescriptionElement.java | 26 - .../jaxb/metadata/ServiceNameElement.java | 26 - .../metadata/SingleLogoutServiceElement.java | 26 - .../metadata/SingleSignOnServiceElement.java | 26 - .../saml2/jaxb/metadata/SurNameElement.java | 44 - .../jaxb/metadata/TelephoneNumberElement.java | 44 - ...MLAuthzDecisionQueryDescriptorElement.java | 26 - ...XACMLAuthzDecisionQueryDescriptorType.java | 31 - .../metadata/XACMLAuthzServiceElement.java | 26 - .../metadata/XACMLPDPDescriptorElement.java | 26 - .../jaxb/metadata/XACMLPDPDescriptorType.java | 58 - ...AdditionalMetadataLocationElementImpl.java | 260 -- .../AdditionalMetadataLocationTypeImpl.java | 288 -- .../impl/AffiliateMemberElementImpl.java | 258 -- .../AffiliationDescriptorElementImpl.java | 335 -- .../impl/AffiliationDescriptorTypeImpl.java | 972 ----- .../ArtifactResolutionServiceElementImpl.java | 305 -- .../AssertionConsumerServiceElementImpl.java | 305 -- .../AssertionIDRequestServiceElementImpl.java | 272 -- ...tributeAuthorityDescriptorElementImpl.java | 427 --- .../AttributeAuthorityDescriptorTypeImpl.java | 1047 ----- .../AttributeConsumingServiceElementImpl.java | 314 -- .../AttributeConsumingServiceTypeImpl.java | 827 ---- .../impl/AttributeProfileElementImpl.java | 251 -- .../impl/AttributeServiceElementImpl.java | 333 -- .../impl/AttributeServiceTypeImpl.java | 429 --- .../AuthnAuthorityDescriptorElementImpl.java | 416 -- .../AuthnAuthorityDescriptorTypeImpl.java | 726 ---- .../impl/AuthnQueryServiceElementImpl.java | 272 -- .../impl/AuthzServiceElementImpl.java | 272 -- .../metadata/impl/CompanyElementImpl.java | 253 -- .../impl/ContactPersonElementImpl.java | 295 -- .../jaxb/metadata/impl/ContactTypeImpl.java | 756 ---- .../impl/EmailAddressElementImpl.java | 251 -- .../impl/EncryptionMethodElementImpl.java | 277 -- .../jaxb/metadata/impl/EndpointTypeImpl.java | 496 --- .../impl/EntitiesDescriptorElementImpl.java | 404 -- .../impl/EntitiesDescriptorTypeImpl.java | 793 ---- .../impl/EntityDescriptorElementImpl.java | 408 -- .../impl/EntityDescriptorTypeImpl.java | 1360 ------- .../metadata/impl/ExtensionsElementImpl.java | 235 -- .../metadata/impl/ExtensionsTypeImpl.java | 220 -- .../metadata/impl/GivenNameElementImpl.java | 253 -- .../impl/IDPSSODescriptorElementImpl.java | 484 --- .../impl/IDPSSODescriptorTypeImpl.java | 1132 ------ .../impl/IndexedEndpointTypeImpl.java | 453 --- .../saml2/jaxb/metadata/impl/JAXBVersion.java | 15 - .../impl/KeyDescriptorElementImpl.java | 296 -- .../metadata/impl/KeyDescriptorTypeImpl.java | 547 --- .../metadata/impl/LocalizedNameTypeImpl.java | 293 -- .../metadata/impl/LocalizedURITypeImpl.java | 293 -- .../impl/ManageNameIDServiceElementImpl.java | 272 -- .../impl/NameIDFormatElementImpl.java | 251 -- .../impl/NameIDMappingServiceElementImpl.java | 272 -- .../OrganizationDisplayNameElementImpl.java | 265 -- .../impl/OrganizationElementImpl.java | 268 -- .../impl/OrganizationNameElementImpl.java | 265 -- .../metadata/impl/OrganizationTypeImpl.java | 623 --- .../impl/OrganizationURLElementImpl.java | 264 -- .../impl/PDPDescriptorElementImpl.java | 415 -- .../metadata/impl/PDPDescriptorTypeImpl.java | 726 ---- .../impl/QueryDescriptorElementImpl.java | 433 --- .../impl/QueryDescriptorTypeImpl.java | 566 --- .../impl/RequestedAttributeElementImpl.java | 339 -- .../impl/RequestedAttributeTypeImpl.java | 371 -- .../impl/RoleDescriptorElementImpl.java | 399 -- .../metadata/impl/RoleDescriptorTypeImpl.java | 1198 ------ .../impl/SPSSODescriptorElementImpl.java | 498 --- .../impl/SPSSODescriptorTypeImpl.java | 827 ---- .../metadata/impl/SSODescriptorTypeImpl.java | 872 ----- .../impl/ServiceDescriptionElementImpl.java | 265 -- .../metadata/impl/ServiceNameElementImpl.java | 264 -- .../impl/SingleLogoutServiceElementImpl.java | 272 -- .../impl/SingleSignOnServiceElementImpl.java | 272 -- .../metadata/impl/SurNameElementImpl.java | 253 -- .../impl/TelephoneNumberElementImpl.java | 253 -- ...thzDecisionQueryDescriptorElementImpl.java | 433 --- ...LAuthzDecisionQueryDescriptorTypeImpl.java | 405 -- .../impl/XACMLAuthzServiceElementImpl.java | 272 -- .../impl/XACMLPDPDescriptorElementImpl.java | 406 -- .../impl/XACMLPDPDescriptorTypeImpl.java | 491 --- .../identity/saml2/jaxb/metadata/package.html | 1 - .../metadataattr/EntityAttributesElement.java | 26 - .../metadataattr/EntityAttributesType.java | 57 - .../jaxb/metadataattr/ObjectFactory.java | 127 - .../impl/EntityAttributesElementImpl.java | 239 -- .../impl/EntityAttributesTypeImpl.java | 226 -- .../jaxb/metadataattr/impl/JAXBVersion.java | 15 - .../saml2/jaxb/metadataattr/package.html | 1 - .../saml2/jaxb/metadataattrext/package.html | 1 - .../ActionNamespaceElement.java | 44 - .../AttributeQueryDescriptorElement.java | 26 - .../AttributeQueryDescriptorType.java | 58 - .../AuthnQueryDescriptorType.java | 31 - .../AuthzDecisionQueryDescriptorType.java | 57 - .../jaxb/metadataextquery/ObjectFactory.java | 192 - .../metadataextquery/QueryDescriptorType.java | 70 - .../impl/ActionNamespaceElementImpl.java | 251 -- .../AttributeQueryDescriptorElementImpl.java | 442 --- .../AttributeQueryDescriptorTypeImpl.java | 538 --- .../impl/AuthnQueryDescriptorTypeImpl.java | 405 -- .../AuthzDecisionQueryDescriptorTypeImpl.java | 510 --- .../metadataextquery/impl/JAXBVersion.java | 15 - .../impl/QueryDescriptorTypeImpl.java | 566 --- .../saml2/jaxb/metadataextquery/package.html | 1 - .../DiscoveryResponseElement.java | 26 - .../metadataidpdiscovery/ObjectFactory.java | 114 - .../impl/DiscoveryResponseElementImpl.java | 306 -- .../impl/JAXBVersion.java | 15 - .../jaxb/metadataidpdiscovery/package.html | 1 - .../saml2/jaxb/metadatax509query/package.html | 1 - .../identity/saml2/jaxb/schema/AnyType.java | 56 - .../saml2/jaxb/schema/ObjectFactory.java | 113 - .../saml2/jaxb/schema/impl/AnyTypeImpl.java | 268 -- .../saml2/jaxb/schema/impl/JAXBVersion.java | 15 - .../jaxb/xmlenc/AgreementMethodElement.java | 26 - .../jaxb/xmlenc/AgreementMethodType.java | 150 - .../saml2/jaxb/xmlenc/CipherDataElement.java | 26 - .../saml2/jaxb/xmlenc/CipherDataType.java | 71 - .../jaxb/xmlenc/CipherReferenceElement.java | 26 - .../jaxb/xmlenc/CipherReferenceType.java | 69 - .../jaxb/xmlenc/EncryptedDataElement.java | 26 - .../saml2/jaxb/xmlenc/EncryptedDataType.java | 31 - .../jaxb/xmlenc/EncryptedKeyElement.java | 26 - .../saml2/jaxb/xmlenc/EncryptedKeyType.java | 92 - .../saml2/jaxb/xmlenc/EncryptedType.java | 189 - .../jaxb/xmlenc/EncryptionMethodType.java | 149 - .../xmlenc/EncryptionPropertiesElement.java | 26 - .../jaxb/xmlenc/EncryptionPropertiesType.java | 75 - .../xmlenc/EncryptionPropertyElement.java | 26 - .../jaxb/xmlenc/EncryptionPropertyType.java | 94 - .../saml2/jaxb/xmlenc/ObjectFactory.java | 495 --- .../jaxb/xmlenc/ReferenceListElement.java | 37 - .../saml2/jaxb/xmlenc/ReferenceListType.java | 91 - .../saml2/jaxb/xmlenc/ReferenceType.java | 74 - .../saml2/jaxb/xmlenc/TransformsType.java | 56 - .../impl/AgreementMethodElementImpl.java | 280 -- .../xmlenc/impl/AgreementMethodTypeImpl.java | 1451 ------- .../xmlenc/impl/CipherDataElementImpl.java | 249 -- .../jaxb/xmlenc/impl/CipherDataTypeImpl.java | 341 -- .../impl/CipherReferenceElementImpl.java | 268 -- .../xmlenc/impl/CipherReferenceTypeImpl.java | 331 -- .../xmlenc/impl/EncryptedDataElementImpl.java | 403 -- .../xmlenc/impl/EncryptedDataTypeImpl.java | 376 -- .../xmlenc/impl/EncryptedKeyElementImpl.java | 441 --- .../xmlenc/impl/EncryptedKeyTypeImpl.java | 605 --- .../jaxb/xmlenc/impl/EncryptedTypeImpl.java | 961 ----- .../xmlenc/impl/EncryptionMethodTypeImpl.java | 1041 ----- .../impl/EncryptionPropertiesElementImpl.java | 282 -- .../impl/EncryptionPropertiesTypeImpl.java | 441 --- .../impl/EncryptionPropertyElementImpl.java | 313 -- .../impl/EncryptionPropertyTypeImpl.java | 467 --- .../saml2/jaxb/xmlenc/impl/JAXBVersion.java | 15 - .../xmlenc/impl/ReferenceListElementImpl.java | 239 -- .../xmlenc/impl/ReferenceListTypeImpl.java | 748 ---- .../jaxb/xmlenc/impl/ReferenceTypeImpl.java | 331 -- .../jaxb/xmlenc/impl/TransformsTypeImpl.java | 310 -- .../identity/saml2/jaxb/xmlenc/package.html | 1 - .../xmlsig/CanonicalizationMethodElement.java | 26 - .../xmlsig/CanonicalizationMethodType.java | 75 - .../saml2/jaxb/xmlsig/DSAKeyValueElement.java | 26 - .../saml2/jaxb/xmlsig/DSAKeyValueType.java | 168 - .../jaxb/xmlsig/DigestMethodElement.java | 26 - .../saml2/jaxb/xmlsig/DigestMethodType.java | 75 - .../saml2/jaxb/xmlsig/DigestValueElement.java | 44 - .../saml2/jaxb/xmlsig/KeyInfoElement.java | 26 - .../saml2/jaxb/xmlsig/KeyInfoType.java | 89 - .../saml2/jaxb/xmlsig/KeyNameElement.java | 44 - .../saml2/jaxb/xmlsig/KeyValueElement.java | 26 - .../saml2/jaxb/xmlsig/KeyValueType.java | 60 - .../saml2/jaxb/xmlsig/ManifestElement.java | 26 - .../saml2/jaxb/xmlsig/ManifestType.java | 75 - .../saml2/jaxb/xmlsig/MgmtDataElement.java | 44 - .../saml2/jaxb/xmlsig/ObjectElement.java | 26 - .../saml2/jaxb/xmlsig/ObjectFactory.java | 946 ----- .../saml2/jaxb/xmlsig/ObjectType.java | 113 - .../saml2/jaxb/xmlsig/PGPDataElement.java | 26 - .../saml2/jaxb/xmlsig/PGPDataType.java | 100 - .../saml2/jaxb/xmlsig/RSAKeyValueElement.java | 26 - .../saml2/jaxb/xmlsig/RSAKeyValueType.java | 69 - .../saml2/jaxb/xmlsig/ReferenceElement.java | 26 - .../saml2/jaxb/xmlsig/ReferenceType.java | 149 - .../jaxb/xmlsig/RetrievalMethodElement.java | 26 - .../jaxb/xmlsig/RetrievalMethodType.java | 90 - .../saml2/jaxb/xmlsig/SPKIDataElement.java | 26 - .../saml2/jaxb/xmlsig/SPKIDataType.java | 92 - .../saml2/jaxb/xmlsig/SignatureElement.java | 26 - .../jaxb/xmlsig/SignatureMethodElement.java | 26 - .../jaxb/xmlsig/SignatureMethodType.java | 112 - .../xmlsig/SignaturePropertiesElement.java | 26 - .../jaxb/xmlsig/SignaturePropertiesType.java | 75 - .../jaxb/xmlsig/SignaturePropertyElement.java | 26 - .../jaxb/xmlsig/SignaturePropertyType.java | 94 - .../saml2/jaxb/xmlsig/SignatureType.java | 138 - .../jaxb/xmlsig/SignatureValueElement.java | 26 - .../saml2/jaxb/xmlsig/SignatureValueType.java | 66 - .../saml2/jaxb/xmlsig/SignedInfoElement.java | 26 - .../saml2/jaxb/xmlsig/SignedInfoType.java | 117 - .../saml2/jaxb/xmlsig/TransformElement.java | 26 - .../saml2/jaxb/xmlsig/TransformType.java | 112 - .../saml2/jaxb/xmlsig/TransformsElement.java | 26 - .../saml2/jaxb/xmlsig/TransformsType.java | 56 - .../saml2/jaxb/xmlsig/X509DataElement.java | 26 - .../saml2/jaxb/xmlsig/X509DataType.java | 224 -- .../jaxb/xmlsig/X509IssuerSerialType.java | 69 - .../CanonicalizationMethodElementImpl.java | 268 -- .../impl/CanonicalizationMethodTypeImpl.java | 362 -- .../xmlsig/impl/DSAKeyValueElementImpl.java | 252 -- .../jaxb/xmlsig/impl/DSAKeyValueTypeImpl.java | 588 --- .../xmlsig/impl/DigestMethodElementImpl.java | 271 -- .../xmlsig/impl/DigestMethodTypeImpl.java | 366 -- .../xmlsig/impl/DigestValueElementImpl.java | 256 -- .../saml2/jaxb/xmlsig/impl/JAXBVersion.java | 15 - .../jaxb/xmlsig/impl/KeyInfoElementImpl.java | 327 -- .../jaxb/xmlsig/impl/KeyInfoTypeImpl.java | 436 --- .../jaxb/xmlsig/impl/KeyNameElementImpl.java | 253 -- .../jaxb/xmlsig/impl/KeyValueElementImpl.java | 261 -- .../jaxb/xmlsig/impl/KeyValueTypeImpl.java | 297 -- .../jaxb/xmlsig/impl/ManifestElementImpl.java | 281 -- .../jaxb/xmlsig/impl/ManifestTypeImpl.java | 476 --- .../jaxb/xmlsig/impl/MgmtDataElementImpl.java | 253 -- .../jaxb/xmlsig/impl/ObjectElementImpl.java | 342 -- .../jaxb/xmlsig/impl/ObjectTypeImpl.java | 552 --- .../jaxb/xmlsig/impl/PGPDataElementImpl.java | 250 -- .../jaxb/xmlsig/impl/PGPDataTypeImpl.java | 458 --- .../xmlsig/impl/RSAKeyValueElementImpl.java | 235 -- .../jaxb/xmlsig/impl/RSAKeyValueTypeImpl.java | 288 -- .../xmlsig/impl/ReferenceElementImpl.java | 364 -- .../jaxb/xmlsig/impl/ReferenceTypeImpl.java | 681 ---- .../impl/RetrievalMethodElementImpl.java | 313 -- .../xmlsig/impl/RetrievalMethodTypeImpl.java | 445 --- .../jaxb/xmlsig/impl/SPKIDataElementImpl.java | 238 -- .../jaxb/xmlsig/impl/SPKIDataTypeImpl.java | 562 --- .../xmlsig/impl/SignatureElementImpl.java | 301 -- .../impl/SignatureMethodElementImpl.java | 274 -- .../xmlsig/impl/SignatureMethodTypeImpl.java | 772 ---- .../impl/SignaturePropertiesElementImpl.java | 282 -- .../impl/SignaturePropertiesTypeImpl.java | 432 --- .../impl/SignaturePropertyElementImpl.java | 304 -- .../impl/SignaturePropertyTypeImpl.java | 460 --- .../jaxb/xmlsig/impl/SignatureTypeImpl.java | 812 ---- .../impl/SignatureValueElementImpl.java | 267 -- .../xmlsig/impl/SignatureValueTypeImpl.java | 306 -- .../xmlsig/impl/SignedInfoElementImpl.java | 295 -- .../jaxb/xmlsig/impl/SignedInfoTypeImpl.java | 653 ---- .../xmlsig/impl/TransformElementImpl.java | 273 -- .../jaxb/xmlsig/impl/TransformTypeImpl.java | 628 --- .../xmlsig/impl/TransformsElementImpl.java | 240 -- .../jaxb/xmlsig/impl/TransformsTypeImpl.java | 310 -- .../jaxb/xmlsig/impl/X509DataElementImpl.java | 268 -- .../jaxb/xmlsig/impl/X509DataTypeImpl.java | 1517 -------- .../xmlsig/impl/X509IssuerSerialTypeImpl.java | 296 -- .../identity/saml2/jaxb/xmlsig/package.html | 1 - .../main/java/com/sun/xml/bind/Messages.java | 82 - .../sun/xml/bind/unmarshaller/Messages.java | 76 - .../saml2/jaxb/assertion/jaxb.properties | 3 +- .../saml2/jaxb/entityconfig/jaxb.properties | 3 +- .../saml2/jaxb/metadata/jaxb.properties | 3 +- .../saml2/jaxb/metadataattr/jaxb.properties | 3 +- .../jaxb/metadataextquery/jaxb.properties | 3 +- .../jaxb/metadataidpdiscovery/jaxb.properties | 3 +- .../saml2/jaxb/schema/jaxb.properties | 3 +- .../saml2/jaxb/xmlenc/jaxb.properties | 3 +- .../saml2/jaxb/xmlsig/jaxb.properties | 3 +- .../src/main/xjb/saml2.xjb | 136 +- .../src/main/xsd/entity-config-schema.xsd | 4 +- .../src/main/xsd/schema.xsd | 4 +- .../openam-wsfederation-schema/pom.xml | 19 +- .../jaxb/entityconfig/AttributeElement.java | 26 - .../jaxb/entityconfig/AttributeType.java | 76 - .../jaxb/entityconfig/BaseConfigType.java | 75 - .../entityconfig/FederationConfigElement.java | 26 - .../entityconfig/FederationConfigType.java | 158 - .../entityconfig/IDPSSOConfigElement.java | 26 - .../jaxb/entityconfig/ObjectFactory.java | 221 -- .../jaxb/entityconfig/SPSSOConfigElement.java | 26 - .../jaxb/entityconfig/ValueElement.java | 44 - .../impl/AttributeElementImpl.java | 265 -- .../entityconfig/impl/AttributeTypeImpl.java | 374 -- .../entityconfig/impl/BaseConfigTypeImpl.java | 413 -- .../impl/FederationConfigElementImpl.java | 373 -- .../impl/FederationConfigTypeImpl.java | 764 ---- .../impl/IDPSSOConfigElementImpl.java | 286 -- .../jaxb/entityconfig/impl/JAXBVersion.java | 15 - .../impl/SPSSOConfigElementImpl.java | 286 -- .../entityconfig/impl/ValueElementImpl.java | 253 -- ...AbstractUnmarshallingEventHandlerImpl.java | 351 -- .../impl/runtime/ContentHandlerAdaptor.java | 123 - .../impl/runtime/DefaultJAXBContextImpl.java | 172 - .../entityconfig/impl/runtime/Discarder.java | 57 - .../impl/runtime/ErrorHandlerAdaptor.java | 83 - .../impl/runtime/GrammarInfo.java | 90 - .../impl/runtime/GrammarInfoFacade.java | 289 -- .../impl/runtime/GrammarInfoImpl.java | 183 - .../impl/runtime/IdentityHashSet.java | 103 - .../impl/runtime/InterleaveDispatcher.java | 426 --- .../runtime/InterningUnmarshallerHandler.java | 42 - .../impl/runtime/MSVValidator.java | 460 --- .../impl/runtime/MarshallerImpl.java | 292 -- .../impl/runtime/NamespaceContext2.java | 59 - .../impl/runtime/NamespaceContextImpl.java | 290 -- .../impl/runtime/PrefixCallback.java | 13 - .../impl/runtime/SAXMarshaller.java | 464 --- .../impl/runtime/SAXUnmarshallerHandler.java | 39 - .../runtime/SAXUnmarshallerHandlerImpl.java | 626 --- .../impl/runtime/UnmarshallableObject.java | 23 - .../impl/runtime/UnmarshallerImpl.java | 186 - .../impl/runtime/UnmarshallingContext.java | 224 -- .../runtime/UnmarshallingEventHandler.java | 43 - .../UnmarshallingEventHandlerAdaptor.java | 128 - .../jaxb/entityconfig/impl/runtime/Util.java | 73 - .../impl/runtime/ValidatableObject.java | 28 - .../impl/runtime/ValidatingUnmarshaller.java | 110 - .../impl/runtime/ValidationContext.java | 205 - .../impl/runtime/ValidatorImpl.java | 179 - .../impl/runtime/XMLSerializable.java | 37 - .../impl/runtime/XMLSerializer.java | 233 -- .../jaxb/entityconfig/package.html | 1 - .../jaxb/wsaddr/ActionElement.java | 26 - .../jaxb/wsaddr/AttributedQNameType.java | 47 - .../jaxb/wsaddr/AttributedURIType.java | 47 - .../wsaddr/AttributedUnsignedLongType.java | 47 - .../jaxb/wsaddr/EndpointReferenceElement.java | 26 - .../jaxb/wsaddr/EndpointReferenceType.java | 116 - .../jaxb/wsaddr/FaultToElement.java | 26 - .../wsfederation/jaxb/wsaddr/FromElement.java | 26 - .../jaxb/wsaddr/MessageIDElement.java | 26 - .../jaxb/wsaddr/MetadataElement.java | 26 - .../jaxb/wsaddr/MetadataType.java | 55 - .../jaxb/wsaddr/ObjectFactory.java | 400 -- .../jaxb/wsaddr/ProblemActionElement.java | 26 - .../jaxb/wsaddr/ProblemActionType.java | 71 - .../wsaddr/ProblemHeaderQNameElement.java | 26 - .../jaxb/wsaddr/ProblemIRIElement.java | 26 - .../wsaddr/ReferenceParametersElement.java | 26 - .../jaxb/wsaddr/ReferenceParametersType.java | 55 - .../jaxb/wsaddr/RelatesToElement.java | 26 - .../jaxb/wsaddr/RelatesToType.java | 68 - .../jaxb/wsaddr/ReplyToElement.java | 26 - .../jaxb/wsaddr/RetryAfterElement.java | 26 - .../wsfederation/jaxb/wsaddr/ToElement.java | 26 - .../jaxb/wsaddr/impl/ActionElementImpl.java | 224 -- .../wsaddr/impl/AttributedQNameTypeImpl.java | 208 - .../wsaddr/impl/AttributedURITypeImpl.java | 203 - .../impl/AttributedUnsignedLongTypeImpl.java | 223 -- .../impl/EndpointReferenceElementImpl.java | 254 -- .../impl/EndpointReferenceTypeImpl.java | 468 --- .../jaxb/wsaddr/impl/FaultToElementImpl.java | 253 -- .../jaxb/wsaddr/impl/FromElementImpl.java | 253 -- .../jaxb/wsaddr/impl/JAXBVersion.java | 15 - .../wsaddr/impl/MessageIDElementImpl.java | 224 -- .../jaxb/wsaddr/impl/MetadataElementImpl.java | 245 -- .../jaxb/wsaddr/impl/MetadataTypeImpl.java | 233 -- .../wsaddr/impl/ProblemActionElementImpl.java | 261 -- .../wsaddr/impl/ProblemActionTypeImpl.java | 329 -- .../impl/ProblemHeaderQNameElementImpl.java | 223 -- .../wsaddr/impl/ProblemIRIElementImpl.java | 224 -- .../impl/ReferenceParametersElementImpl.java | 245 -- .../impl/ReferenceParametersTypeImpl.java | 233 -- .../wsaddr/impl/RelatesToElementImpl.java | 274 -- .../jaxb/wsaddr/impl/RelatesToTypeImpl.java | 342 -- .../jaxb/wsaddr/impl/ReplyToElementImpl.java | 253 -- .../wsaddr/impl/RetryAfterElementImpl.java | 244 -- .../jaxb/wsaddr/impl/ToElementImpl.java | 224 -- .../wsfederation/jaxb/wsaddr/package.html | 1 - .../AdditionalContextProcessedElement.java | 26 - .../jaxb/wsfederation/AssertionType.java | 55 - .../AttributeExtensibleString.java | 47 - .../wsfederation/AttributeExtensibleURI.java | 47 - .../AttributeServiceEndpointElement.java | 26 - .../AuthenticationTokenElement.java | 26 - .../AutomaticPseudonymsElement.java | 38 - .../jaxb/wsfederation/ClaimType.java | 112 - .../wsfederation/ClientPseudonymElement.java | 26 - .../wsfederation/ClientPseudonymType.java | 112 - .../jaxb/wsfederation/DescriptionType.java | 47 - .../jaxb/wsfederation/DisplayNameType.java | 47 - .../jaxb/wsfederation/FederationElement.java | 26 - .../wsfederation/FederationIDElement.java | 26 - .../FederationMetadataElement.java | 26 - .../FederationMetadataHandlerElement.java | 26 - .../FederationMetadataHandlerType.java | 29 - .../wsfederation/FederationMetadataType.java | 55 - .../jaxb/wsfederation/FederationType.java | 74 - .../wsfederation/FilterPseudonymsElement.java | 26 - .../wsfederation/FilterPseudonymsType.java | 97 - .../jaxb/wsfederation/Freshness.java | 54 - .../jaxb/wsfederation/FreshnessElement.java | 26 - .../jaxb/wsfederation/IssuerNameType.java | 48 - .../IssuerNamesOfferedElement.java | 26 - .../wsfederation/IssuerNamesOfferedType.java | 55 - .../IssuesSpecificPolicyFaultElement.java | 26 - .../jaxb/wsfederation/ObjectFactory.java | 1047 ----- .../jaxb/wsfederation/ProofTokenElement.java | 26 - .../jaxb/wsfederation/ProofTokenType.java | 50 - .../wsfederation/PseudonymBasisElement.java | 26 - .../jaxb/wsfederation/PseudonymBasisType.java | 50 - .../jaxb/wsfederation/PseudonymElement.java | 26 - .../jaxb/wsfederation/PseudonymType.java | 97 - .../PsuedonymServiceEndpointElement.java | 26 - .../jaxb/wsfederation/RealmElement.java | 44 - .../wsfederation/ReferenceDigestType.java | 47 - .../wsfederation/ReferenceToken11Element.java | 26 - .../wsfederation/ReferenceTokenElement.java | 26 - .../jaxb/wsfederation/ReferenceTokenType.java | 136 - .../jaxb/wsfederation/RelativeToElement.java | 26 - .../jaxb/wsfederation/RelativeToType.java | 55 - .../RequestProofTokenElement.java | 26 - .../wsfederation/RequestProofTokenType.java | 55 - .../wsfederation/RequestPseudonymElement.java | 26 - .../wsfederation/RequestPseudonymType.java | 81 - .../RequireBearerTokensElement.java | 26 - .../RequireReferenceTokenElement.java | 26 - .../RequireSharedCookiesElement.java | 26 - .../RequireSignedTokensElement.java | 26 - .../RequiresGenericClaimDialectElement.java | 26 - .../wsfederation/SecurityTokenElement.java | 26 - .../jaxb/wsfederation/SecurityTokenType.java | 50 - .../jaxb/wsfederation/SignOutBasisType.java | 55 - .../jaxb/wsfederation/SignOutElement.java | 26 - .../jaxb/wsfederation/SignOutType.java | 112 - ...gleSignOutNotificationEndpointElement.java | 26 - ...gleSignOutSubscriptionEndpointElement.java | 26 - .../TokenIssuerEndpointElement.java | 26 - .../wsfederation/TokenIssuerNameElement.java | 26 - .../jaxb/wsfederation/TokenKeyInfoType.java | 52 - .../TokenKeyTransferKeyInfoElement.java | 26 - .../TokenSigningKeyInfoElement.java | 26 - .../jaxb/wsfederation/TokenType.java | 74 - .../TokenTypesOfferedElement.java | 26 - .../wsfederation/TokenTypesOfferedType.java | 79 - .../UriNamedClaimTypesOfferedElement.java | 26 - .../UriNamedClaimTypesOfferedType.java | 55 - .../jaxb/wsfederation/WebBindingElement.java | 26 - ...AdditionalContextProcessedElementImpl.java | 246 -- .../wsfederation/impl/AssertionTypeImpl.java | 233 -- .../impl/AttributeExtensibleStringImpl.java | 203 - .../impl/AttributeExtensibleURIImpl.java | 203 - .../AttributeServiceEndpointElementImpl.java | 254 -- .../impl/AuthenticationTokenElementImpl.java | 248 -- .../impl/AutomaticPseudonymsElementImpl.java | 265 -- .../jaxb/wsfederation/impl/ClaimTypeImpl.java | 446 --- .../impl/ClientPseudonymElementImpl.java | 272 -- .../impl/ClientPseudonymTypeImpl.java | 408 -- .../impl/DescriptionTypeImpl.java | 203 - .../impl/DisplayNameTypeImpl.java | 203 - .../impl/FederationElementImpl.java | 276 -- .../impl/FederationIDElementImpl.java | 224 -- .../impl/FederationMetadataElementImpl.java | 246 -- .../FederationMetadataHandlerElementImpl.java | 234 -- .../FederationMetadataHandlerTypeImpl.java | 163 - .../impl/FederationMetadataTypeImpl.java | 233 -- .../wsfederation/impl/FederationTypeImpl.java | 335 -- .../impl/FilterPseudonymsElementImpl.java | 279 -- .../impl/FilterPseudonymsTypeImpl.java | 419 -- .../impl/FreshnessElementImpl.java | 287 -- .../jaxb/wsfederation/impl/FreshnessImpl.java | 338 -- .../wsfederation/impl/IssuerNameTypeImpl.java | 257 -- .../impl/IssuerNamesOfferedElementImpl.java | 234 -- .../impl/IssuerNamesOfferedTypeImpl.java | 288 -- .../IssuesSpecificPolicyFaultElementImpl.java | 246 -- .../jaxb/wsfederation/impl/JAXBVersion.java | 15 - .../impl/ProofTokenElementImpl.java | 233 -- .../wsfederation/impl/ProofTokenTypeImpl.java | 194 - .../impl/PseudonymBasisElementImpl.java | 233 -- .../impl/PseudonymBasisTypeImpl.java | 194 - .../impl/PseudonymElementImpl.java | 250 -- .../wsfederation/impl/PseudonymTypeImpl.java | 377 -- .../PsuedonymServiceEndpointElementImpl.java | 254 -- .../wsfederation/impl/RealmElementImpl.java | 251 -- .../impl/ReferenceDigestTypeImpl.java | 204 - .../impl/ReferenceToken11ElementImpl.java | 246 -- .../impl/ReferenceTokenElementImpl.java | 252 -- .../impl/ReferenceTokenTypeImpl.java | 474 --- .../impl/RelativeToElementImpl.java | 246 -- .../wsfederation/impl/RelativeToTypeImpl.java | 233 -- .../impl/RequestProofTokenElementImpl.java | 246 -- .../impl/RequestProofTokenTypeImpl.java | 233 -- .../impl/RequestPseudonymElementImpl.java | 309 -- .../impl/RequestPseudonymTypeImpl.java | 431 --- .../impl/RequireBearerTokensElementImpl.java | 246 -- .../RequireReferenceTokenElementImpl.java | 300 -- .../impl/RequireSharedCookiesElementImpl.java | 246 -- .../impl/RequireSignedTokensElementImpl.java | 246 -- ...equiresGenericClaimDialectElementImpl.java | 246 -- .../impl/SecurityTokenElementImpl.java | 233 -- .../impl/SecurityTokenTypeImpl.java | 194 - .../impl/SignOutBasisTypeImpl.java | 220 -- .../wsfederation/impl/SignOutElementImpl.java | 290 -- .../wsfederation/impl/SignOutTypeImpl.java | 457 --- ...ignOutNotificationEndpointElementImpl.java | 255 -- ...ignOutSubscriptionEndpointElementImpl.java | 255 -- .../impl/TokenIssuerEndpointElementImpl.java | 254 -- .../impl/TokenIssuerNameElementImpl.java | 224 -- .../impl/TokenKeyInfoTypeImpl.java | 318 -- .../TokenKeyTransferKeyInfoElementImpl.java | 242 -- .../impl/TokenSigningKeyInfoElementImpl.java | 242 -- .../jaxb/wsfederation/impl/TokenTypeImpl.java | 335 -- .../impl/TokenTypesOfferedElementImpl.java | 240 -- .../impl/TokenTypesOfferedTypeImpl.java | 358 -- .../UriNamedClaimTypesOfferedElementImpl.java | 234 -- .../UriNamedClaimTypesOfferedTypeImpl.java | 305 -- .../impl/WebBindingElementImpl.java | 247 -- .../jaxb/wsfederation/package.html | 1 - .../jaxb/wspolicy/AllElement.java | 26 - .../jaxb/wspolicy/AppliesToElement.java | 36 - .../jaxb/wspolicy/AppliesToType.java | 55 - .../jaxb/wspolicy/ExactlyOneElement.java | 26 - .../jaxb/wspolicy/ObjectFactory.java | 249 -- .../jaxb/wspolicy/OperatorContentType.java | 65 - .../wspolicy/PolicyAttachmentElement.java | 41 - .../jaxb/wspolicy/PolicyAttachmentType.java | 104 - .../jaxb/wspolicy/PolicyElement.java | 35 - .../jaxb/wspolicy/PolicyReferenceElement.java | 36 - .../jaxb/wspolicy/PolicyReferenceType.java | 86 - .../jaxb/wspolicy/PolicyType.java | 69 - .../jaxb/wspolicy/impl/AllElementImpl.java | 275 -- .../wspolicy/impl/AppliesToElementImpl.java | 232 -- .../jaxb/wspolicy/impl/AppliesToTypeImpl.java | 217 -- .../wspolicy/impl/ExactlyOneElementImpl.java | 275 -- .../jaxb/wspolicy/impl/JAXBVersion.java | 15 - .../impl/OperatorContentTypeImpl.java | 314 -- .../impl/PolicyAttachmentElementImpl.java | 251 -- .../impl/PolicyAttachmentTypeImpl.java | 360 -- .../jaxb/wspolicy/impl/PolicyElementImpl.java | 341 -- .../impl/PolicyReferenceElementImpl.java | 321 -- .../impl/PolicyReferenceTypeImpl.java | 441 --- .../jaxb/wspolicy/impl/PolicyTypeImpl.java | 432 --- .../wsfederation/jaxb/wspolicy/package.html | 1 - .../jaxb/wsse/AttributedString.java | 67 - .../jaxb/wsse/BinarySecurityTokenElement.java | 27 - .../jaxb/wsse/BinarySecurityTokenType.java | 51 - .../jaxb/wsse/EmbeddedElement.java | 27 - .../wsfederation/jaxb/wsse/EmbeddedType.java | 75 - .../wsfederation/jaxb/wsse/EncodedString.java | 51 - .../jaxb/wsse/KeyIdentifierElement.java | 27 - .../jaxb/wsse/KeyIdentifierType.java | 51 - .../wsfederation/jaxb/wsse/NonceElement.java | 26 - .../wsfederation/jaxb/wsse/ObjectFactory.java | 383 -- .../jaxb/wsse/PasswordElement.java | 26 - .../jaxb/wsse/PasswordString.java | 51 - .../jaxb/wsse/ReferenceElement.java | 27 - .../wsfederation/jaxb/wsse/ReferenceType.java | 68 - .../jaxb/wsse/SecurityElement.java | 27 - .../jaxb/wsse/SecurityHeaderType.java | 56 - .../wsse/SecurityTokenReferenceElement.java | 27 - .../jaxb/wsse/SecurityTokenReferenceType.java | 99 - .../wsse/TransformationParametersElement.java | 27 - .../wsse/TransformationParametersType.java | 56 - .../jaxb/wsse/UsernameTokenElement.java | 27 - .../jaxb/wsse/UsernameTokenType.java | 94 - .../jaxb/wsse/impl/AttributedStringImpl.java | 310 -- .../impl/BinarySecurityTokenElementImpl.java | 328 -- .../impl/BinarySecurityTokenTypeImpl.java | 351 -- .../jaxb/wsse/impl/EmbeddedElementImpl.java | 277 -- .../jaxb/wsse/impl/EmbeddedTypeImpl.java | 335 -- .../jaxb/wsse/impl/EncodedStringImpl.java | 322 -- .../jaxb/wsse/impl/JAXBVersion.java | 15 - .../wsse/impl/KeyIdentifierElementImpl.java | 328 -- .../jaxb/wsse/impl/KeyIdentifierTypeImpl.java | 351 -- .../jaxb/wsse/impl/NonceElementImpl.java | 299 -- .../jaxb/wsse/impl/PasswordElementImpl.java | 299 -- .../jaxb/wsse/impl/PasswordStringImpl.java | 322 -- .../jaxb/wsse/impl/ReferenceElementImpl.java | 295 -- .../jaxb/wsse/impl/ReferenceTypeImpl.java | 355 -- .../jaxb/wsse/impl/SecurityElementImpl.java | 246 -- .../wsse/impl/SecurityHeaderTypeImpl.java | 233 -- .../SecurityTokenReferenceElementImpl.java | 314 -- .../impl/SecurityTokenReferenceTypeImpl.java | 453 --- .../TransformationParametersElementImpl.java | 246 -- .../TransformationParametersTypeImpl.java | 233 -- .../wsse/impl/UsernameTokenElementImpl.java | 280 -- .../jaxb/wsse/impl/UsernameTokenTypeImpl.java | 422 -- .../wsfederation/jaxb/wsse/package.html | 1 - .../jaxb/wsspolicy/AbsXPathElement.java | 28 - .../jaxb/wsspolicy/AlgorithmSuiteElement.java | 28 - .../wsspolicy/AsymmetricBindingElement.java | 28 - .../jaxb/wsspolicy/Basic128Element.java | 28 - .../jaxb/wsspolicy/Basic128Rsa15Element.java | 28 - .../jaxb/wsspolicy/Basic128Sha256Element.java | 28 - .../wsspolicy/Basic128Sha256Rsa15Element.java | 28 - .../jaxb/wsspolicy/Basic192Element.java | 28 - .../jaxb/wsspolicy/Basic192Rsa15Element.java | 28 - .../jaxb/wsspolicy/Basic192Sha256Element.java | 28 - .../wsspolicy/Basic192Sha256Rsa15Element.java | 28 - .../jaxb/wsspolicy/Basic256Element.java | 28 - .../jaxb/wsspolicy/Basic256Rsa15Element.java | 28 - .../jaxb/wsspolicy/Basic256Sha256Element.java | 28 - .../wsspolicy/Basic256Sha256Rsa15Element.java | 28 - .../wsspolicy/BootstrapPolicyElement.java | 28 - .../jaxb/wsspolicy/EmptyType.java | 29 - .../EncryptBeforeSigningElement.java | 28 - .../wsspolicy/EncryptSignatureElement.java | 28 - .../wsspolicy/EncryptedElementsElement.java | 28 - .../jaxb/wsspolicy/EncryptedPartsElement.java | 28 - .../wsspolicy/EncryptionTokenElement.java | 28 - ...rsingEncryptedSupportingTokensElement.java | 28 - .../EndorsingSupportingTokensElement.java | 28 - .../jaxb/wsspolicy/HashPasswordElement.java | 28 - .../jaxb/wsspolicy/HeaderType.java | 67 - .../HttpBasicAuthenticationElement.java | 28 - .../HttpDigestAuthenticationElement.java | 28 - .../jaxb/wsspolicy/HttpsTokenElement.java | 28 - .../wsspolicy/IncludeTimestampElement.java | 28 - .../jaxb/wsspolicy/InclusiveC14NElement.java | 28 - .../InitiatorEncryptionTokenElement.java | 28 - .../InitiatorSignatureTokenElement.java | 28 - .../jaxb/wsspolicy/InitiatorTokenElement.java | 28 - .../jaxb/wsspolicy/IssuedTokenElement.java | 28 - .../jaxb/wsspolicy/IssuedTokenType.java | 114 - .../jaxb/wsspolicy/KerberosTokenElement.java | 28 - .../jaxb/wsspolicy/LaxElement.java | 28 - .../jaxb/wsspolicy/LaxTsFirstElement.java | 28 - .../jaxb/wsspolicy/LaxTsLastElement.java | 28 - .../jaxb/wsspolicy/LayoutElement.java | 28 - .../MustSupportClientChallengeElement.java | 28 - .../MustSupportIssuedTokensElement.java | 28 - .../MustSupportRefEmbeddedTokenElement.java | 28 - .../MustSupportRefEncryptedKeyElement.java | 28 - .../MustSupportRefExternalURIElement.java | 28 - .../MustSupportRefIssuerSerialElement.java | 28 - .../MustSupportRefKeyIdentifierElement.java | 28 - .../MustSupportRefThumbprintElement.java | 28 - .../MustSupportServerChallengeElement.java | 28 - .../jaxb/wsspolicy/NestedPolicyType.java | 76 - .../jaxb/wsspolicy/NoPasswordElement.java | 28 - .../jaxb/wsspolicy/ObjectFactory.java | 1909 ---------- .../OnlySignEntireHeadersAndBodyElement.java | 28 - .../jaxb/wsspolicy/ProtectTokensElement.java | 28 - .../wsspolicy/ProtectionTokenElement.java | 28 - .../jaxb/wsspolicy/QNameAssertionType.java | 29 - .../RecipientEncryptionTokenElement.java | 28 - .../RecipientSignatureTokenElement.java | 28 - .../jaxb/wsspolicy/RecipientTokenElement.java | 28 - .../jaxb/wsspolicy/RelTokenElement.java | 28 - .../RequestSecurityTokenTemplateType.java | 74 - .../RequireClientCertificateElement.java | 28 - .../RequireClientEntropyElement.java | 28 - .../wsspolicy/RequireDerivedKeysElement.java | 28 - .../RequireEmbeddedTokenReferenceElement.java | 28 - .../RequireExplicitDerivedKeysElement.java | 28 - .../RequireExternalReferenceElement.java | 28 - .../RequireExternalUriReferenceElement.java | 28 - .../RequireImplicitDerivedKeysElement.java | 28 - .../RequireInternalReferenceElement.java | 28 - .../RequireIssuerSerialReferenceElement.java | 28 - .../RequireKeyIdentifierReferenceElement.java | 28 - ...RequestSecurityTokenCollectionElement.java | 28 - .../RequireServerEntropyElement.java | 28 - .../RequireSignatureConfirmationElement.java | 28 - .../RequireThumbprintReferenceElement.java | 28 - .../wsspolicy/RequiredElementsElement.java | 28 - .../SC200502SecurityContextTokenElement.java | 28 - .../wsspolicy/SOAPNormalization10Element.java | 28 - .../jaxb/wsspolicy/STRTransform10Element.java | 28 - .../jaxb/wsspolicy/SamlTokenElement.java | 28 - .../jaxb/wsspolicy/SePartsType.java | 98 - .../SecureConversationTokenElement.java | 28 - .../SecureConversationTokenType.java | 95 - .../SecurityContextTokenElement.java | 28 - .../jaxb/wsspolicy/SerElementsType.java | 98 - .../jaxb/wsspolicy/SignatureTokenElement.java | 28 - .../jaxb/wsspolicy/SignedElementsElement.java | 28 - ...ignedEncryptedSupportingTokensElement.java | 28 - ...rsingEncryptedSupportingTokensElement.java | 28 - ...ignedEndorsingSupportingTokensElement.java | 28 - .../jaxb/wsspolicy/SignedPartsElement.java | 28 - .../SignedSupportingTokensElement.java | 28 - .../wsspolicy/SpnegoContextTokenElement.java | 28 - .../wsspolicy/SpnegoContextTokenType.java | 95 - .../jaxb/wsspolicy/StrictElement.java | 28 - .../wsspolicy/SupportingTokensElement.java | 28 - .../wsspolicy/SymmetricBindingElement.java | 28 - .../jaxb/wsspolicy/TokenAssertionType.java | 76 - .../wsspolicy/TransportBindingElement.java | 28 - .../jaxb/wsspolicy/TransportTokenElement.java | 28 - .../jaxb/wsspolicy/TripleDesElement.java | 28 - .../jaxb/wsspolicy/TripleDesRsa15Element.java | 28 - .../wsspolicy/TripleDesSha256Element.java | 28 - .../TripleDesSha256Rsa15Element.java | 28 - .../jaxb/wsspolicy/Trust10Element.java | 28 - .../jaxb/wsspolicy/UsernameTokenElement.java | 28 - .../jaxb/wsspolicy/Wss10Element.java | 28 - .../jaxb/wsspolicy/Wss11Element.java | 28 - .../WssGssKerberosV5ApReqToken11Element.java | 28 - .../WssKerberosV5ApReqToken11Element.java | 28 - .../wsspolicy/WssRelV10Token10Element.java | 28 - .../wsspolicy/WssRelV10Token11Element.java | 28 - .../wsspolicy/WssRelV20Token10Element.java | 28 - .../wsspolicy/WssRelV20Token11Element.java | 28 - .../wsspolicy/WssSamlV11Token10Element.java | 28 - .../wsspolicy/WssSamlV11Token11Element.java | 28 - .../wsspolicy/WssSamlV20Token11Element.java | 28 - .../wsspolicy/WssUsernameToken10Element.java | 28 - .../wsspolicy/WssUsernameToken11Element.java | 28 - .../wsspolicy/WssX509Pkcs7Token10Element.java | 28 - .../wsspolicy/WssX509Pkcs7Token11Element.java | 28 - .../WssX509PkiPathV1Token10Element.java | 28 - .../WssX509PkiPathV1Token11Element.java | 28 - .../wsspolicy/WssX509V1Token11Element.java | 28 - .../wsspolicy/WssX509V3Token10Element.java | 28 - .../wsspolicy/WssX509V3Token11Element.java | 28 - .../jaxb/wsspolicy/X509TokenElement.java | 28 - .../jaxb/wsspolicy/XPath10Element.java | 28 - .../jaxb/wsspolicy/XPathFilter20Element.java | 28 - .../wsspolicy/impl/AbsXPathElementImpl.java | 234 -- .../impl/AlgorithmSuiteElementImpl.java | 247 -- .../impl/AsymmetricBindingElementImpl.java | 247 -- .../wsspolicy/impl/Basic128ElementImpl.java | 234 -- .../impl/Basic128Rsa15ElementImpl.java | 234 -- .../impl/Basic128Sha256ElementImpl.java | 234 -- .../impl/Basic128Sha256Rsa15ElementImpl.java | 234 -- .../wsspolicy/impl/Basic192ElementImpl.java | 234 -- .../impl/Basic192Rsa15ElementImpl.java | 234 -- .../impl/Basic192Sha256ElementImpl.java | 234 -- .../impl/Basic192Sha256Rsa15ElementImpl.java | 234 -- .../wsspolicy/impl/Basic256ElementImpl.java | 234 -- .../impl/Basic256Rsa15ElementImpl.java | 234 -- .../impl/Basic256Sha256ElementImpl.java | 234 -- .../impl/Basic256Sha256Rsa15ElementImpl.java | 234 -- .../impl/BootstrapPolicyElementImpl.java | 247 -- .../jaxb/wsspolicy/impl/EmptyTypeImpl.java | 163 - .../impl/EncryptBeforeSigningElementImpl.java | 234 -- .../impl/EncryptSignatureElementImpl.java | 234 -- .../impl/EncryptedElementsElementImpl.java | 280 -- .../impl/EncryptedPartsElementImpl.java | 265 -- .../impl/EncryptionTokenElementImpl.java | 247 -- ...gEncryptedSupportingTokensElementImpl.java | 247 -- .../EndorsingSupportingTokensElementImpl.java | 247 -- .../impl/HashPasswordElementImpl.java | 234 -- .../jaxb/wsspolicy/impl/HeaderTypeImpl.java | 356 -- .../HttpBasicAuthenticationElementImpl.java | 234 -- .../HttpDigestAuthenticationElementImpl.java | 234 -- .../wsspolicy/impl/HttpsTokenElementImpl.java | 299 -- .../impl/IncludeTimestampElementImpl.java | 234 -- .../impl/InclusiveC14NElementImpl.java | 234 -- .../InitiatorEncryptionTokenElementImpl.java | 247 -- .../InitiatorSignatureTokenElementImpl.java | 247 -- .../impl/InitiatorTokenElementImpl.java | 247 -- .../impl/IssuedTokenElementImpl.java | 307 -- .../wsspolicy/impl/IssuedTokenTypeImpl.java | 528 --- .../jaxb/wsspolicy/impl/JAXBVersion.java | 15 - .../impl/KerberosTokenElementImpl.java | 299 -- .../jaxb/wsspolicy/impl/LaxElementImpl.java | 234 -- .../wsspolicy/impl/LaxTsFirstElementImpl.java | 234 -- .../wsspolicy/impl/LaxTsLastElementImpl.java | 234 -- .../wsspolicy/impl/LayoutElementImpl.java | 247 -- ...MustSupportClientChallengeElementImpl.java | 234 -- .../MustSupportIssuedTokensElementImpl.java | 234 -- ...ustSupportRefEmbeddedTokenElementImpl.java | 234 -- ...MustSupportRefEncryptedKeyElementImpl.java | 234 -- .../MustSupportRefExternalURIElementImpl.java | 234 -- ...MustSupportRefIssuerSerialElementImpl.java | 234 -- ...ustSupportRefKeyIdentifierElementImpl.java | 234 -- .../MustSupportRefThumbprintElementImpl.java | 234 -- ...MustSupportServerChallengeElementImpl.java | 234 -- .../wsspolicy/impl/NestedPolicyTypeImpl.java | 395 -- .../wsspolicy/impl/NoPasswordElementImpl.java | 234 -- ...lySignEntireHeadersAndBodyElementImpl.java | 234 -- .../impl/ProtectTokensElementImpl.java | 234 -- .../impl/ProtectionTokenElementImpl.java | 247 -- .../impl/QNameAssertionTypeImpl.java | 163 - .../RecipientEncryptionTokenElementImpl.java | 247 -- .../RecipientSignatureTokenElementImpl.java | 247 -- .../impl/RecipientTokenElementImpl.java | 247 -- .../wsspolicy/impl/RelTokenElementImpl.java | 299 -- .../RequestSecurityTokenTemplateTypeImpl.java | 339 -- .../RequireClientCertificateElementImpl.java | 234 -- .../impl/RequireClientEntropyElementImpl.java | 234 -- .../impl/RequireDerivedKeysElementImpl.java | 234 -- ...uireEmbeddedTokenReferenceElementImpl.java | 234 -- ...RequireExplicitDerivedKeysElementImpl.java | 234 -- .../RequireExternalReferenceElementImpl.java | 234 -- ...equireExternalUriReferenceElementImpl.java | 234 -- ...RequireImplicitDerivedKeysElementImpl.java | 234 -- .../RequireInternalReferenceElementImpl.java | 234 -- ...quireIssuerSerialReferenceElementImpl.java | 234 -- ...uireKeyIdentifierReferenceElementImpl.java | 234 -- ...estSecurityTokenCollectionElementImpl.java | 234 -- .../impl/RequireServerEntropyElementImpl.java | 234 -- ...quireSignatureConfirmationElementImpl.java | 234 -- ...RequireThumbprintReferenceElementImpl.java | 234 -- .../impl/RequiredElementsElementImpl.java | 280 -- ...200502SecurityContextTokenElementImpl.java | 234 -- .../impl/SOAPNormalization10ElementImpl.java | 234 -- .../impl/STRTransform10ElementImpl.java | 234 -- .../wsspolicy/impl/SamlTokenElementImpl.java | 299 -- .../jaxb/wsspolicy/impl/SePartsTypeImpl.java | 455 --- .../SecureConversationTokenElementImpl.java | 307 -- .../impl/SecureConversationTokenTypeImpl.java | 447 --- .../impl/SecurityContextTokenElementImpl.java | 299 -- .../wsspolicy/impl/SerElementsTypeImpl.java | 434 --- .../impl/SignatureTokenElementImpl.java | 247 -- .../impl/SignedElementsElementImpl.java | 280 -- ...dEncryptedSupportingTokensElementImpl.java | 247 -- ...gEncryptedSupportingTokensElementImpl.java | 247 -- ...dEndorsingSupportingTokensElementImpl.java | 247 -- .../impl/SignedPartsElementImpl.java | 265 -- .../SignedSupportingTokensElementImpl.java | 247 -- .../impl/SpnegoContextTokenElementImpl.java | 307 -- .../impl/SpnegoContextTokenTypeImpl.java | 447 --- .../wsspolicy/impl/StrictElementImpl.java | 234 -- .../impl/SupportingTokensElementImpl.java | 247 -- .../impl/SymmetricBindingElementImpl.java | 247 -- .../impl/TokenAssertionTypeImpl.java | 387 -- .../impl/TransportBindingElementImpl.java | 247 -- .../impl/TransportTokenElementImpl.java | 247 -- .../wsspolicy/impl/TripleDesElementImpl.java | 234 -- .../impl/TripleDesRsa15ElementImpl.java | 234 -- .../impl/TripleDesSha256ElementImpl.java | 234 -- .../impl/TripleDesSha256Rsa15ElementImpl.java | 234 -- .../wsspolicy/impl/Trust10ElementImpl.java | 247 -- .../impl/UsernameTokenElementImpl.java | 299 -- .../jaxb/wsspolicy/impl/Wss10ElementImpl.java | 247 -- .../jaxb/wsspolicy/impl/Wss11ElementImpl.java | 247 -- ...sGssKerberosV5ApReqToken11ElementImpl.java | 234 -- .../WssKerberosV5ApReqToken11ElementImpl.java | 234 -- .../impl/WssRelV10Token10ElementImpl.java | 234 -- .../impl/WssRelV10Token11ElementImpl.java | 234 -- .../impl/WssRelV20Token10ElementImpl.java | 234 -- .../impl/WssRelV20Token11ElementImpl.java | 234 -- .../impl/WssSamlV11Token10ElementImpl.java | 234 -- .../impl/WssSamlV11Token11ElementImpl.java | 234 -- .../impl/WssSamlV20Token11ElementImpl.java | 234 -- .../impl/WssUsernameToken10ElementImpl.java | 234 -- .../impl/WssUsernameToken11ElementImpl.java | 234 -- .../impl/WssX509Pkcs7Token10ElementImpl.java | 234 -- .../impl/WssX509Pkcs7Token11ElementImpl.java | 234 -- .../WssX509PkiPathV1Token10ElementImpl.java | 234 -- .../WssX509PkiPathV1Token11ElementImpl.java | 234 -- .../impl/WssX509V1Token11ElementImpl.java | 234 -- .../impl/WssX509V3Token10ElementImpl.java | 234 -- .../impl/WssX509V3Token11ElementImpl.java | 234 -- .../wsspolicy/impl/X509TokenElementImpl.java | 299 -- .../wsspolicy/impl/XPath10ElementImpl.java | 234 -- .../impl/XPathFilter20ElementImpl.java | 234 -- .../wsfederation/jaxb/wsspolicy/package.html | 1 - .../jaxb/wsu/AttributedDateTime.java | 68 - .../wsfederation/jaxb/wsu/AttributedURI.java | 68 - .../wsfederation/jaxb/wsu/CreatedElement.java | 28 - .../wsfederation/jaxb/wsu/ExpiresElement.java | 28 - .../wsfederation/jaxb/wsu/ObjectFactory.java | 181 - .../jaxb/wsu/TimestampElement.java | 29 - .../wsfederation/jaxb/wsu/TimestampType.java | 120 - .../jaxb/wsu/impl/AttributedDateTimeImpl.java | 310 -- .../jaxb/wsu/impl/AttributedURIImpl.java | 310 -- .../jaxb/wsu/impl/CreatedElementImpl.java | 267 -- .../jaxb/wsu/impl/ExpiresElementImpl.java | 267 -- .../jaxb/wsu/impl/JAXBVersion.java | 15 - .../jaxb/wsu/impl/TimestampElementImpl.java | 311 -- .../jaxb/wsu/impl/TimestampTypeImpl.java | 568 --- .../wsfederation/jaxb/wsu/package.html | 1 - .../xmlsig/CanonicalizationMethodElement.java | 26 - .../xmlsig/CanonicalizationMethodType.java | 75 - .../jaxb/xmlsig/DSAKeyValueElement.java | 26 - .../jaxb/xmlsig/DSAKeyValueType.java | 168 - .../jaxb/xmlsig/DigestMethodElement.java | 26 - .../jaxb/xmlsig/DigestMethodType.java | 75 - .../jaxb/xmlsig/DigestValueElement.java | 44 - .../jaxb/xmlsig/KeyInfoElement.java | 26 - .../wsfederation/jaxb/xmlsig/KeyInfoType.java | 89 - .../jaxb/xmlsig/KeyNameElement.java | 44 - .../jaxb/xmlsig/KeyValueElement.java | 26 - .../jaxb/xmlsig/KeyValueType.java | 60 - .../jaxb/xmlsig/ManifestElement.java | 26 - .../jaxb/xmlsig/ManifestType.java | 75 - .../jaxb/xmlsig/MgmtDataElement.java | 44 - .../jaxb/xmlsig/ObjectElement.java | 26 - .../jaxb/xmlsig/ObjectFactory.java | 946 ----- .../wsfederation/jaxb/xmlsig/ObjectType.java | 113 - .../jaxb/xmlsig/PGPDataElement.java | 26 - .../wsfederation/jaxb/xmlsig/PGPDataType.java | 100 - .../jaxb/xmlsig/RSAKeyValueElement.java | 26 - .../jaxb/xmlsig/RSAKeyValueType.java | 69 - .../jaxb/xmlsig/ReferenceElement.java | 26 - .../jaxb/xmlsig/ReferenceType.java | 149 - .../jaxb/xmlsig/RetrievalMethodElement.java | 26 - .../jaxb/xmlsig/RetrievalMethodType.java | 90 - .../jaxb/xmlsig/SPKIDataElement.java | 26 - .../jaxb/xmlsig/SPKIDataType.java | 92 - .../jaxb/xmlsig/SignatureElement.java | 26 - .../jaxb/xmlsig/SignatureMethodElement.java | 26 - .../jaxb/xmlsig/SignatureMethodType.java | 112 - .../xmlsig/SignaturePropertiesElement.java | 26 - .../jaxb/xmlsig/SignaturePropertiesType.java | 75 - .../jaxb/xmlsig/SignaturePropertyElement.java | 26 - .../jaxb/xmlsig/SignaturePropertyType.java | 94 - .../jaxb/xmlsig/SignatureType.java | 138 - .../jaxb/xmlsig/SignatureValueElement.java | 26 - .../jaxb/xmlsig/SignatureValueType.java | 66 - .../jaxb/xmlsig/SignedInfoElement.java | 26 - .../jaxb/xmlsig/SignedInfoType.java | 117 - .../jaxb/xmlsig/TransformElement.java | 26 - .../jaxb/xmlsig/TransformType.java | 112 - .../jaxb/xmlsig/TransformsElement.java | 26 - .../jaxb/xmlsig/TransformsType.java | 56 - .../jaxb/xmlsig/X509DataElement.java | 26 - .../jaxb/xmlsig/X509DataType.java | 224 -- .../jaxb/xmlsig/X509IssuerSerialType.java | 69 - .../CanonicalizationMethodElementImpl.java | 268 -- .../impl/CanonicalizationMethodTypeImpl.java | 362 -- .../xmlsig/impl/DSAKeyValueElementImpl.java | 252 -- .../jaxb/xmlsig/impl/DSAKeyValueTypeImpl.java | 588 --- .../xmlsig/impl/DigestMethodElementImpl.java | 271 -- .../xmlsig/impl/DigestMethodTypeImpl.java | 366 -- .../xmlsig/impl/DigestValueElementImpl.java | 256 -- .../jaxb/xmlsig/impl/JAXBVersion.java | 15 - .../jaxb/xmlsig/impl/KeyInfoElementImpl.java | 328 -- .../jaxb/xmlsig/impl/KeyInfoTypeImpl.java | 437 --- .../jaxb/xmlsig/impl/KeyNameElementImpl.java | 253 -- .../jaxb/xmlsig/impl/KeyValueElementImpl.java | 262 -- .../jaxb/xmlsig/impl/KeyValueTypeImpl.java | 297 -- .../jaxb/xmlsig/impl/ManifestElementImpl.java | 281 -- .../jaxb/xmlsig/impl/ManifestTypeImpl.java | 476 --- .../jaxb/xmlsig/impl/MgmtDataElementImpl.java | 253 -- .../jaxb/xmlsig/impl/ObjectElementImpl.java | 342 -- .../jaxb/xmlsig/impl/ObjectTypeImpl.java | 552 --- .../jaxb/xmlsig/impl/PGPDataElementImpl.java | 250 -- .../jaxb/xmlsig/impl/PGPDataTypeImpl.java | 458 --- .../xmlsig/impl/RSAKeyValueElementImpl.java | 235 -- .../jaxb/xmlsig/impl/RSAKeyValueTypeImpl.java | 288 -- .../xmlsig/impl/ReferenceElementImpl.java | 364 -- .../jaxb/xmlsig/impl/ReferenceTypeImpl.java | 682 ---- .../impl/RetrievalMethodElementImpl.java | 313 -- .../xmlsig/impl/RetrievalMethodTypeImpl.java | 445 --- .../jaxb/xmlsig/impl/SPKIDataElementImpl.java | 238 -- .../jaxb/xmlsig/impl/SPKIDataTypeImpl.java | 562 --- .../xmlsig/impl/SignatureElementImpl.java | 302 -- .../impl/SignatureMethodElementImpl.java | 274 -- .../xmlsig/impl/SignatureMethodTypeImpl.java | 772 ---- .../impl/SignaturePropertiesElementImpl.java | 282 -- .../impl/SignaturePropertiesTypeImpl.java | 432 --- .../impl/SignaturePropertyElementImpl.java | 304 -- .../impl/SignaturePropertyTypeImpl.java | 460 --- .../jaxb/xmlsig/impl/SignatureTypeImpl.java | 813 ---- .../impl/SignatureValueElementImpl.java | 267 -- .../xmlsig/impl/SignatureValueTypeImpl.java | 306 -- .../xmlsig/impl/SignedInfoElementImpl.java | 295 -- .../jaxb/xmlsig/impl/SignedInfoTypeImpl.java | 654 ---- .../xmlsig/impl/TransformElementImpl.java | 273 -- .../jaxb/xmlsig/impl/TransformTypeImpl.java | 629 --- .../xmlsig/impl/TransformsElementImpl.java | 240 -- .../jaxb/xmlsig/impl/TransformsTypeImpl.java | 310 -- .../jaxb/xmlsig/impl/X509DataElementImpl.java | 268 -- .../jaxb/xmlsig/impl/X509DataTypeImpl.java | 1518 -------- .../xmlsig/impl/X509IssuerSerialTypeImpl.java | 296 -- .../wsfederation/jaxb/xmlsig/package.html | 1 - .../main/java/com/sun/xml/bind/Messages.java | 82 - .../jaxb/entityconfig/jaxb.properties | 3 +- .../wsfederation/jaxb/wsaddr/jaxb.properties | 3 +- .../jaxb/wsfederation/jaxb.properties | 3 +- .../jaxb/wspolicy/jaxb.properties | 3 +- .../wsfederation/jaxb/wsse/jaxb.properties | 3 +- .../jaxb/wsspolicy/jaxb.properties | 3 +- .../wsfederation/jaxb/wsu/jaxb.properties | 3 +- .../wsfederation/jaxb/xmlsig/jaxb.properties | 3 +- .../src/main/xjb/wsfederation.xjb | 154 +- .../src/main/xsd/entity-config-schema.xsd | 4 +- openam-schema/openam-xacml3-schema/pom.xml | 13 +- .../entitlement/xacml3/core/Advice.java | 14 +- .../xacml3/core/AdviceExpression.java | 14 +- .../xacml3/core/AdviceExpressions.java | 12 +- .../entitlement/xacml3/core/AllOf.java | 10 +- .../entitlement/xacml3/core/AnyOf.java | 12 +- .../entitlement/xacml3/core/Apply.java | 20 +- .../xacml3/core/AssociatedAdvice.java | 12 +- .../entitlement/xacml3/core/Attribute.java | 16 +- .../xacml3/core/AttributeAssignment.java | 14 +- .../core/AttributeAssignmentExpression.java | 16 +- .../xacml3/core/AttributeDesignator.java | 12 +- .../xacml3/core/AttributeSelector.java | 12 +- .../xacml3/core/AttributeValue.java | 20 +- .../entitlement/xacml3/core/Attributes.java | 20 +- .../xacml3/core/AttributesReference.java | 14 +- .../xacml3/core/CombinerParameter.java | 12 +- .../xacml3/core/CombinerParameters.java | 12 +- .../entitlement/xacml3/core/Condition.java | 12 +- .../entitlement/xacml3/core/Content.java | 12 +- .../entitlement/xacml3/core/DecisionType.java | 8 +- .../entitlement/xacml3/core/Defaults.java | 12 +- .../entitlement/xacml3/core/EffectType.java | 8 +- .../entitlement/xacml3/core/Expression.java | 10 +- .../entitlement/xacml3/core/Function.java | 12 +- .../entitlement/xacml3/core/IdReference.java | 14 +- .../entitlement/xacml3/core/Match.java | 14 +- .../xacml3/core/MissingAttributeDetail.java | 14 +- .../xacml3/core/MultiRequests.java | 10 +- .../xacml3/core/ObjectFactory.java | 8 +- .../entitlement/xacml3/core/Obligation.java | 14 +- .../xacml3/core/ObligationExpression.java | 14 +- .../xacml3/core/ObligationExpressions.java | 10 +- .../entitlement/xacml3/core/Obligations.java | 10 +- .../entitlement/xacml3/core/Policy.java | 16 +- .../xacml3/core/PolicyCombinerParameters.java | 12 +- .../xacml3/core/PolicyIdentifierList.java | 14 +- .../entitlement/xacml3/core/PolicyIssuer.java | 10 +- .../entitlement/xacml3/core/PolicySet.java | 20 +- .../core/PolicySetCombinerParameters.java | 12 +- .../entitlement/xacml3/core/Request.java | 24 +- .../xacml3/core/RequestDefaults.java | 12 +- .../xacml3/core/RequestReference.java | 10 +- .../entitlement/xacml3/core/Response.java | 4 +- .../entitlement/xacml3/core/Result.java | 10 +- .../entitlement/xacml3/core/Rule.java | 12 +- .../xacml3/core/RuleCombinerParameters.java | 10 +- .../entitlement/xacml3/core/Status.java | 10 +- .../entitlement/xacml3/core/StatusCode.java | 14 +- .../entitlement/xacml3/core/StatusDetail.java | 10 +- .../entitlement/xacml3/core/Target.java | 10 +- .../xacml3/core/VariableDefinition.java | 14 +- .../xacml3/core/VariableReference.java | 10 +- .../entitlement/xacml3/core/Version.java | 10 +- .../entitlement/xacml3/core/VersionMatch.java | 10 +- .../entitlement/xacml3/core/package-info.java | 13 +- .../src/main/webapp/saml2/jsp/SA_IDP.jsp | 5 +- .../src/main/webapp/saml2/jsp/SA_SP.jsp | 3 +- .../webapp/saml2/jsp/spSingleLogoutInit.jsp | 3 +- .../wsfederation/jsp/realmSelection.jsp | 6 +- openam-shared/pom.xml | 10 + .../com/sun/identity/shared/xml/XMLUtils.java | 4 +- .../java/org/forgerock/openam/utils/Time.java | 26 + .../sts/token/CTSTokenIdGeneratorImpl.java | 4 +- pom.xml | 15 + 2781 files changed, 4026 insertions(+), 540945 deletions(-) create mode 100644 openam-federation/openam-federation-library/src/test/resources/idp-extended.xml create mode 100644 openam-federation/openam-federation-library/src/test/resources/idp-metadata.xml delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AffiliationDescriptorConfigElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/BaseConfigType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/IDPDescriptorConfigElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/SPDescriptorConfigElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/AffiliationDescriptorConfigElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/AttributeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/AttributeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/BaseConfigTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/EntityConfigElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/EntityConfigTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/IDPDescriptorConfigElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/SPDescriptorConfigElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/ValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/AbstractUnmarshallingEventHandlerImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/ContentHandlerAdaptor.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/Discarder.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/ErrorHandlerAdaptor.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfo.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/IdentityHashSet.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/InterningUnmarshallerHandler.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/MSVValidator.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/NamespaceContextImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/PrefixCallback.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallableObject.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallerImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallingEventHandler.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallingEventHandlerAdaptor.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/Util.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/ValidatableObject.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/ValidatingUnmarshaller.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/ValidationContext.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/ValidatorImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/XMLSerializable.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/XMLSerializer.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/PasswordTransformsElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/PasswordTransformsTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/SASLRequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/SASLRequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/SASLResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/SASLResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitDurationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitDurationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitSessionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitSessionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitUsagesElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationLimitUsagesTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationPinElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ActivationPinTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AlphabetElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AlphabetTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AsymmetricDecryptionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AsymmetricDecryptionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AsymmetricKeyAgreementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AsymmetricKeyAgreementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticatingAuthorityElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticatingAuthorityTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticationContextStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticationContextStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticationMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticationMethodTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticatorElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticatorTransportProtocolElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticatorTransportProtocolTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/AuthenticatorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/DeactivationCallCenterElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/DeactivationCallCenterTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/DigSigElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/DigSigTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/GenerationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/GenerationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/GoverningAgreementRefElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/GoverningAgreementRefTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/GoverningAgreementsElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/GoverningAgreementsTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/HTTPElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/HTTPTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/IPAddressElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/IPAddressTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/IPSecElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/IPSecTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/IdentificationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/IdentificationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/KeyActivationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/KeyActivationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/KeySharingElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/KeySharingTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/KeyStorageElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/KeyStorageTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/LengthElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/LengthTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/MobileNetworkEndToEndEncryptionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/MobileNetworkEndToEndEncryptionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/MobileNetworkNoEncryptionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/MobileNetworkNoEncryptionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/MobileNetworkRadioEncryptionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/MobileNetworkRadioEncryptionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/OperationalProtectionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/OperationalProtectionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PasswordElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PasswordTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PhysicalVerificationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PhysicalVerificationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PreviousSessionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PreviousSessionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PrincipalAuthenticationMechanismElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PrincipalAuthenticationMechanismTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PrivateKeyProtectionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/PrivateKeyProtectionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ResumeSessionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ResumeSessionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SSLElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SSLTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SecretKeyProtectionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SecretKeyProtectionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SecurityAuditElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SecurityAuditTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SharedSecretChallengeResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SharedSecretChallengeResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SharedSecretDynamicPlaintextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SharedSecretDynamicPlaintextTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SmartcardElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SmartcardTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SwitchAuditElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/SwitchAuditTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/TechnicalProtectionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/TechnicalProtectionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/TimeSyncTokenElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/TimeSyncTokenTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/TokenElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/TokenTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/WTLSElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/WTLSTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/WrittenConsentElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/WrittenConsentTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ZeroKnowledgeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/impl/ZeroKnowledgeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionIDReferenceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionAbstractType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConfirmationMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementAbstractType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationDataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementAbstractType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/ActionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/ActionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AdviceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AdviceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AssertionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AssertionIDReferenceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AssertionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AttributeDesignatorElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AttributeDesignatorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AttributeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AttributeStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AttributeStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AttributeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AttributeValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AudienceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AudienceRestrictionConditionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AudienceRestrictionConditionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AuthenticationStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AuthenticationStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AuthorityBindingElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AuthorityBindingTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AuthorizationDecisionStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/AuthorizationDecisionStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/ConditionAbstractTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/ConditionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/ConditionsElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/ConditionsTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/ConfirmationMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/DoNotCacheConditionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/DoNotCacheConditionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/EvidenceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/EvidenceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/NameIdentifierElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/NameIdentifierTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/StatementAbstractTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/StatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectConfirmationDataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectConfirmationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectConfirmationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectLocalityElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectLocalityTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectStatementAbstractTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/impl/SubjectTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AssertionArtifactElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryAbstractType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestAbstractType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RespondWithElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseAbstractType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusMessageElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryAbstractType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/AssertionArtifactElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/AttributeQueryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/AttributeQueryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/AuthenticationQueryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/AuthenticationQueryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/AuthorizationDecisionQueryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/AuthorizationDecisionQueryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/QueryAbstractTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/QueryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/RequestAbstractTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/RequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/RequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/RespondWithElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/ResponseAbstractTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/ResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/ResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/StatusCodeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/StatusCodeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/StatusDetailElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/StatusDetailTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/StatusMessageElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/SubjectQueryAbstractTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/impl/SubjectQueryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AffiliationIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/GetCompleteElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPProvidedNameIdentifierElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIDPolicyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/OldProvidedNameIdentifierElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProtocolProfileElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProviderIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RelayStateElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestEnvelopeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ResponseEnvelopeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SPProvidedNameIdentifierElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AffiliationIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AssertionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AssertionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthenticationStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthenticationStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnContextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnContextTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnRequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnRequestEnvelopeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnRequestEnvelopeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnRequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnResponseEnvelopeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnResponseEnvelopeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/AuthnResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/EncryptableNameIdentifierElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/EncryptableNameIdentifierTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/EncryptedNameIdentifierElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/EncryptedNameIdentifierTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/FederationTerminationNotificationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/FederationTerminationNotificationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/GetCompleteElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/IDPEntriesElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/IDPEntriesTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/IDPEntryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/IDPEntryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/IDPListElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/IDPListTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/IDPProvidedNameIdentifierElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/LogoutRequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/LogoutRequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/LogoutResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/NameIDPolicyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/NameIdentifierMappingRequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/NameIdentifierMappingRequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/NameIdentifierMappingResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/NameIdentifierMappingResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/OldProvidedNameIdentifierElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/ProtocolProfileElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/ProviderIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/RegisterNameIdentifierRequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/RegisterNameIdentifierRequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/RegisterNameIdentifierResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/RelayStateElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/RequestAuthnContextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/RequestAuthnContextTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/RequestEnvelopeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/ResponseEnvelopeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/SPProvidedNameIdentifierElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/ScopingElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/ScopingTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/StatusResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/SubjectElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/impl/SubjectTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/AttributedString.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EncodedString.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/NonceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordString.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityHeaderType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/AttributedStringImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/BinarySecurityTokenElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/BinarySecurityTokenTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/EmbeddedElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/EmbeddedTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/EncodedStringImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/KeyIdentifierElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/KeyIdentifierTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/NonceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/PasswordElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/PasswordStringImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/ReferenceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/ReferenceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/SecurityElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/SecurityHeaderTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/SecurityTokenReferenceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/SecurityTokenReferenceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/UsernameTokenElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/impl/UsernameTokenTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/MessageAuthenticationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationDataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxySubjectElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyTransitedStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/RequesterAuthorizationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/MessageAuthenticationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ProxyInfoConfirmationDataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ProxyInfoConfirmationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ProxySubjectElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ProxyTransitedStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/RequesterAuthorizationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ResourceAccessStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ResourceAccessStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/SessionContextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/SessionContextStatementElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/SessionContextStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/SessionContextTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ValidityRestrictionConditionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/impl/ValidityRestrictionConditionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/Detail.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/BodyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/BodyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/DetailImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/EnvelopeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/EnvelopeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/FaultElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/FaultTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/HeaderElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/HeaderTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedDateTime.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedURI.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/CreatedElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ExpiresElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/AttributedDateTimeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/AttributedURIImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/CreatedElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/ExpiresElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/ReceivedElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/ReceivedTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/TimestampElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/TimestampTraceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/TimestampTraceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/impl/TimestampTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionMethodType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/TransformsType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/AgreementMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/AgreementMethodTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/CipherDataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/CipherDataTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/CipherReferenceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/CipherReferenceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptedDataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptedDataTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptedKeyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptedKeyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptedTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptionMethodTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptionPropertiesElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptionPropertiesTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptionPropertyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/EncryptionPropertyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/ReferenceListElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/ReferenceListTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/ReferenceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/impl/TransformsTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyNameElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/MgmtDataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509IssuerSerialType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/CanonicalizationMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/CanonicalizationMethodTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/DSAKeyValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/DSAKeyValueTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/DigestMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/DigestMethodTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/DigestValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/KeyInfoElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/KeyInfoTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/KeyNameElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/KeyValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/KeyValueTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/ManifestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/ManifestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/MgmtDataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/ObjectElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/ObjectTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/PGPDataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/PGPDataTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/RSAKeyValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/RSAKeyValueTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/ReferenceElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/ReferenceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/RetrievalMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/RetrievalMethodTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SPKIDataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SPKIDataTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignatureElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignatureMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignatureMethodTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignaturePropertiesElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignaturePropertiesTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignaturePropertyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignaturePropertyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignatureTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignatureValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignatureValueTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignedInfoElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/SignedInfoTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/TransformElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/TransformTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/TransformsElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/TransformsTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/X509DataElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/X509DataTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/impl/X509IssuerSerialTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateRequesterElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateSessionContextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthorizeRequesterElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DescriptionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DirectiveType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptResourceIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/InsertEntryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/RemoveEntryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceInstanceType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceTypeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/AuthenticateRequesterElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/AuthenticateSessionContextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/AuthorizeRequesterElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/DescriptionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/DirectiveTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/EncryptResourceIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/EncryptedResourceIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/EncryptedResourceIDTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/InsertEntryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ModifyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ModifyResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ModifyResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ModifyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/OptionsElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/OptionsTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/QueryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/QueryResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/QueryResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/QueryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/RemoveEntryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ResourceIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ResourceIDTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ResourceOfferingElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ResourceOfferingTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ServiceInstanceTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/ServiceTypeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/GenerateBearerTokenElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/SendSingleLogOutElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/GenerateBearerTokenElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/KeysElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/KeysTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/SendSingleLogOutElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/DiscoEntryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/impl/DiscoEntryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddrTypeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AgeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltCNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltLOElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltOElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/BirthdayElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DOBElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTDate.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTInteger.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTLocalizedString.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTMonthDay.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTString.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTURI.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DisplayLanguageElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmergencyContactElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptKeyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptedResourceIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GenderElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetMeSoundElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetSoundElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDTypeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDValueElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/InformalNameElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/JobTitleElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/KeyInfoType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LAltCNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCommentElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LEmergencyContactElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LFNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LInformalNameElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LJobTitleElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLegalNameElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LMNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LNickElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LOElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPersonalTitleElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPostalAddressElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LSNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LStElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LanguageElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalNameElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MaritalStatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgAccountElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgMethodElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgProviderElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgSubaccountElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTypeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MugShotElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NamePronouncedElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NickElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/OElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PersonalTitleElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalAddressElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalCodeElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResourceIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SNElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SignKeyElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/TimeZoneElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/WebSiteElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AddrTypeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AddressCardElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AddressCardTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AddressElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AddressTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AgeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AltCNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AltIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AltIDTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AltLOElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AltOElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AnalyzedNameElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/AnalyzedNameTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/BirthdayElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/CElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/CNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/CommonNameElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/CommonNameTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DOBElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DSTDateImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DSTIntegerImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DSTLocalizedStringImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DSTMonthDayImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DSTStringImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DSTURIImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DemographicsElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DemographicsTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/DisplayLanguageElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/EmergencyContactElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/EmploymentIdentityElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/EmploymentIdentityTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/EncryptKeyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/EncryptedResourceIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/FNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/FacadeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/FacadeTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/GenderElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/GreetMeSoundElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/GreetSoundElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/IDTypeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/IDValueElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/InformalNameElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/JobTitleElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/KeyInfoTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LAltCNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LCNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LCommentElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LEmergencyContactElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LFNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LInformalNameElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LJobTitleElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LLElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LLegalNameElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LMNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LNickElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LOElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LPersonalTitleElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LPostalAddressElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LSNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LStElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LanguageElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LegalIdentityElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LegalIdentityTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/LegalNameElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MaritalStatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ModifyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ModifyResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ModifyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgAccountElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgContactElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgContactTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgMethodElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgProviderElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgSubaccountElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgTechnologyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgTechnologyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MsgTypeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/MugShotElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/NamePronouncedElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/NickElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/OElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/PPElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/PPTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/PersonalTitleElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/PostalAddressElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/PostalCodeElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/QueryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/QueryResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/QueryResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/QueryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ResourceIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/SNElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/SignKeyElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/StElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/TimeZoneElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/VATElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/VATTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/WebSiteElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/impl/PPISExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/impl/PPISExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EncryptedResourceIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HintElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionStatementType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ParameterType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ResourceIDElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionHeaderType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/EncryptedResourceIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/HelpElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/HelpTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/HintElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InquiryElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InquiryElementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InquiryTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InteractionRequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InteractionRequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InteractionResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InteractionResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/InteractionStatementTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/ParameterTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/RedirectRequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/RedirectRequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/ResourceIDElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/SelectElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/SelectTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/TextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/TextTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/UserInteractionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/UserInteractionHeaderTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AdditionalMetadataLocationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AffiliationDescriptorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ContactType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/LocalizedURIType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationDisplayNameType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationNameType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ProviderDescriptorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/AdditionalMetadataLocationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/AffiliationDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/ContactTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/EntitiesDescriptorElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/EntitiesDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/EntityDescriptorElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/EntityDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/IDPDescriptorElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/IDPDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/KeyDescriptorElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/KeyDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/LocalizedURITypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/OrganizationDisplayNameTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/OrganizationNameTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/OrganizationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/ProviderDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/SPDescriptorElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/SPDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/RequestElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/RequestTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/ResponseElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/ResponseTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ConsentElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ConsentTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/CorrelationElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/CorrelationTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ProcessingContextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ProcessingContextTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ProviderElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/ProviderTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/UsageDirectiveElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/impl/UsageDirectiveTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/EmptyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutElement.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/CredentialsContextElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/CredentialsContextTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/ExtensionElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/ExtensionTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/ServiceInstanceUpdateElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/ServiceInstanceUpdateTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/StatusElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/StatusTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/TimeoutElementImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/impl/TimeoutTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/package.html delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/com/sun/xml/bind/Messages.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/AnyType.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/ObjectFactory.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/impl/AnyTypeImpl.java delete mode 100644 openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionIDRefElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionURIRefElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeValueElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthenticatingAuthorityElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextClassRefElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclRefElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDAbstractType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionAbstractType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAssertionElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAttributeElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedElementType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedIDElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/IssuerElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/KeyInfoConfirmationDataType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementAbstractType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ActionElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ActionTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AdviceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AdviceTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AssertionElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AssertionIDRefElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AssertionTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AssertionURIRefElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AttributeElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AttributeStatementElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AttributeStatementTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AttributeTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AttributeValueElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AudienceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AudienceRestrictionElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AudienceRestrictionTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthenticatingAuthorityElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthnContextClassRefElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthnContextDeclElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthnContextDeclRefElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthnContextElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthnContextTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthnStatementElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthnStatementTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthzDecisionStatementElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/AuthzDecisionStatementTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/BaseIDAbstractTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/BaseIDElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ConditionAbstractTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ConditionElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ConditionsElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ConditionsTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/EncryptedAssertionElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/EncryptedAttributeElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/EncryptedElementTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/EncryptedIDElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/EvidenceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/EvidenceTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/IssuerElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/KeyInfoConfirmationDataTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/NameIDElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/NameIDTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/OneTimeUseElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/OneTimeUseTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ProxyRestrictionElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/ProxyRestrictionTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/StatementAbstractTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/StatementElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectConfirmationDataElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectConfirmationDataTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectConfirmationElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectConfirmationTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectLocalityElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectLocalityTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/SubjectTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/AbstractUnmarshallingEventHandlerImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/ContentHandlerAdaptor.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/DefaultJAXBContextImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/Discarder.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/ErrorHandlerAdaptor.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfo.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoFacade.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/IdentityHashSet.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/InterleaveDispatcher.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/InterningUnmarshallerHandler.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/MSVValidator.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/MarshallerImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/NamespaceContext2.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/NamespaceContextImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/PrefixCallback.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXMarshaller.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandler.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandlerImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallableObject.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallerImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallingContext.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallingEventHandler.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallingEventHandlerAdaptor.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/Util.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/ValidatableObject.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/ValidatingUnmarshaller.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/ValidationContext.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/ValidatorImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/XMLSerializable.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/XMLSerializer.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AffiliationConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeAuthorityConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeQueryConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AuthnAuthorityConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/BaseConfigType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/IDPSSOConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/PDPConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/SPSSOConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ValueElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLAuthzDecisionQueryConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLPDPConfigElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/AffiliationConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/AttributeAuthorityConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/AttributeElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/AttributeQueryConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/AttributeTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/AuthnAuthorityConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/BaseConfigTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/EntityConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/EntityConfigTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/IDPSSOConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/PDPConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/SPSSOConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/ValueElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/XACMLAuthzDecisionQueryConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/impl/XACMLPDPConfigElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliateMemberElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ArtifactResolutionServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionConsumerServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionIDRequestServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeProfileElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnQueryServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthzServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/CompanyElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactPersonElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EmailAddressElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EncryptionMethodElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EndpointType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/GivenNameElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IndexedEndpointType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedNameType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedURIType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ManageNameIDServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDFormatElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDMappingServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationDisplayNameElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationNameElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationURLElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SSODescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceDescriptionElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceNameElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleLogoutServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleSignOnServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SurNameElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/TelephoneNumberElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzServiceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AdditionalMetadataLocationElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AdditionalMetadataLocationTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AffiliateMemberElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AffiliationDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AffiliationDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ArtifactResolutionServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AssertionConsumerServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AssertionIDRequestServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AttributeAuthorityDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AttributeAuthorityDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AttributeConsumingServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AttributeConsumingServiceTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AttributeProfileElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AttributeServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AttributeServiceTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AuthnAuthorityDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AuthnAuthorityDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AuthnQueryServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/AuthzServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/CompanyElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ContactPersonElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ContactTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/EmailAddressElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/EncryptionMethodElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/EndpointTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/EntitiesDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/EntitiesDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/EntityDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/EntityDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ExtensionsElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ExtensionsTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/GivenNameElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/IDPSSODescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/IDPSSODescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/IndexedEndpointTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/KeyDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/KeyDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/LocalizedNameTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/LocalizedURITypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ManageNameIDServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/NameIDFormatElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/NameIDMappingServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/OrganizationDisplayNameElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/OrganizationElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/OrganizationNameElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/OrganizationTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/OrganizationURLElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/PDPDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/PDPDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/QueryDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/QueryDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/RequestedAttributeElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/RequestedAttributeTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/RoleDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/RoleDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/SPSSODescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/SPSSODescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/SSODescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ServiceDescriptionElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/ServiceNameElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/SingleLogoutServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/SingleSignOnServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/SurNameElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/TelephoneNumberElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/XACMLAuthzDecisionQueryDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/XACMLAuthzDecisionQueryDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/XACMLAuthzServiceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/XACMLPDPDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/impl/XACMLPDPDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/impl/EntityAttributesElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/impl/EntityAttributesTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattrext/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ActionNamespaceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthnQueryDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthzDecisionQueryDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/QueryDescriptorType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/impl/ActionNamespaceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/impl/AttributeQueryDescriptorElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/impl/AttributeQueryDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/impl/AuthnQueryDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/impl/AuthzDecisionQueryDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/impl/QueryDescriptorTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/DiscoveryResponseElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/impl/DiscoveryResponseElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadatax509query/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/AnyType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/impl/AnyTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionMethodType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/TransformsType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/AgreementMethodElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/AgreementMethodTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/CipherDataElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/CipherDataTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/CipherReferenceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/CipherReferenceTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptedDataElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptedDataTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptedKeyElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptedKeyTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptedTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptionMethodTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptionPropertiesElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptionPropertiesTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptionPropertyElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/EncryptionPropertyTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/ReferenceListElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/ReferenceListTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/ReferenceTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/impl/TransformsTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestValueElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyNameElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/MgmtDataElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectFactory.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataElement.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509IssuerSerialType.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/CanonicalizationMethodElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/CanonicalizationMethodTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/DSAKeyValueElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/DSAKeyValueTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/DigestMethodElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/DigestMethodTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/DigestValueElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/KeyInfoElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/KeyInfoTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/KeyNameElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/KeyValueElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/KeyValueTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/ManifestElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/ManifestTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/MgmtDataElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/ObjectElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/ObjectTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/PGPDataElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/PGPDataTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/RSAKeyValueElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/RSAKeyValueTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/ReferenceElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/ReferenceTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/RetrievalMethodElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/RetrievalMethodTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SPKIDataElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SPKIDataTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignatureElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignatureMethodElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignatureMethodTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignaturePropertiesElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignaturePropertiesTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignaturePropertyElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignaturePropertyTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignatureTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignatureValueElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignatureValueTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignedInfoElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/SignedInfoTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/TransformElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/TransformTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/TransformsElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/TransformsTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/X509DataElementImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/X509DataTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/impl/X509IssuerSerialTypeImpl.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/package.html delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/xml/bind/Messages.java delete mode 100644 openam-schema/openam-saml2-schema/src/main/java/com/sun/xml/bind/unmarshaller/Messages.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/BaseConfigType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/IDPSSOConfigElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/SPSSOConfigElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ValueElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/AttributeElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/AttributeTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/BaseConfigTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/FederationConfigElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/FederationConfigTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/IDPSSOConfigElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/SPSSOConfigElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/ValueElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/AbstractUnmarshallingEventHandlerImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/ContentHandlerAdaptor.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/Discarder.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/ErrorHandlerAdaptor.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfo.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/IdentityHashSet.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/InterningUnmarshallerHandler.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/MSVValidator.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/NamespaceContextImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/PrefixCallback.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallableObject.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallerImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallingEventHandler.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallingEventHandlerAdaptor.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/Util.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/ValidatableObject.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/ValidatingUnmarshaller.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/ValidationContext.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/ValidatorImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/XMLSerializable.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/XMLSerializer.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ActionElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedQNameType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedURIType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedUnsignedLongType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FaultToElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FromElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MessageIDElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemHeaderQNameElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemIRIElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReplyToElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RetryAfterElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ToElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ActionElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/AttributedQNameTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/AttributedURITypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/AttributedUnsignedLongTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/EndpointReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/EndpointReferenceTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/FaultToElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/FromElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/MessageIDElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/MetadataElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/MetadataTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ProblemActionElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ProblemActionTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ProblemHeaderQNameElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ProblemIRIElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ReferenceParametersElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ReferenceParametersTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/RelatesToElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/RelatesToTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ReplyToElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/RetryAfterElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/impl/ToElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AdditionalContextProcessedElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AssertionType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleString.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleURI.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeServiceEndpointElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AuthenticationTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AutomaticPseudonymsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClaimType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DescriptionType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DisplayNameType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationIDElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/Freshness.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FreshnessElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNameType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuesSpecificPolicyFaultElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PsuedonymServiceEndpointElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RealmElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceDigestType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceToken11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireBearerTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireReferenceTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSharedCookiesElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSignedTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequiresGenericClaimDialectElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutBasisType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutNotificationEndpointElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutSubscriptionEndpointElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerEndpointElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerNameElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyInfoType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyTransferKeyInfoElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenSigningKeyInfoElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/WebBindingElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/AdditionalContextProcessedElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/AssertionTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/AttributeExtensibleStringImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/AttributeExtensibleURIImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/AttributeServiceEndpointElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/AuthenticationTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/AutomaticPseudonymsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ClaimTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ClientPseudonymElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ClientPseudonymTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/DescriptionTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/DisplayNameTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FederationElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FederationIDElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FederationMetadataElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FederationMetadataHandlerElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FederationMetadataHandlerTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FederationMetadataTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FederationTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FilterPseudonymsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FilterPseudonymsTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FreshnessElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/FreshnessImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/IssuerNameTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/IssuerNamesOfferedElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/IssuerNamesOfferedTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/IssuesSpecificPolicyFaultElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ProofTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ProofTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/PseudonymBasisElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/PseudonymBasisTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/PseudonymElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/PseudonymTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/PsuedonymServiceEndpointElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RealmElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ReferenceDigestTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ReferenceToken11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ReferenceTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/ReferenceTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RelativeToElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RelativeToTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequestProofTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequestProofTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequestPseudonymElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequestPseudonymTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequireBearerTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequireReferenceTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequireSharedCookiesElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequireSignedTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/RequiresGenericClaimDialectElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/SecurityTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/SecurityTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/SignOutBasisTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/SignOutElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/SignOutTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/SingleSignOutNotificationEndpointElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/SingleSignOutSubscriptionEndpointElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenIssuerEndpointElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenIssuerNameElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenKeyInfoTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenKeyTransferKeyInfoElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenSigningKeyInfoElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenTypesOfferedElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/TokenTypesOfferedTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/UriNamedClaimTypesOfferedElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/UriNamedClaimTypesOfferedTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/impl/WebBindingElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AllElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ExactlyOneElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/OperatorContentType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/AllElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/AppliesToElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/AppliesToTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/ExactlyOneElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/OperatorContentTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/PolicyAttachmentElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/PolicyAttachmentTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/PolicyElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/PolicyReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/PolicyReferenceTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/impl/PolicyTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/AttributedString.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EncodedString.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/NonceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordString.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityHeaderType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/AttributedStringImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/BinarySecurityTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/BinarySecurityTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/EmbeddedElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/EmbeddedTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/EncodedStringImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/KeyIdentifierElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/KeyIdentifierTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/NonceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/PasswordElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/PasswordStringImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/ReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/ReferenceTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/SecurityElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/SecurityHeaderTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/SecurityTokenReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/SecurityTokenReferenceTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/TransformationParametersElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/TransformationParametersTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/UsernameTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/impl/UsernameTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AbsXPathElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AlgorithmSuiteElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AsymmetricBindingElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Rsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Rsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Rsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Rsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Rsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Rsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/BootstrapPolicyElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EmptyType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptBeforeSigningElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptSignatureElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedElementsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedPartsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptionTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingEncryptedSupportingTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingSupportingTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HashPasswordElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HeaderType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpBasicAuthenticationElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpDigestAuthenticationElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpsTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IncludeTimestampElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InclusiveC14NElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorEncryptionTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorSignatureTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/KerberosTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsFirstElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsLastElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LayoutElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportClientChallengeElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportIssuedTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEmbeddedTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEncryptedKeyElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefExternalURIElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefIssuerSerialElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefKeyIdentifierElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefThumbprintElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportServerChallengeElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NestedPolicyType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NoPasswordElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/OnlySignEntireHeadersAndBodyElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectionTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/QNameAssertionType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientEncryptionTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientSignatureTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RelTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequestSecurityTokenTemplateType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientCertificateElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientEntropyElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireDerivedKeysElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireEmbeddedTokenReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExplicitDerivedKeysElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalUriReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireImplicitDerivedKeysElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireInternalReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireIssuerSerialReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireKeyIdentifierReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireRequestSecurityTokenCollectionElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireServerEntropyElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireSignatureConfirmationElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireThumbprintReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequiredElementsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SC200502SecurityContextTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SOAPNormalization10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/STRTransform10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SamlTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SePartsType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecurityContextTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SerElementsType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignatureTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedElementsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEncryptedSupportingTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingEncryptedSupportingTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingSupportingTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedPartsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedSupportingTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/StrictElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SupportingTokensElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SymmetricBindingElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TokenAssertionType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportBindingElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesRsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Rsa15Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Trust10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/UsernameTokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssGssKerberosV5ApReqToken11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssKerberosV5ApReqToken11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV20Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V1Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token11Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/X509TokenElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPath10Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPathFilter20Element.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/AbsXPathElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/AlgorithmSuiteElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/AsymmetricBindingElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic128ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic128Rsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic128Sha256ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic128Sha256Rsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic192ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic192Rsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic192Sha256ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic192Sha256Rsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic256ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic256Rsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic256Sha256ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Basic256Sha256Rsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/BootstrapPolicyElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EmptyTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EncryptBeforeSigningElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EncryptSignatureElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EncryptedElementsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EncryptedPartsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EncryptionTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EndorsingEncryptedSupportingTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/EndorsingSupportingTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/HashPasswordElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/HeaderTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/HttpBasicAuthenticationElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/HttpDigestAuthenticationElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/HttpsTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/IncludeTimestampElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/InclusiveC14NElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/InitiatorEncryptionTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/InitiatorSignatureTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/InitiatorTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/IssuedTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/IssuedTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/KerberosTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/LaxElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/LaxTsFirstElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/LaxTsLastElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/LayoutElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportClientChallengeElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportIssuedTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportRefEmbeddedTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportRefEncryptedKeyElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportRefExternalURIElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportRefIssuerSerialElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportRefKeyIdentifierElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportRefThumbprintElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/MustSupportServerChallengeElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/NestedPolicyTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/NoPasswordElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/OnlySignEntireHeadersAndBodyElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/ProtectTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/ProtectionTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/QNameAssertionTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RecipientEncryptionTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RecipientSignatureTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RecipientTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RelTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequestSecurityTokenTemplateTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireClientCertificateElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireClientEntropyElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireDerivedKeysElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireEmbeddedTokenReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireExplicitDerivedKeysElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireExternalReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireExternalUriReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireImplicitDerivedKeysElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireInternalReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireIssuerSerialReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireKeyIdentifierReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireRequestSecurityTokenCollectionElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireServerEntropyElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireSignatureConfirmationElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequireThumbprintReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/RequiredElementsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SC200502SecurityContextTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SOAPNormalization10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/STRTransform10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SamlTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SePartsTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SecureConversationTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SecureConversationTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SecurityContextTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SerElementsTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SignatureTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SignedElementsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SignedEncryptedSupportingTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SignedEndorsingEncryptedSupportingTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SignedEndorsingSupportingTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SignedPartsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SignedSupportingTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SpnegoContextTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SpnegoContextTokenTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/StrictElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SupportingTokensElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/SymmetricBindingElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/TokenAssertionTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/TransportBindingElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/TransportTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/TripleDesElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/TripleDesRsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/TripleDesSha256ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/TripleDesSha256Rsa15ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Trust10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/UsernameTokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Wss10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/Wss11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssGssKerberosV5ApReqToken11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssKerberosV5ApReqToken11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssRelV10Token10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssRelV10Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssRelV20Token10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssRelV20Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssSamlV11Token10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssSamlV11Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssSamlV20Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssUsernameToken10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssUsernameToken11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssX509Pkcs7Token10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssX509Pkcs7Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssX509PkiPathV1Token10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssX509PkiPathV1Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssX509V1Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssX509V3Token10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/WssX509V3Token11ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/X509TokenElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/XPath10ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/impl/XPathFilter20ElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedDateTime.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedURI.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/CreatedElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ExpiresElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/impl/AttributedDateTimeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/impl/AttributedURIImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/impl/CreatedElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/impl/ExpiresElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/impl/TimestampElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/impl/TimestampTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestValueElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyNameElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/MgmtDataElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectFactory.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataElement.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509IssuerSerialType.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/CanonicalizationMethodElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/CanonicalizationMethodTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/DSAKeyValueElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/DSAKeyValueTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/DigestMethodElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/DigestMethodTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/DigestValueElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/JAXBVersion.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/KeyInfoElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/KeyInfoTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/KeyNameElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/KeyValueElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/KeyValueTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/ManifestElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/ManifestTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/MgmtDataElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/ObjectElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/ObjectTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/PGPDataElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/PGPDataTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/RSAKeyValueElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/RSAKeyValueTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/ReferenceElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/ReferenceTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/RetrievalMethodElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/RetrievalMethodTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SPKIDataElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SPKIDataTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignatureElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignatureMethodElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignatureMethodTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignaturePropertiesElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignaturePropertiesTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignaturePropertyElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignaturePropertyTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignatureTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignatureValueElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignatureValueTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignedInfoElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/SignedInfoTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/TransformElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/TransformTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/TransformsElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/TransformsTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/X509DataElementImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/X509DataTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/impl/X509IssuerSerialTypeImpl.java delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/package.html delete mode 100644 openam-schema/openam-wsfederation-schema/src/main/java/com/sun/xml/bind/Messages.java diff --git a/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2.java b/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2.java index 15388f1483..a658caadd9 100644 --- a/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2.java +++ b/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2.java @@ -13,7 +13,7 @@ * * Copyright 2015-2016 ForgeRock AS. * Portions copyright 2019 Open Source Solution Technology Corporation - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.authentication.modules.saml2; @@ -222,23 +222,23 @@ private int initiateSAMLLoginAtIDP(final HttpServletResponse response, final Htt bundle.getString("samlLocalConfigFailed")); } - List ssoServiceList = idpsso.getSingleSignOnService(); + List ssoServiceList = idpsso.getValue().getSingleSignOnService(); final SingleSignOnServiceElement endPoint = SPSSOFederate .getSingleSignOnServiceEndpoint(ssoServiceList, reqBinding); - if (endPoint == null || StringUtils.isEmpty(endPoint.getLocation())) { + if (endPoint == null || StringUtils.isEmpty(endPoint.getValue().getLocation())) { throw new SAML2Exception(SAML2Utils.bundle.getString("ssoServiceNotfound")); } if (reqBinding == null) { SAML2Utils.debug.message("SAML2 :: initiateSAMLLoginAtIDP() reqBinding is null using endpoint binding: {}", - endPoint.getBinding()); - reqBinding = endPoint.getBinding(); + endPoint.getValue().getBinding()); + reqBinding = endPoint.getValue().getBinding(); if (reqBinding == null) { throw new SAML2Exception(SAML2Utils.bundle.getString("UnableTofindBinding")); } } - String ssoURL = endPoint.getLocation(); + String ssoURL = endPoint.getValue().getLocation(); SAML2Utils.debug.message("SAML2 :: initiateSAMLLoginAtIDP() ssoURL : {}", ssoURL); final List extensionsList = SPSSOFederate.getExtensionsList(spEntityID, realm); @@ -619,7 +619,7 @@ private NameID getNameId() throws SAML2Exception, AuthLoginException { final EncryptedID encId = assertionSubject.getEncryptedID(); final String spName = metaManager.getEntityByMetaAlias(metaAlias); final SPSSOConfigElement spssoconfig = metaManager.getSPSSOConfig(realm, spName); - final Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig); + final Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig.getValue()); NameID nameId = assertionSubject.getNameID(); @@ -670,7 +670,7 @@ private void linkAttributeValues(Assertion assertion, String userName) SAML2Constants.WANT_ASSERTION_ENCRYPTED)); final boolean needAttributeEncrypted = SPACSUtils.getNeedAttributeEncrypted(needAssertionEncrypted, spssoconfig); - final Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig); + final Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig.getValue()); final List attrs = SPACSUtils.getAttrs(assertion, needAttributeEncrypted, decryptionKeys); final SPAttributeMapper attrMapper = SAML2Utils.getSPAttributeMapper(realm, spName); diff --git a/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2PostAuthenticationPlugin.java b/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2PostAuthenticationPlugin.java index 8d97973d1c..ec0631c36a 100644 --- a/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2PostAuthenticationPlugin.java +++ b/openam-authentication/openam-auth-saml2/src/main/java/org/forgerock/openam/authentication/modules/saml2/SAML2PostAuthenticationPlugin.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.authentication.modules.saml2; @@ -54,8 +54,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; + import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import jakarta.xml.bind.JAXBElement; import org.forgerock.guice.core.InjectorHolder; import org.forgerock.openam.federation.saml2.SAML2TokenRepositoryException; import org.forgerock.openam.saml2.SAML2Store; @@ -178,7 +181,8 @@ private void setupSingleLogOut(SSOToken ssoToken, String metaAlias, String sessi final String binding = SAML2Constants.HTTP_REDIRECT; final IDPSSODescriptorElement idpsso = sm.getIDPSSODescriptor(realm, idpEntityId); - final List slosList = idpsso.getSingleLogoutService(); + final List slosList = idpsso.getValue().getSingleLogoutService().stream() + .map(JAXBElement::getValue).collect(Collectors.toList()); EndpointType logoutEndpoint = null; for (EndpointType endpoint : slosList) { diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/CreateMetaDataTemplate.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/CreateMetaDataTemplate.java index 958b1c1881..da9ddc68f8 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/CreateMetaDataTemplate.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/CreateMetaDataTemplate.java @@ -25,6 +25,7 @@ * $Id: CreateMetaDataTemplate.java,v 1.38 2009/10/29 00:03:50 exu Exp $ * * Portions Copyrighted 2013-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.federation.cli; @@ -60,7 +61,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** * Create Meta Data Template. diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ExportMetaData.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ExportMetaData.java index 72d25ae9fc..8d8948e3ba 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ExportMetaData.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ExportMetaData.java @@ -28,6 +28,7 @@ /** * Portions Copyrighted 2013 ForgeRock AS + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.federation.cli; @@ -63,7 +64,7 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.text.MessageFormat; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.w3c.dom.Document; import java.util.logging.Level; diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ImportMetaData.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ImportMetaData.java index 9da7f576b5..a6db340802 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ImportMetaData.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/federation/cli/ImportMetaData.java @@ -25,6 +25,7 @@ * $Id: ImportMetaData.java,v 1.15 2009/10/29 00:03:50 exu Exp $ * * Portions Copyrighted 2012-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.federation.cli; @@ -62,7 +63,10 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; -import javax.xml.bind.JAXBException; +import java.util.stream.Collectors; + +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import org.forgerock.openam.utils.CollectionUtils; import org.forgerock.openam.utils.StringUtils; @@ -185,9 +189,10 @@ private void handleSAML2Request(RequestContext rc) * see note at the end of this class for how we decide * the realm value */ - if (configElt != null && configElt.isHosted()) { - List config = configElt. - getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + if (configElt != null && configElt.getValue().isHosted()) { + List config = configElt.getValue(). + getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig() + .stream().map(JAXBElement::getValue).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(config)) { realm = SAML2MetaUtils.getRealmByMetaAlias(config.get(0).getMetaAlias()); newMetaAliases = getMetaAliases(config); @@ -256,18 +261,18 @@ private void handleIDFFRequest(RequestContext rc) * see note at the end of this class for how we decide * the realm value */ - if ((configElt != null) && configElt.isHosted()) { + if ((configElt != null) && configElt.getValue().isHosted()) { IDPDescriptorConfigElement idpConfig = IDFFMetaUtils.getIDPDescriptorConfig(configElt); if (idpConfig != null) { realm = SAML2MetaUtils.getRealmByMetaAlias( - idpConfig.getMetaAlias()); + idpConfig.getValue().getMetaAlias()); } else { SPDescriptorConfigElement spConfig = IDFFMetaUtils.getSPDescriptorConfig(configElt); if (spConfig != null) { realm = SAML2MetaUtils.getRealmByMetaAlias( - spConfig.getMetaAlias()); + spConfig.getValue().getMetaAlias()); } } } @@ -316,9 +321,10 @@ private void handleWSFedRequest(RequestContext rc) * see note at the end of this class for how we decide * the realm value */ - if (configElt != null && configElt.isHosted()) { + if (configElt != null && configElt.getValue().isHosted()) { List config = - configElt.getIDPSSOConfigOrSPSSOConfig(); + configElt.getValue().getIDPSSOConfigOrSPSSOConfig() + .stream().map(JAXBElement::getValue).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(config)) { realm = WSFederationMetaUtils.getRealmByMetaAlias(config.get(0).getMetaAlias()); newMetaAliases = getMetaAliasesWsFed(config); @@ -454,7 +460,7 @@ private String importIDFFMetaData(String realm, IDFFMetaManager metaManager) descriptor = (com.sun.identity.liberty.ws.meta.jaxb.EntityDescriptorElement) obj; - entityID = descriptor.getProviderID(); + entityID = descriptor.getValue().getProviderID(); //TODO: signature //SAML2MetaSecurityUtils.verifySignature(doc); // @@ -514,14 +520,14 @@ private String importWSFedMetaData() if (obj instanceof com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement) { // Just get the first element for now... // TODO - loop through Federation elements? - obj = ((com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement)obj).getAny().get(0); + obj = ((com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement)obj).getValue().getAny().get(0); } if (obj instanceof com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement) { com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement federation = (com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement)obj; - federationID = federation.getFederationID(); + federationID = federation.getValue().getFederationID(); if ( federationID == null ) { federationID = WSFederationConstants.DEFAULT_FEDERATION_ID; diff --git a/openam-clientsdk/pom.xml b/openam-clientsdk/pom.xml index f28e9a37e6..2a639d5896 100755 --- a/openam-clientsdk/pom.xml +++ b/openam-clientsdk/pom.xml @@ -13,7 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions copyright 2017-2023 3A Systems LLC + * Portions copyright 2017-2026 3A Systems LLC * --> @@ -143,9 +143,8 @@ joda-time:joda-time org.slf4j:slf4j-api external:jdmkrt - javax.xml.bind:jaxb-api - com.sun.xml.bind:jaxb-core - com.sun.xml.bind:jaxb-impl + jakarta.xml.bind:jaxb-api + org.glassfish.jaxb:jaxb-runtime diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/SAMLv2SPServicesViewBean.java b/openam-console/src/main/java/com/sun/identity/console/federation/SAMLv2SPServicesViewBean.java index bdbb0f3b8e..8989d8f263 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/SAMLv2SPServicesViewBean.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/SAMLv2SPServicesViewBean.java @@ -23,7 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: SAMLv2SPServicesViewBean.java,v 1.5 2008/12/11 18:51:51 babysunil Exp $ - * + * + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.console.federation; @@ -161,15 +162,15 @@ private void populateAssertionConsumer(List assertionConServices) { AssertionConsumerServiceElement acsElem = (AssertionConsumerServiceElement) assertionConServices.get(i); tblAssertionConsumerModel.setValue( - TBL_DATA_DEFAULT, String.valueOf(acsElem.isIsDefault())); + TBL_DATA_DEFAULT, String.valueOf(acsElem.getValue().isIsDefault())); tblAssertionConsumerModel.setValue(TBL_DATA_TYPE, ( - (acsElem.getBinding()).substring(37))); + (acsElem.getValue().getBinding()).substring(37))); tblAssertionConsumerModel.setValue(TBL_DATA_LABEL, ( - (acsElem.getBinding()).substring(37))); + (acsElem.getValue().getBinding()).substring(37))); tblAssertionConsumerModel.setValue(TBL_DATA_LOCATION, - acsElem.getLocation()); + acsElem.getValue().getLocation()); tblAssertionConsumerModel.setValue(TBL_DATA_INDEX, - Integer.toString(acsElem.getIndex())); + Integer.toString(acsElem.getValue().getIndex())); } } @@ -251,10 +252,10 @@ private List updateWithAssertionServiceVlues() setInlineAlertMessage(CCAlert.TYPE_ERROR, "message.error", e.getMessage()); } - acsElem.setBinding(binding); - acsElem.setIsDefault(theValue); - acsElem.setIndex(Integer.parseInt(index)); - acsElem.setLocation(location); + acsElem.getValue().setBinding(binding); + acsElem.getValue().setIsDefault(theValue); + acsElem.getValue().setIndex(Integer.parseInt(index)); + acsElem.getValue().setLocation(location); asconsServiceList.add(acsElem); } diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/CreateMetaDataModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/CreateMetaDataModelImpl.java index a52c054667..f43e6c904b 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/CreateMetaDataModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/CreateMetaDataModelImpl.java @@ -25,7 +25,7 @@ * $Id: CreateMetaDataModelImpl.java,v 1.7 2010/01/06 23:11:25 veiming Exp $ * * Portions Copyrighted 2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.federation.model; @@ -60,7 +60,7 @@ import java.util.Map; import java.util.Set; import jakarta.servlet.http.HttpServletRequest; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; public class CreateMetaDataModelImpl extends AMModelBase implements CreateMetaDataModel @@ -173,7 +173,7 @@ public void createWSFedProvider(String realm, String entityId, Map values) FederationElement elt = (FederationElement) WSFederationMetaUtils.convertStringToJAXB(metadata); - String federationID = elt.getFederationID(); + String federationID = elt.getValue().getFederationID(); if (federationID == null) { federationID = WSFederationConstants.DEFAULT_FEDERATION_ID; } diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/EntityModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/EntityModelImpl.java index 130edaf882..df75476939 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/EntityModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/EntityModelImpl.java @@ -24,7 +24,7 @@ * * $Id: EntityModelImpl.java,v 1.20 2009/12/25 09:13:22 babysunil Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. * */ @@ -397,7 +397,7 @@ public List getWSFedRoles(String entity, String realm) { FederationElement fedElem = metaManager.getEntityDescriptor(realm, entity); if (fedElem != null) { - for (Iterator iter = fedElem.getAny().iterator(); + for (Iterator iter = fedElem.getValue().getAny().iterator(); iter.hasNext(); ) { Object o = iter.next(); diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/IDFFModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/IDFFModelImpl.java index aed9d1df8c..0e306aa247 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/IDFFModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/IDFFModelImpl.java @@ -24,7 +24,7 @@ * * $Id: IDFFModelImpl.java,v 1.9 2009/11/10 01:19:49 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. * */ package com.sun.identity.console.federation.model; @@ -61,43 +61,43 @@ import java.util.Map; import java.util.Set; import jakarta.servlet.http.HttpServletRequest; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; public class IDFFModelImpl extends EntityModelImpl implements IDFFModel { private IDFFMetaManager metaManager; - private static Map extendedMetaMap = new HashMap(24); - private static Map extendedMetaIdpMap = new HashMap(9); - private static Map extendedMetaSpMap = new HashMap(13); - private static List federationTerminationProfileList = new ArrayList(2); + private static Map extendedMetaMap = new HashMap<>(24); + private static Map extendedMetaIdpMap = new HashMap<>(9); + private static Map extendedMetaSpMap = new HashMap<>(13); + private static List federationTerminationProfileList = new ArrayList<>(2); static { federationTerminationProfileList.add("http://projectliberty.org/profiles/fedterm-sp-http"); federationTerminationProfileList.add("http://projectliberty.org/profiles/fedterm-sp-soap"); } - private static List singleLogoutProfileList = new ArrayList(3); + private static List singleLogoutProfileList = new ArrayList<>(3); static { singleLogoutProfileList.add("http://projectliberty.org/profiles/slo-sp-http"); singleLogoutProfileList.add("http://projectliberty.org/profiles/slo-idp-http-get"); singleLogoutProfileList.add("http://projectliberty.org/profiles/slo-sp-soap"); } - private static List nameRegistrationProfileList = new ArrayList(2); + private static List nameRegistrationProfileList = new ArrayList<>(2); static { nameRegistrationProfileList.add("http://projectliberty.org/profiles/rni-sp-http"); nameRegistrationProfileList.add("http://projectliberty.org/profiles/rni-sp-soap"); } - private static List federationProfileList = new ArrayList(3); + private static List federationProfileList = new ArrayList<>(3); static { federationProfileList.add("http://projectliberty.org/profiles/brws-post"); federationProfileList.add("http://projectliberty.org/profiles/brws-art"); federationProfileList.add("http://projectliberty.org/profiles/lecp"); } - private static List supportedSSOProfileList = new ArrayList(4); + private static List supportedSSOProfileList = new ArrayList<>(4); static { supportedSSOProfileList.add("http://projectliberty.org/profiles/brws-post"); @@ -238,9 +238,9 @@ public Map getCommonAttributeValues(String realm, String entityName) EntityDescriptorElement desc = manager.getEntityDescriptor( realm, entityName); values.put(ATTR_VALID_UNTIL, returnEmptySetIfValueIsNull( - desc.getValidUntil())); + desc.getValue().getValidUntil())); values.put(ATTR_CACHE_DURATION, returnEmptySetIfValueIsNull( - desc.getCacheDuration())); + desc.getValue().getCacheDuration())); logEvent("SUCCEED_GET_ENTITY_DESCRIPTOR_ATTR_VALUES", param); } catch (IDFFMetaException e) { String[] paramsEx = {realm, entityName, "IDFF", "General", @@ -271,9 +271,9 @@ public void modifyEntityProfile(String realm, String entityName, Map map) EntityDescriptorElement desc = manager.getEntityDescriptor( realm, entityName); - desc.setValidUntil((String) AMAdminUtils.getValue( + desc.getValue().setValidUntil((String) AMAdminUtils.getValue( (Set) map.get(ATTR_VALID_UNTIL))); - desc.setCacheDuration((String) AMAdminUtils.getValue( + desc.getValue().setCacheDuration((String) AMAdminUtils.getValue( (Set) map.get(ATTR_CACHE_DURATION))); manager.setEntityDescriptor(realm, desc); @@ -421,8 +421,8 @@ public Map getEntitySPDescriptor(String realm, String entityName) returnEmptySetIfValueIsNull((String) pDesc.getRegisterNameIdentifierProtocolProfile().get(0))); // only for Service Provider - com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerServiceURLType assertionType = - (com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerServiceURLType) ((List) pDesc.getAssertionConsumerServiceURL()).get(0); + com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerServiceURL assertionType = + (com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerServiceURL) ((List) pDesc.getAssertionConsumerServiceURL()).get(0); if (assertionType != null) { map.put(ATTR_ASSERTION_CUSTOMER_SERVICE_URIID, returnEmptySetIfValueIsNull(assertionType.getId())); @@ -494,7 +494,7 @@ public Map getIDPEntityConfig( String metaAlias = null; BaseConfigType idpConfig = - manager.getIDPDescriptorConfig(realm, entityName); + manager.getIDPDescriptorConfig(realm, entityName).getValue(); if (idpConfig != null) { map = IDFFMetaUtils.getAttributes(idpConfig); metaAlias = idpConfig.getMetaAlias(); @@ -562,7 +562,7 @@ public Map getSPEntityConfig( String metaAlias = null; BaseConfigType spConfig = - manager.getSPDescriptorConfig(realm, entityName); + manager.getSPDescriptorConfig(realm, entityName).getValue(); if (spConfig != null) { map = IDFFMetaUtils.getAttributes(spConfig); metaAlias = spConfig.getMetaAlias(); @@ -734,8 +734,8 @@ public void updateEntitySPDescriptor( (Set) attrValues.get(ATTR_AUTHN_REQUESTS_SIGNED)); com.sun.identity.liberty.ws.meta.jaxb.ObjectFactory objFactory = new com.sun.identity.liberty.ws.meta.jaxb.ObjectFactory(); - com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerServiceURLType assertionType = - objFactory.createSPDescriptorTypeAssertionConsumerServiceURLType(); + com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerServiceURL assertionType = + objFactory.createSPDescriptorTypeAssertionConsumerServiceURL(); assertionType.setId(id); assertionType.setValue(value); if (isDefault.equals("true")) { @@ -751,8 +751,8 @@ public void updateEntitySPDescriptor( pDesc.setAuthnRequestsSigned(false); } - entityDescriptor.getSPDescriptor().clear(); - entityDescriptor.getSPDescriptor().add(pDesc); + entityDescriptor.getValue().getSPDescriptor().clear(); + entityDescriptor.getValue().getSPDescriptor().add(pDesc); idffManager.setEntityDescriptor(realm, entityDescriptor); logEvent("SUCCEED_MODIFY_ENTITY_DESCRIPTOR", params); } catch (IDFFMetaException e) { @@ -762,14 +762,6 @@ public void updateEntitySPDescriptor( {realm, entityName, "IDFF", "SP-Standard Metadata", strError}; logEvent("FEDERATION_EXCEPTION_MODIFY_ENTITY_DESCRIPTOR", paramsEx); throw new AMConsoleException(strError); - } catch (JAXBException e) { - debug.error("JAXBException, updateEntitySPDescriptor"); - String strError = getErrorString(e); - String[] paramsEx = - {realm, entityName, "IDFF", "SP-Standard Metadata", strError}; - logEvent("FEDERATION_EXCEPTION_MODIFY_ENTITY_DESCRIPTOR", paramsEx); - throw new AMConsoleException(strError); - } } @@ -896,8 +888,8 @@ public void updateEntityIDPDescriptor( } - entityDescriptor.getIDPDescriptor().clear(); - entityDescriptor.getIDPDescriptor().add(pDesc); + entityDescriptor.getValue().getIDPDescriptor().clear(); + entityDescriptor.getValue().getIDPDescriptor().add(pDesc); idffManager.setEntityDescriptor(realm, entityDescriptor); logEvent("SUCCEED_MODIFY_ENTITY_DESCRIPTOR", params); } catch (IDFFMetaException e) { @@ -916,11 +908,11 @@ private void updateAttrInConfig( List attrList = baseConfig.getAttribute(); for (Iterator i = attrList.iterator(); i.hasNext();) { AttributeElement avpnew = (AttributeElement) i.next(); - String name = avpnew.getName(); + String name = avpnew.getValue().getName(); Set set = (Set) values.get(name); if (set != null) { - avpnew.getValue().clear(); - avpnew.getValue().addAll(set); + avpnew.getValue().getValue().clear(); + avpnew.getValue().getValue().addAll(set); } } } @@ -955,7 +947,7 @@ public void updateIDPEntityConfig( throw new AMConsoleException("invalid.config.element"); } else { updateAttrInConfig( - idpDecConfigElement, + idpDecConfigElement.getValue(), attrValues, EntityModel.IDENTITY_PROVIDER); } @@ -1009,7 +1001,7 @@ public void updateSPEntityConfig( } else { // update sp entity config updateAttrInConfig( - spDecConfigElement, + spDecConfigElement.getValue(), attrValues, EntityModel.SERVICE_PROVIDER); //handle supported sso profile @@ -1026,7 +1018,7 @@ public void updateSPEntityConfig( } } updateAttrInConfig( - spDecConfigElement, + spDecConfigElement.getValue(), ATTR_SUPPORTED_SSO_PROFILE, supportedSSOProfileList); } @@ -1082,7 +1074,7 @@ public void updateIDPAuthenticationContexts( throw new AMConsoleException("invalid.config.element"); } else { updateAttrInConfig( - idpDecConfigElement, + idpDecConfigElement.getValue(), ATTR_IDP_AUTHN_CONTEXT_MAPPING, list); } @@ -1142,7 +1134,7 @@ public void updateSPAuthenticationContexts( } else { // update sp entity config updateAttrInConfig( - spDecConfigElement, + spDecConfigElement.getValue(), ATTR_SP_AUTHN_CONTEXT_MAPPING, list); } @@ -1172,10 +1164,10 @@ private void updateAttrInConfig( List attrList = baseConfig.getAttribute(); for (Iterator i = attrList.iterator(); i.hasNext();) { AttributeElement avpnew = (AttributeElement) i.next(); - String name = avpnew.getName(); + String name = avpnew.getValue().getName(); if (name.equals(attributeName)) { - avpnew.getValue().clear(); - avpnew.getValue().addAll(list); + avpnew.getValue().getValue().clear(); + avpnew.getValue().getValue().addAll(list); } } } @@ -1185,10 +1177,10 @@ private BaseConfigType addAttributeType(Map values, BaseConfigType bctype) ObjectFactory objFactory = new ObjectFactory(); for (Iterator iter = values.keySet().iterator(); iter.hasNext();) { - AttributeType avp = objFactory.createAttributeElement(); + AttributeElement avp = objFactory.createAttributeElement(objFactory.createAttributeType()); String key = (String) iter.next(); - avp.setName(key); - avp.getValue().addAll(Collections.EMPTY_LIST); + avp.getValue().setName(key); + avp.getValue().getValue().addAll(Collections.EMPTY_LIST); bctype.getAttribute().add(avp); } return bctype; @@ -1206,7 +1198,7 @@ private void updateAttrInConfig( BaseConfigType baseConfig, Map values, String role) throws JAXBException, AMConsoleException { - List attrList = baseConfig.getAttribute(); + List attrList = baseConfig.getAttribute(); if (role.equals(EntityModel.IDENTITY_PROVIDER)) { attrList.clear(); baseConfig = addAttributeType( @@ -1220,14 +1212,14 @@ private void updateAttrInConfig( baseConfig); attrList = baseConfig.getAttribute(); } - for (Iterator it = attrList.iterator(); it.hasNext();) { - AttributeElement avpnew = (AttributeElement) it.next(); - String name = avpnew.getName(); + for (Iterator it = attrList.iterator(); it.hasNext();) { + AttributeElement avpnew = it.next(); + String name = avpnew.getValue().getName(); if (values.keySet().contains(name)) { Set set = (Set) values.get(name); if (set != null) { - avpnew.getValue().clear(); - avpnew.getValue().addAll(set); + avpnew.getValue().getValue().clear(); + avpnew.getValue().getValue().addAll(set); } } } @@ -1252,7 +1244,7 @@ public IDFFAuthContexts getIDPAuthenticationContexts( Map map = new HashMap(); BaseConfigType idpConfig = - manager.getIDPDescriptorConfig(realm, entityName); + manager.getIDPDescriptorConfig(realm, entityName).getValue(); if (idpConfig != null) { map = IDFFMetaUtils.getAttributes(idpConfig); } else { @@ -1311,7 +1303,7 @@ public IDFFAuthContexts getSPAuthenticationContexts( Map map = new HashMap(); BaseConfigType spConfig = - manager.getSPDescriptorConfig(realm, entityName); + manager.getSPDescriptorConfig(realm, entityName).getValue(); if (spConfig != null) { map = IDFFMetaUtils.getAttributes(spConfig); } else { @@ -1355,13 +1347,13 @@ public void createEntityConfig( idffMetaMgr.getEntityConfig(realm, entityName); if (entityConfig == null) { entityConfig = - objFactory.createEntityConfigElement(); + objFactory.createEntityConfigElement(objFactory.createEntityConfigType()); // add to entityConfig - entityConfig.setEntityID(entityName); + entityConfig.getValue().setEntityID(entityName); if (location.equals("remote")) { - entityConfig.setHosted(false); + entityConfig.getValue().setHosted(false); } else { - entityConfig.setHosted(true); + entityConfig.getValue().setHosted(true); } } @@ -1372,29 +1364,29 @@ public void createEntityConfig( // It could have one sp and one idp. if ((role.equals(IFSConstants.SP)) && (IDFFMetaUtils.getSPDescriptor(entityDesc) != null)) { - baseCfgType = objFactory.createSPDescriptorConfigElement(); + baseCfgType = new BaseConfigType() {}; - for (Iterator iter = extendedMetaMap.keySet().iterator(); - iter.hasNext();) { + for (Iterator iter = extendedMetaMap.keySet().iterator(); + iter.hasNext();) { AttributeType atype = objFactory.createAttributeType(); - String key = (String) iter.next(); + String key = iter.next(); atype.setName(key); atype.getValue().addAll(Collections.EMPTY_LIST); - baseCfgType.getAttribute().add(atype); + baseCfgType.getAttribute().add(objFactory.createAttributeElement(atype)); } - for (Iterator iter = extendedMetaSpMap.keySet().iterator(); - iter.hasNext();) { + for (Iterator iter = extendedMetaSpMap.keySet().iterator(); + iter.hasNext();) { AttributeType atype = objFactory.createAttributeType(); String key = (String) iter.next(); atype.setName(key); atype.getValue().addAll(Collections.EMPTY_LIST); - baseCfgType.getAttribute().add(atype); + baseCfgType.getAttribute().add(objFactory.createAttributeElement(atype)); } - entityConfig.getSPDescriptorConfig().add(baseCfgType); + entityConfig.getValue().getSPDescriptorConfig().add(objFactory.createSPDescriptorConfigElement(baseCfgType)); } else if ((role.equals(IFSConstants.IDP)) && (IDFFMetaUtils.getIDPDescriptor(entityDesc) != null)) { - baseCfgType = objFactory.createIDPDescriptorConfigElement(); + baseCfgType = new BaseConfigType() {}; for (Iterator iter = extendedMetaMap.keySet().iterator(); iter.hasNext();) { @@ -1402,7 +1394,7 @@ public void createEntityConfig( String key = (String) iter.next(); atype.setName(key); atype.getValue().addAll(Collections.EMPTY_LIST); - baseCfgType.getAttribute().add(atype); + baseCfgType.getAttribute().add(objFactory.createAttributeElement(atype)); } for (Iterator iter = extendedMetaIdpMap.keySet().iterator(); @@ -1411,15 +1403,13 @@ public void createEntityConfig( String key = (String) iter.next(); atype.setName(key); atype.getValue().addAll(Collections.EMPTY_LIST); - baseCfgType.getAttribute().add(atype); + baseCfgType.getAttribute().add(objFactory.createAttributeElement(atype)); } - entityConfig.getIDPDescriptorConfig().add(baseCfgType); + entityConfig.getValue().getIDPDescriptorConfig().add(objFactory.createIDPDescriptorConfigElement(baseCfgType)); } idffMetaMgr.setEntityConfig(realm, entityConfig); } catch (IDFFMetaException e) { throw new AMConsoleException(getErrorString(e)); - } catch (JAXBException e) { - throw new AMConsoleException(getErrorString(e)); } } @@ -1503,7 +1493,7 @@ public Map getAffiliateProfileAttributeValues( BaseConfigType affiliationConfig = idffManager.getAffiliationDescriptorConfig( realm, - entityName); + entityName).getValue(); if (affiliationConfig != null) { Map map = IDFFMetaUtils.getAttributes(affiliationConfig); @@ -1575,7 +1565,7 @@ public void updateAffiliateProfile( EntityDescriptorElement entityDescriptor = idffManager.getEntityDescriptor(realm, entityName); AffiliationDescriptorType aDesc = - entityDescriptor.getAffiliationDescriptor(); + entityDescriptor.getValue().getAffiliationDescriptor(); aDesc.setAffiliationOwnerID( (String) AMAdminUtils.getValue((Set) values.get( @@ -1598,7 +1588,7 @@ public void updateAffiliateProfile( aDesc.getAffiliateMember().add(newMember); } - entityDescriptor.setAffiliationDescriptor(aDesc); + entityDescriptor.getValue().setAffiliationDescriptor(aDesc); idffManager.setEntityDescriptor(realm, entityDescriptor); logEvent("SUCCEED_MODIFY_AFFILIATE_ENTITY_DESCRIPTOR", params); } catch (IDFFMetaException e) { diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/ImportEntityModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/ImportEntityModelImpl.java index 378a2519f2..46e0756efe 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/ImportEntityModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/ImportEntityModelImpl.java @@ -25,7 +25,7 @@ * $Id: ImportEntityModelImpl.java,v 1.11 2009/11/10 01:19:49 exu Exp $ * * Portions Copyrighted 2012-2014 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.federation.model; @@ -46,7 +46,7 @@ import com.sun.identity.workflow.WorkflowException; import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import jakarta.servlet.http.HttpServletRequest; import org.w3c.dom.Document; @@ -138,9 +138,9 @@ private void createSAMLv2Entity() throws AMConsoleException { if (extendedMetaData != null) { configElt = getEntityConfigElement(); - if (configElt != null && configElt.isHosted()) { + if (configElt != null && configElt.getValue().isHosted()) { List config = - configElt.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + configElt.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); if (!config.isEmpty()) { BaseConfigType bConfig = (BaseConfigType) config.iterator().next(); @@ -189,7 +189,7 @@ private void importWSFedMetaData() Object obj = WSFederationMetaUtils.convertStringToJAXB(standardMetaData); if (obj instanceof com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement) { - obj = ((com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement)obj).getAny().get(0); + obj = ((com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement)obj).getValue().getAny().get(0); } if (obj instanceof com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement) { @@ -236,18 +236,18 @@ private void createIDFFEntity() throws AMConsoleException { if (extendedMetaData != null) { configElt = getIDFFEntityConfigElement(); - if ((configElt != null) && configElt.isHosted()) { + if ((configElt != null) && configElt.getValue().isHosted()) { IDPDescriptorConfigElement idpConfig = IDFFMetaUtils.getIDPDescriptorConfig(configElt); if (idpConfig != null) { SAML2MetaUtils.getRealmByMetaAlias( - idpConfig.getMetaAlias()); + idpConfig.getValue().getMetaAlias()); } else { SPDescriptorConfigElement spConfig = IDFFMetaUtils.getSPDescriptorConfig(configElt); if (spConfig != null) { SAML2MetaUtils.getRealmByMetaAlias( - spConfig.getMetaAlias()); + spConfig.getValue().getMetaAlias()); } } } @@ -310,8 +310,8 @@ private void createWSFedEntity() throws AMConsoleException { * see note at the end of this class for how we decide * the realm value */ - if (configElt != null && configElt.isHosted()) { - List config = configElt.getIDPSSOConfigOrSPSSOConfig(); + if (configElt != null && configElt.getValue().isHosted()) { + List config = configElt.getValue().getIDPSSOConfigOrSPSSOConfig(); if (!config.isEmpty()) { com.sun.identity.wsfederation.jaxb.entityconfig.BaseConfigType bConfig = (com.sun.identity.wsfederation.jaxb.entityconfig.BaseConfigType) diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java index 91d74539f1..3a10d477dc 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java @@ -26,7 +26,7 @@ * * Portions Copyrighted 2010-2015 ForgeRock AS. * Portions Copyrighted 2015 Nomura Research Institute, Ltd. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.federation.model; @@ -78,7 +78,8 @@ import com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType; import com.sun.identity.shared.datastruct.OrderedSet; import com.sun.identity.console.federation.SAMLv2AuthContexts; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import org.apache.xml.security.encryption.XMLCipher; import org.forgerock.openam.utils.StringUtils; @@ -495,24 +496,24 @@ public Map getStandardIdentityProviderAttributes( // retrieve WantAuthnRequestsSigned map.put(WANT_AUTHN_REQ_SIGNED,returnEmptySetIfValueIsNull( - idpssoDescriptor.isWantAuthnRequestsSigned())); + idpssoDescriptor.getValue().isWantAuthnRequestsSigned())); //retrieve ArtifactResolutionService map.put(ART_RES_LOCATION, Collections.EMPTY_SET); map.put(ART_RES_INDEX, Collections.EMPTY_SET); map.put(ART_RES_ISDEFAULT, Collections.EMPTY_SET); List artList = - idpssoDescriptor.getArtifactResolutionService(); + idpssoDescriptor.getValue().getArtifactResolutionService(); if (!artList.isEmpty()) { ArtifactResolutionServiceElement key = (ArtifactResolutionServiceElement)artList.get(0); map.put(ART_RES_LOCATION, - returnEmptySetIfValueIsNull(key.getLocation())); + returnEmptySetIfValueIsNull(key.getValue().getLocation())); map.put(ART_RES_INDEX, returnEmptySetIfValueIsNull(Integer.toString( - key.getIndex()))); + key.getValue().getIndex()))); map.put(ART_RES_ISDEFAULT, - returnEmptySetIfValueIsNull(key.isIsDefault())); + returnEmptySetIfValueIsNull(key.getValue().isIsDefault())); } //retrieve SingleLogoutService map.put(SINGLE_LOGOUT_HTTP_LOCATION, Collections.EMPTY_SET); @@ -523,11 +524,11 @@ public Map getStandardIdentityProviderAttributes( map.put(SINGLE_LOGOUT_SOAP_LOCATION, Collections.EMPTY_SET); map.put(SINGLE_LOGOUT_DEFAULT, Collections.EMPTY_SET); - List logoutList = idpssoDescriptor.getSingleLogoutService(); + List logoutList = idpssoDescriptor.getValue().getSingleLogoutService(); for (int i=0; i> getExtendedIdentityProviderAttributes( SAML2MetaManager samlManager = getSAML2MetaManager(); idpssoConfig = samlManager.getIDPSSOConfig(realm,entityName); if (idpssoConfig != null) { - BaseConfigType baseConfig = (BaseConfigType)idpssoConfig; + BaseConfigType baseConfig = idpssoConfig.getValue(); map = SAML2MetaUtils.getAttributes(baseConfig); } logEvent("SUCCEED_GET_ENTITY_DESCRIPTOR_ATTR_VALUES", params); @@ -718,13 +719,13 @@ public String getMetaalias( if (role.equals(EntityModel.IDENTITY_PROVIDER)) { idpssoConfig = samlManager.getIDPSSOConfig(realm,entityName); if (idpssoConfig != null) { - BaseConfigType baseConfig = (BaseConfigType)idpssoConfig; + BaseConfigType baseConfig = idpssoConfig.getValue(); metaAlias = baseConfig.getMetaAlias(); } } else if (role.equals(EntityModel.SERVICE_PROVIDER)) { spssoConfig = samlManager.getSPSSOConfig(realm,entityName); if (spssoConfig != null) { - BaseConfigType baseConfig = (BaseConfigType)spssoConfig; + BaseConfigType baseConfig = spssoConfig.getValue(); metaAlias = baseConfig.getMetaAlias(); } } @@ -767,10 +768,10 @@ public Map getStandardServiceProviderAttributes( // retrieve WantAuthnRequestsSigned map.put(IS_AUTHN_REQ_SIGNED, returnEmptySetIfValueIsNull( - spssoDescriptor.isAuthnRequestsSigned())); + spssoDescriptor.getValue().isAuthnRequestsSigned())); map.put(WANT_ASSERTIONS_SIGNED, returnEmptySetIfValueIsNull( - spssoDescriptor.isWantAssertionsSigned())); + spssoDescriptor.getValue().isWantAssertionsSigned())); //retrieve SingleLogoutService map.put(SP_SINGLE_LOGOUT_HTTP_LOCATION, Collections.EMPTY_SET); @@ -780,11 +781,11 @@ public Map getStandardServiceProviderAttributes( map.put(SP_SLO_POST_RESPLOC, Collections.EMPTY_SET); map.put(SP_SINGLE_LOGOUT_SOAP_LOCATION, Collections.EMPTY_SET); map.put(SP_LOGOUT_DEFAULT, Collections.EMPTY_SET); - List splogoutList = spssoDescriptor.getSingleLogoutService(); + List splogoutList = spssoDescriptor.getValue().getSingleLogoutService(); for (int i=0; i artList = idpssoDescriptor.getValue().getArtifactResolutionService(); if (artList.isEmpty()) { elem = - objFact.createArtifactResolutionServiceElement(); - elem.setBinding(soapBinding); - elem.setLocation(""); - elem.setIndex(0); - elem.setIsDefault(false); - idpssoDescriptor.getArtifactResolutionService().add(elem); + objFact.createArtifactResolutionServiceElement(objFact.createIndexedEndpointType()); + elem.getValue().setBinding(soapBinding); + elem.getValue().setLocation(""); + elem.getValue().setIndex(0); + elem.getValue().setIsDefault(false); + idpssoDescriptor.getValue().getArtifactResolutionService().add(elem); artList = - idpssoDescriptor.getArtifactResolutionService(); + idpssoDescriptor.getValue().getArtifactResolutionService(); } - elem = (ArtifactResolutionServiceElement)artList.get(0); - elem.setLocation(artLocation); - elem.setIndex(Integer.parseInt(indexValue)); - elem.setIsDefault(isDefault); - idpssoDescriptor. + elem = artList.get(0); + elem.getValue().setLocation(artLocation); + elem.getValue().setIndex(Integer.parseInt(indexValue)); + elem.getValue().setIsDefault(isDefault); + idpssoDescriptor.getValue(). getArtifactResolutionService().clear(); - idpssoDescriptor. + idpssoDescriptor.getValue(). getArtifactResolutionService().add(elem); } @@ -1067,7 +1059,7 @@ public void setIDPStdAttributeValues( } } - List logList = idpssoDescriptor.getSingleLogoutService(); + List logList = idpssoDescriptor.getValue().getSingleLogoutService(); if (!logList.isEmpty()) { logList.clear(); @@ -1123,7 +1115,7 @@ public void setIDPStdAttributeValues( } List manageNameIdList = - idpssoDescriptor.getManageNameIDService(); + idpssoDescriptor.getValue().getManageNameIDService(); if (!manageNameIdList.isEmpty()) { manageNameIdList.clear(); @@ -1156,30 +1148,30 @@ public void setIDPStdAttributeValues( idpStdValues, NAME_ID_MAPPPING); NameIDMappingServiceElement namidElem1 = null; List nameIDmappingList = - idpssoDescriptor.getNameIDMappingService(); + idpssoDescriptor.getValue().getNameIDMappingService(); if (nameIDmappingList.isEmpty()) { namidElem1 = - objFact.createNameIDMappingServiceElement(); - namidElem1.setBinding(soapBinding); - idpssoDescriptor.getNameIDMappingService(). + objFact.createNameIDMappingServiceElement(objFact.createAttributeServiceType()); + namidElem1.getValue().setBinding(soapBinding); + idpssoDescriptor.getValue().getNameIDMappingService(). add(namidElem1); nameIDmappingList = - idpssoDescriptor.getNameIDMappingService(); + idpssoDescriptor.getValue().getNameIDMappingService(); } namidElem1 = (NameIDMappingServiceElement)nameIDmappingList.get(0); - namidElem1.setLocation(nameIDmappingloc); - idpssoDescriptor.getNameIDMappingService().clear(); - idpssoDescriptor.getNameIDMappingService().add( + namidElem1.getValue().setLocation(nameIDmappingloc); + idpssoDescriptor.getValue().getNameIDMappingService().clear(); + idpssoDescriptor.getValue().getNameIDMappingService().add( namidElem1); } //save nameid format if (idpStdValues.keySet().contains(NAMEID_FORMAT)) { - saveNameIdFormat(idpssoDescriptor, idpStdValues); + saveNameIdFormat(idpssoDescriptor.getValue(), idpStdValues); } //save for SingleSignOnService @@ -1192,7 +1184,7 @@ public void setIDPStdAttributeValues( idpStdValues, SINGLE_SIGNON_SOAP_LOCATION); String ssoSoapLocation = getResult( idpStdValues, SSO_SOAPS_LOC); - List signonList = idpssoDescriptor.getSingleSignOnService(); + List signonList = idpssoDescriptor.getValue().getSingleSignOnService(); if (!signonList.isEmpty()) { signonList.clear(); @@ -1202,9 +1194,9 @@ public void setIDPStdAttributeValues( ssohttpLocation.length() > 0) { SingleSignOnServiceElement slsElemRed = - objFact.createSingleSignOnServiceElement(); - slsElemRed.setBinding(httpRedirectBinding); - slsElemRed.setLocation(ssohttpLocation); + objFact.createSingleSignOnServiceElement(objFact.createEndpointType()); + slsElemRed.getValue().setBinding(httpRedirectBinding); + slsElemRed.getValue().setLocation(ssohttpLocation); signonList.add(slsElemRed); } @@ -1212,9 +1204,9 @@ public void setIDPStdAttributeValues( ssopostLocation.length() > 0) { SingleSignOnServiceElement slsElemPost = - objFact.createSingleSignOnServiceElement(); - slsElemPost.setBinding(httpPostBinding); - slsElemPost.setLocation(ssopostLocation); + objFact.createSingleSignOnServiceElement(objFact.createEndpointType()); + slsElemPost.getValue().setBinding(httpPostBinding); + slsElemPost.getValue().setLocation(ssopostLocation); signonList.add(slsElemPost); } @@ -1222,9 +1214,9 @@ public void setIDPStdAttributeValues( ssoSoapLocation.length() > 0) { SingleSignOnServiceElement slsElemSoap = - objFact.createSingleSignOnServiceElement(); - slsElemSoap.setBinding(soapBinding); - slsElemSoap.setLocation(ssoSoapLocation); + objFact.createSingleSignOnServiceElement(objFact.createEndpointType()); + slsElemSoap.getValue().setBinding(soapBinding); + slsElemSoap.getValue().setLocation(ssoSoapLocation); signonList.add(slsElemSoap); } } @@ -1285,7 +1277,7 @@ public void setIDPExtAttributeValues( IDPSSOConfigElement idpssoConfig = samlManager.getIDPSSOConfig(realm,entityName); if (idpssoConfig != null) { - updateBaseConfig(idpssoConfig, idpExtValues, role); + updateBaseConfig(idpssoConfig.getValue(), idpExtValues, role); } //saves the attributes by passing the new entityConfig object @@ -1369,7 +1361,7 @@ public void setSPStdAttributeValues( } } - List logList = spssoDescriptor.getSingleLogoutService(); + List logList = spssoDescriptor.getValue().getSingleLogoutService(); if (!logList.isEmpty()) { logList.clear(); @@ -1427,7 +1419,7 @@ public void setSPStdAttributeValues( } List manageNameIdList = - spssoDescriptor.getManageNameIDService(); + spssoDescriptor.getValue().getManageNameIDService(); if (!manageNameIdList.isEmpty()) { manageNameIdList.clear(); @@ -1463,7 +1455,7 @@ public void setSPStdAttributeValues( if (!assertionConsumer.isEmpty() && assertionConsumer.size() > 0) { List asconsServiceList = - spssoDescriptor.getAssertionConsumerService(); + spssoDescriptor.getValue().getAssertionConsumerService(); if (!asconsServiceList.isEmpty()) { asconsServiceList.clear(); @@ -1473,21 +1465,21 @@ public void setSPStdAttributeValues( //save nameid format if (spStdValues.keySet().contains(NAMEID_FORMAT)) { - saveNameIdFormat(spssoDescriptor, spStdValues); + saveNameIdFormat(spssoDescriptor.getValue(), spStdValues); } //save AuthnRequestsSigned if (spStdValues.keySet().contains(IS_AUTHN_REQ_SIGNED)) { boolean authnValue = setToBoolean( spStdValues, IS_AUTHN_REQ_SIGNED); - spssoDescriptor.setAuthnRequestsSigned(authnValue); + spssoDescriptor.getValue().setAuthnRequestsSigned(authnValue); } //save WantAssertionsSigned if (spStdValues.keySet().contains(WANT_ASSERTIONS_SIGNED)) { boolean assertValue = setToBoolean( spStdValues, WANT_ASSERTIONS_SIGNED); - spssoDescriptor.setWantAssertionsSigned(assertValue); + spssoDescriptor.getValue().setWantAssertionsSigned(assertValue); } samlManager.setEntityDescriptor(realm, entityDescriptor); @@ -1546,7 +1538,7 @@ public void setSPExtAttributeValues( SPSSOConfigElement spssoConfig = samlManager.getSPSSOConfig( realm,entityName); if (spssoConfig != null){ - updateBaseConfig(spssoConfig, spExtValues, role); + updateBaseConfig(spssoConfig.getValue(), spExtValues, role); } //saves the attributes by passing the new entityConfig object @@ -1611,12 +1603,12 @@ private void updateBaseConfig( for (Iterator it = attrList.iterator(); it.hasNext(); ) { AttributeElement avpnew = (AttributeElement)it.next(); - String name = avpnew.getName(); + String name = avpnew.getValue().getName(); if (values.keySet().contains(name)) { Set set = (Set)values.get(name); if (set != null) { - avpnew.getValue().clear(); - avpnew.getValue().addAll(set); + avpnew.getValue().getValue().clear(); + avpnew.getValue().getValue().addAll(set); } } } @@ -1682,10 +1674,10 @@ private void updateBaseConfig( for (Iterator it = attrList.iterator(); it.hasNext(); ) { AttributeElement avpnew = (AttributeElement)it.next(); - String name = avpnew.getName(); + String name = avpnew.getValue().getName(); if(name.equals(attributeName)){ - avpnew.getValue().clear(); - avpnew.getValue().addAll(list); + avpnew.getValue().getValue().clear(); + avpnew.getValue().getValue().addAll(list); } } @@ -1706,7 +1698,7 @@ private void saveNameIdFormat( (Set)values.get(NAMEID_FORMAT)); ssodescriptor.getNameIDFormat().clear(); for (int i=0; i> configList = + entityConfigElement.getValue(). getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - + BaseConfigType baseConfigIDP = null; BaseConfigType baseConfigSP = null; - BaseConfigType baseConfigAuth = null; + BaseConfigType baseConfigAuth = null; AttributeAuthorityDescriptorElement attrauthDescriptor = samlManager.getAttributeAuthorityDescriptor(realm,entityName); AuthnAuthorityDescriptorElement authnauthDescriptor = @@ -1811,66 +1803,62 @@ private void createExtendedObject( realm, entityName); if (isDualRole(entityDescriptor)) { - baseConfigIDP = objFactory.createIDPSSOConfigElement(); - baseConfigSP = objFactory.createSPSSOConfigElement(); + baseConfigIDP = new BaseConfigType() {}; + baseConfigSP = new BaseConfigType() {}; baseConfigIDP = addAttributeType(extendedMetaIdpMap, baseConfigIDP); baseConfigSP = addAttributeType(extendedMetaSpMap, baseConfigSP); - configList.add(baseConfigIDP); - configList.add(baseConfigSP); + configList.add(objFactory.createIDPSSOConfigElement(baseConfigIDP)); + configList.add(objFactory.createSPSSOConfigElement(baseConfigSP)); }else if (role.equals(EntityModel.IDENTITY_PROVIDER) || (idpssoDesc != null)) { - baseConfigIDP = objFactory.createIDPSSOConfigElement(); + baseConfigIDP = new BaseConfigType() {}; baseConfigIDP = addAttributeType(extendedMetaIdpMap, baseConfigIDP); - configList.add(baseConfigIDP); + configList.add(objFactory.createIDPSSOConfigElement(baseConfigIDP)); } else if (role.equals(EntityModel.SERVICE_PROVIDER) || (spssoDesc != null)) { - baseConfigSP = objFactory.createSPSSOConfigElement(); + baseConfigSP = new BaseConfigType() {}; baseConfigSP = addAttributeType(extendedMetaSpMap, baseConfigSP); - configList.add(baseConfigSP); + configList.add(objFactory.createSPSSOConfigElement(baseConfigSP)); } if (role.equals(EntityModel.SAML_ATTRAUTHORITY) || (attrauthDescriptor != null)) { - baseConfigAuth = - objFactory.createAttributeAuthorityConfigElement(); + baseConfigAuth = new BaseConfigType() {}; baseConfigAuth = addAttributeType(extAttrAuthMap, baseConfigAuth); - configList.add(baseConfigAuth); + configList.add(objFactory.createAttributeAuthorityConfigElement(baseConfigAuth)); } if (role.equals(EntityModel.SAML_AUTHNAUTHORITY) || (authnauthDescriptor != null)) { - baseConfigAuth = - objFactory.createAuthnAuthorityConfigElement(); + baseConfigAuth = new BaseConfigType() {}; baseConfigAuth = addAttributeType(extAuthnAuthMap, baseConfigAuth); - configList.add(baseConfigAuth); + configList.add(objFactory.createAuthnAuthorityConfigElement(baseConfigAuth)); } if (role.equals(EntityModel.SAML_ATTRQUERY) || (attrQueryDescriptor != null)) { - baseConfigAuth = - objFactory.createAttributeQueryConfigElement(); + baseConfigAuth = new BaseConfigType() {}; baseConfigAuth = addAttributeType(extattrQueryMap, baseConfigAuth); - configList.add(baseConfigAuth); + configList.add(objFactory.createAttributeQueryConfigElement(baseConfigAuth)); } if (role.equals(EntityModel.POLICY_DECISION_POINT_DESCRIPTOR) || (xacmlPDPDescriptor != null)) { - baseConfigAuth = - objFactory.createXACMLPDPConfigElement(); - baseConfigAuth = addAttributeType( - xacmlPDPExtendedMeta, baseConfigAuth); - configList.add(baseConfigAuth); + baseConfigAuth = new BaseConfigType() {}; + + baseConfigAuth = addAttributeType(xacmlPDPExtendedMeta, baseConfigAuth); + configList.add(objFactory.createXACMLPDPConfigElement(baseConfigAuth)); } if (role.equals(EntityModel.POLICY_ENFORCEMENT_POINT_DESCRIPTOR) || (xacmlAuthzDescriptor != null)) { - baseConfigAuth = - objFactory.createXACMLAuthzDecisionQueryConfigElement(); + baseConfigAuth = new BaseConfigType() {}; + baseConfigAuth = addAttributeType( xacmlPEPExtendedMeta, baseConfigAuth); - configList.add(baseConfigAuth); + configList.add(objFactory.createXACMLAuthzDecisionQueryConfigElement(baseConfigAuth)); } samlManager.setEntityConfig(realm, entityConfigElement); @@ -1881,10 +1869,10 @@ private BaseConfigType addAttributeType(Map values, BaseConfigType bctype) ObjectFactory objFactory = new ObjectFactory(); for (Iterator iter = values.keySet().iterator(); iter.hasNext(); ) { - AttributeType avp = objFactory.createAttributeElement(); + AttributeElement avp = objFactory.createAttributeElement(objFactory.createAttributeType()); String key = (String)iter.next(); - avp.setName(key); - avp.getValue().addAll(Collections.EMPTY_LIST); + avp.getValue().setName(key); + avp.getValue().getValue().addAll(Collections.EMPTY_LIST); bctype.getAttribute().add(avp); } return bctype; @@ -1937,8 +1925,8 @@ public Map getPEPDescriptor( //ProtocolSupportEnum data.put(ATTR_TXT_PROTOCOL_SUPPORT_ENUM, returnEmptySetIfValueIsNull( - xacmlAuthzDescriptor.getProtocolSupportEnumeration())); - if (xacmlAuthzDescriptor.isWantAssertionsSigned()) { + xacmlAuthzDescriptor.getValue().getProtocolSupportEnumeration())); + if (xacmlAuthzDescriptor.getValue().isWantAssertionsSigned()) { data.put(ATTR_WANT_ASSERTION_SIGNED, "true"); } else { data.put(ATTR_WANT_ASSERTION_SIGNED, "false"); @@ -1984,18 +1972,18 @@ public Map getPDPDescriptor(String realm, String entityName) //ProtocolSupportEnum data.put(ATTR_TXT_PROTOCOL_SUPPORT_ENUM, returnEmptySetIfValueIsNull( - xacmlPDPDescriptor.getProtocolSupportEnumeration())); + xacmlPDPDescriptor.getValue().getProtocolSupportEnumeration())); List authzServiceList = - xacmlPDPDescriptor.getXACMLAuthzService(); + xacmlPDPDescriptor.getValue().getXACMLAuthzService(); if (authzServiceList.size() != 0) { XACMLAuthzServiceElement authzService = (XACMLAuthzServiceElement) authzServiceList.get(0); data.put(ATTR_XACML_AUTHZ_SERVICE_BINDING, returnEmptySetIfValueIsNull( - authzService.getBinding())); + authzService.getValue().getBinding())); data.put(ATTR_XACML_AUTHZ_SERVICE_LOCATION, returnEmptySetIfValueIsNull( - authzService.getLocation())); + authzService.getValue().getLocation())); } } logEvent("SUCCEED_GET_ENTITY_DESCRIPTOR_ATTR_VALUES", params); @@ -2039,8 +2027,8 @@ public Map getPEPConfig( if (xacmlAuthzConfigElement != null) { data = new HashMap(); - configList = xacmlAuthzConfigElement.getAttribute(); - metaAlias = xacmlAuthzConfigElement.getMetaAlias(); + configList = xacmlAuthzConfigElement.getValue().getAttribute(); + metaAlias = xacmlAuthzConfigElement.getValue().getMetaAlias(); int size = configList.size(); for (int i=0; i< size; i++) { AttributeType atype = (AttributeType) configList.get(i); @@ -2100,8 +2088,8 @@ public Map getPDPConfig( realm, entityName); if (xacmlPDPConfigElement != null) { data = new HashMap(); - configList = xacmlPDPConfigElement.getAttribute() ; - metaAlias = xacmlPDPConfigElement.getMetaAlias(); + configList = xacmlPDPConfigElement.getValue().getAttribute() ; + metaAlias = xacmlPDPConfigElement.getValue().getMetaAlias(); int size = configList.size(); for (int i=0; i< size; i++) { AttributeType atype = (AttributeType) configList.get(i); @@ -2160,11 +2148,11 @@ public void updatePDPDescriptor( entityName); if (pdpDescriptor != null) { - List authzServiceList = pdpDescriptor.getXACMLAuthzService(); + List authzServiceList = pdpDescriptor.getValue().getXACMLAuthzService(); if (authzServiceList.size() != 0) { XACMLAuthzServiceElement authzService = (XACMLAuthzServiceElement)authzServiceList.get(0); - authzService.setLocation((String)AMAdminUtils.getValue( + authzService.getValue().setLocation((String)AMAdminUtils.getValue( (Set)attrValues.get( ATTR_XACML_AUTHZ_SERVICE_LOCATION))); } @@ -2215,7 +2203,7 @@ public void updatePDPConfig( if (pdpEntityConfig == null) { throw new AMConsoleException("invalid.xacml.configuration"); } else { - updateBaseConfig(pdpEntityConfig, attrValues, role); + updateBaseConfig(pdpEntityConfig.getValue(), attrValues, role); } //saves the attributes by passing the new entityConfig object @@ -2287,7 +2275,7 @@ public void updatePEPConfig( if (pepEntityConfig == null) { throw new AMConsoleException("invalid.xacml.configuration"); } else { - updateBaseConfig(pepEntityConfig, attrValues, role); + updateBaseConfig(pepEntityConfig.getValue(), attrValues, role); } //saves the attributes by passing the new entityConfig object @@ -2329,7 +2317,7 @@ public SAMLv2AuthContexts getIDPAuthenticationContexts( Map map = new HashMap(); BaseConfigType idpConfig= - saml2MetaManager.getIDPSSOConfig(realm, entityName); + saml2MetaManager.getIDPSSOConfig(realm, entityName).getValue(); if (idpConfig != null){ map = SAML2MetaUtils.getAttributes(idpConfig) ; } else { @@ -2388,7 +2376,7 @@ public SAMLv2AuthContexts getSPAuthenticationContexts( Map map = new HashMap(); BaseConfigType spConfig= - saml2MetaManager.getSPSSOConfig(realm, entityName); + saml2MetaManager.getSPSSOConfig(realm, entityName).getValue(); if (spConfig != null){ map = SAML2MetaUtils.getAttributes(spConfig) ; } else { @@ -2456,7 +2444,7 @@ public void updateIDPAuthenticationContexts( throw new AMConsoleException("invalid.config.element"); } else { updateBaseConfig( - idpDecConfigElement, + idpDecConfigElement.getValue(), IDP_AUTHN_CONTEXT_CLASS_REF_MAPPING, list ); @@ -2512,7 +2500,7 @@ public void updateSPAuthenticationContexts( } else { // update sp entity config updateBaseConfig( - spDecConfigElement, + spDecConfigElement.getValue(), SP_AUTHN_CONTEXT_CLASS_REF_MAPPING, list ); @@ -2559,45 +2547,45 @@ public Map getStandardAttributeAuthorityAttributes( map.put(ATTR_SEFVICE_LOCATION, Collections.EMPTY_SET); if (attrauthDescriptor != null) { List artServiceList = - attrauthDescriptor.getAttributeService(); + attrauthDescriptor.getValue().getAttributeService(); for (int i = 0; i < artServiceList.size(); i++) { AttributeServiceElement key = (AttributeServiceElement)artServiceList.get(i); - if ((key.getLocation() != null) && - (key.isSupportsX509Query())) + if ((key.getValue().getLocation() != null) && + (key.getValue().isSupportsX509Query())) { map.put(SUPPORTS_X509, returnEmptySetIfValueIsNull( - key.isSupportsX509Query())); + key.getValue().isSupportsX509Query())); map.put(ATTR_SEFVICE_LOCATION, - returnEmptySetIfValueIsNull(key.getLocation())); + returnEmptySetIfValueIsNull(key.getValue().getLocation())); - } else if ((key.getLocation() != null) && - (key.getLocation().length()>0)) + } else if ((key.getValue().getLocation() != null) && + (key.getValue().getLocation().length()>0)) { map.put(ATTR_SEFVICE_DEFAULT_LOCATION, - returnEmptySetIfValueIsNull(key.getLocation())); + returnEmptySetIfValueIsNull(key.getValue().getLocation())); } } map.put(ASSERTION_ID_SAOP_LOC, Collections.EMPTY_SET); map.put(ASSERTION_ID_URI_LOC, Collections.EMPTY_SET); List assertionIDReqList = - attrauthDescriptor.getAssertionIDRequestService(); + attrauthDescriptor.getValue().getAssertionIDRequestService(); for (int i = 0; i < assertionIDReqList.size(); i++) { AssertionIDRequestServiceElement elem1 = (AssertionIDRequestServiceElement) assertionIDReqList.get(i); - if (elem1.getBinding().contains("SOAP")) { + if (elem1.getValue().getBinding().contains("SOAP")) { map.put(ASSERTION_ID_SAOP_LOC, - returnEmptySetIfValueIsNull(elem1.getLocation())); - } else if (elem1.getBinding().contains("URI")) { + returnEmptySetIfValueIsNull(elem1.getValue().getLocation())); + } else if (elem1.getValue().getBinding().contains("URI")) { map.put(ASSERTION_ID_URI_LOC, - returnEmptySetIfValueIsNull(elem1.getLocation())); + returnEmptySetIfValueIsNull(elem1.getValue().getLocation())); } } map.put(ATTRIBUTE_PROFILE, Collections.EMPTY_SET); List attrProfileList = - attrauthDescriptor.getAttributeProfile(); + attrauthDescriptor.getValue().getAttributeProfile(); if (!attrProfileList.isEmpty()) { String key = (String)attrProfileList.get(0); @@ -2643,7 +2631,7 @@ public Map getExtendedAttributeAuthorityAttributes( realm,entityName); if (attributeAuthorityConfig != null) { BaseConfigType baseConfig = - (BaseConfigType)attributeAuthorityConfig; + attributeAuthorityConfig.getValue(); map = SAML2MetaUtils.getAttributes(baseConfig); } logEvent("SUCCEED_GET_ATTR_AUTH_ATTR_VALUES", params); @@ -2684,28 +2672,28 @@ public Map getStandardAuthnAuthorityAttributes( if (authnauthDescriptor != null) { map.put(AUTHN_QUERY_SERVICE, Collections.EMPTY_SET); List authQueryServiceList = - authnauthDescriptor.getAuthnQueryService(); + authnauthDescriptor.getValue().getAuthnQueryService(); if (!authQueryServiceList.isEmpty()) { AuthnQueryServiceElement key = (AuthnQueryServiceElement)authQueryServiceList.get(0); map.put(AUTHN_QUERY_SERVICE, - returnEmptySetIfValueIsNull(key.getLocation())); + returnEmptySetIfValueIsNull(key.getValue().getLocation())); } map.put(ASSERTION_ID_SAOP_LOC, Collections.EMPTY_SET); map.put(ASSERTION_ID_URI_LOC, Collections.EMPTY_SET); List assertionIDReqList = - authnauthDescriptor.getAssertionIDRequestService(); + authnauthDescriptor.getValue().getAssertionIDRequestService(); for (int i = 0; i < assertionIDReqList.size(); i++) { AssertionIDRequestServiceElement elem1 = (AssertionIDRequestServiceElement) assertionIDReqList.get(i); - if (elem1.getBinding().contains("SOAP")) { + if (elem1.getValue().getBinding().contains("SOAP")) { map.put(ASSERTION_ID_SAOP_LOC, - returnEmptySetIfValueIsNull(elem1.getLocation())); - } else if (elem1.getBinding().contains("URI")) { + returnEmptySetIfValueIsNull(elem1.getValue().getLocation())); + } else if (elem1.getValue().getBinding().contains("URI")) { map.put(ASSERTION_ID_URI_LOC, - returnEmptySetIfValueIsNull(elem1.getLocation())); + returnEmptySetIfValueIsNull(elem1.getValue().getLocation())); } } } @@ -2747,7 +2735,7 @@ public Map getExtendedAuthnAuthorityAttributes( realm,entityName); if (authnAuthorityConfig != null) { BaseConfigType baseConfig = - (BaseConfigType)authnAuthorityConfig; + authnAuthorityConfig.getValue(); map = SAML2MetaUtils.getAttributes(baseConfig); } logEvent("SUCCEED_GET_AUTHN_AUTH_ATTR_VALUES", params); @@ -2785,8 +2773,8 @@ public Map getStandardAttrQueryAttributes( SAML2MetaManager samlManager = getSAML2MetaManager(); attrQueryDescriptor = samlManager.getAttributeQueryDescriptor(realm,entityName); - map.put(ATTR_NAMEID_FORMAT, (OrderedSet) convertListToSet( - attrQueryDescriptor.getNameIDFormat())); + map.put(ATTR_NAMEID_FORMAT, convertListToSet( + attrQueryDescriptor.getValue().getNameIDFormat())); logEvent("SUCCEED_GET_ATTR_QUERY_ATTR_VALUES", params); } catch (SAML2MetaException e) { @@ -2826,7 +2814,7 @@ public Map getExtendedAttrQueryAttributes( realm,entityName); if (attrQueryConfig != null) { BaseConfigType baseConfig = - (BaseConfigType)attrQueryConfig; + (BaseConfigType)attrQueryConfig.getValue(); map = SAML2MetaUtils.getAttributes(baseConfig); } logEvent("SUCCEED_GET_ATTR_QUERY_ATTR_VALUES", params); @@ -2877,26 +2865,26 @@ public void setStdAttributeAuthorityValues( attrAuthValues, ATTR_SEFVICE_LOCATION); AttributeServiceElement key1 = - objFact.createAttributeServiceElement(); + objFact.createAttributeServiceElement(objFact.createAttributeServiceType()); AttributeServiceElement key2 = - objFact.createAttributeServiceElement(); - key1.setBinding(soapBinding); - key1.setLocation(""); - key2.setBinding(soapBinding); - key2.setSupportsX509Query(false); - key2.setLocation(""); + objFact.createAttributeServiceElement(objFact.createAttributeServiceType()); + key1.getValue().setBinding(soapBinding); + key1.getValue().setLocation(""); + key2.getValue().setBinding(soapBinding); + key2.getValue().setSupportsX509Query(false); + key2.getValue().setLocation(""); if (defLocation != null && defLocation.length() > 0) { - key1.setLocation(defLocation); + key1.getValue().setLocation(defLocation); } if (x509Location != null && x509Location.length() > 0) { - key2.setLocation(x509Location); - key2.setSupportsX509Query(is509); + key2.getValue().setLocation(x509Location); + key2.getValue().setSupportsX509Query(is509); } - attrauthDescriptor.getAttributeService().clear(); - attrauthDescriptor.getAttributeService().add(key1); - attrauthDescriptor.getAttributeService().add(key2); + attrauthDescriptor.getValue().getAttributeService().clear(); + attrauthDescriptor.getValue().getAttributeService().add(key1); + attrauthDescriptor.getValue().getAttributeService().add(key2); //save assertion ID request @@ -2905,36 +2893,36 @@ public void setStdAttributeAuthorityValues( String uriLocation = getResult( attrAuthValues, ASSERTION_ID_URI_LOC); AssertionIDRequestServiceElement elem1 = - objFact.createAssertionIDRequestServiceElement(); + objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); AssertionIDRequestServiceElement elem2 = - objFact.createAssertionIDRequestServiceElement(); + objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); - elem1.setBinding(soapBinding); - elem2.setBinding(uriBinding); + elem1.getValue().setBinding(soapBinding); + elem2.getValue().setBinding(uriBinding); if (soapLocation != null) { - elem1.setLocation(soapLocation); + elem1.getValue().setLocation(soapLocation); } if (uriLocation != null) { - elem2.setLocation(uriLocation); + elem2.getValue().setLocation(uriLocation); } - attrauthDescriptor. + attrauthDescriptor.getValue(). getAssertionIDRequestService().clear(); - attrauthDescriptor. + attrauthDescriptor.getValue(). getAssertionIDRequestService().add(elem1); - attrauthDescriptor. + attrauthDescriptor.getValue(). getAssertionIDRequestService().add(elem2); //save attribute profile String attrProfile = getResult( attrAuthValues, ATTRIBUTE_PROFILE); List attrProfileList = - attrauthDescriptor.getAttributeProfile(); + attrauthDescriptor.getValue().getAttributeProfile(); if (!attrProfileList.isEmpty()) { - attrauthDescriptor.getAttributeProfile().clear(); + attrauthDescriptor.getValue().getAttributeProfile().clear(); } - attrauthDescriptor.getAttributeProfile(). + attrauthDescriptor.getValue().getAttributeProfile(). add(attrProfile); @@ -2951,13 +2939,6 @@ public void setStdAttributeAuthorityValues( logEvent("FEDERATION_EXCEPTION_MODIFY_ATTR_AUTH_ATTR_VALUES", paramsEx); throw new AMConsoleException(strError); - } catch (JAXBException e) { - debug.warning("SAMLv2ModelImpl.setStdAttributeAuthorityValues:", e); - String strError = getErrorString(e); - String[] paramsEx = - {realm, entityName, "SAMLv2", "AttribAuthority-Std", strError}; - logEvent("FEDERATION_EXCEPTION_MODIFY_ATTR_AUTH_ATTR_VALUES", - paramsEx); } } @@ -2994,7 +2975,7 @@ public void setExtAttributeAuthorityValues( samlManager.getAttributeAuthorityConfig( realm,entityName); if (attributeAuthorityConfig != null) { - updateBaseConfig(attributeAuthorityConfig, + updateBaseConfig(attributeAuthorityConfig.getValue(), attrAuthExtValues,role); } @@ -3054,15 +3035,15 @@ public void setStdAuthnAuthorityValues( authnAuthValues, AUTHN_QUERY_SERVICE); //save query service List authQueryServiceList = - authnauthDescriptor.getAuthnQueryService(); + authnauthDescriptor.getValue().getAuthnQueryService(); if (!authQueryServiceList.isEmpty()) { - authnauthDescriptor.getAuthnQueryService().clear(); + authnauthDescriptor.getValue().getAuthnQueryService().clear(); } AuthnQueryServiceElement key = - objFact.createAuthnQueryServiceElement(); - key.setBinding(soapBinding); - key.setLocation(queryService); - authnauthDescriptor.getAuthnQueryService().add(key); + objFact.createAuthnQueryServiceElement(objFact.createAttributeServiceType()); + key.getValue().setBinding(soapBinding); + key.getValue().setLocation(queryService); + authnauthDescriptor.getValue().getAuthnQueryService().add(key); //save assertion ID request String soapLocation = getResult( @@ -3070,26 +3051,26 @@ public void setStdAuthnAuthorityValues( String uriLocation = getResult( authnAuthValues, ASSERTION_ID_URI_LOC); List assertionIDReqList = - authnauthDescriptor.getAssertionIDRequestService(); + authnauthDescriptor.getValue().getAssertionIDRequestService(); if (!assertionIDReqList.isEmpty()) { assertionIDReqList.clear(); } AssertionIDRequestServiceElement elem1 = - objFact.createAssertionIDRequestServiceElement(); - elem1.setBinding(soapBinding); + objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); + elem1.getValue().setBinding(soapBinding); AssertionIDRequestServiceElement elem2 = - objFact.createAssertionIDRequestServiceElement(); - elem2.setBinding(uriBinding); + objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); + elem2.getValue().setBinding(uriBinding); if (soapLocation != null) { - elem1.setLocation(soapLocation); + elem1.getValue().setLocation(soapLocation); } if (uriLocation != null) { - elem2.setLocation(uriLocation); + elem2.getValue().setLocation(uriLocation); } - authnauthDescriptor. + authnauthDescriptor.getValue(). getAssertionIDRequestService().add(elem1); - authnauthDescriptor. + authnauthDescriptor.getValue(). getAssertionIDRequestService().add(elem2); samlManager.setEntityDescriptor(realm, entityDescriptor); @@ -3104,13 +3085,6 @@ public void setStdAuthnAuthorityValues( logEvent("FEDERATION_EXCEPTION_MODIFY_AUTHN_AUTH_ATTR_VALUES", paramsEx); throw new AMConsoleException(strError); - } catch (JAXBException e) { - debug.warning("SAMLv2ModelImpl.setStdAttributeAuthorityValues:", e); - String strError = getErrorString(e); - String[] paramsEx = - {realm, entityName, "SAMLv2", "AttribAuthority-Std", strError}; - logEvent("FEDERATION_EXCEPTION_MODIFY_AUTHN_AUTH_ATTR_VALUES", - paramsEx); } } @@ -3149,7 +3123,7 @@ public void setExtauthnAuthValues( samlManager.getAuthnAuthorityConfig( realm,entityName); if (authnAuthorityConfig != null) { - updateBaseConfig(authnAuthorityConfig, + updateBaseConfig(authnAuthorityConfig.getValue(), authnAuthExtValues, role); } @@ -3206,16 +3180,16 @@ public void setStdAttributeQueryValues( //save nameid format List NameIdFormatList = - attrQueryDescriptor.getNameIDFormat(); + attrQueryDescriptor.getValue().getNameIDFormat(); if (!NameIdFormatList.isEmpty()) { - attrQueryDescriptor.getNameIDFormat().clear(); + attrQueryDescriptor.getValue().getNameIDFormat().clear(); } List listtoSave = convertSetToList( (Set)attrQueryValues.get(ATTR_NAMEID_FORMAT)); Iterator itt = listtoSave.listIterator(); while (itt.hasNext()) { String name =(String) itt.next(); - attrQueryDescriptor.getNameIDFormat().add(name); + attrQueryDescriptor.getValue().getNameIDFormat().add(name); } samlManager.setEntityDescriptor(realm, entityDescriptor); @@ -3269,7 +3243,7 @@ public void setExtAttributeQueryValues( samlManager.getAttributeQueryConfig( realm,entityName); if (attrQueryConfig != null) { - updateBaseConfig(attrQueryConfig, attrQueryExtValues, role); + updateBaseConfig(attrQueryConfig.getValue(), attrQueryExtValues, role); } //saves the attributes by passing the new entityConfig object @@ -3368,7 +3342,7 @@ public Map getExtendedAffiliationyAttributes( realm,entityName); if (atffilConfig != null) { BaseConfigType baseConfig = - (BaseConfigType)atffilConfig; + atffilConfig.getValue(); map = SAML2MetaUtils.getAttributes(baseConfig); Iterator it = map.entrySet().iterator(); while (it.hasNext()) { @@ -3494,10 +3468,10 @@ private void savehttpRedLogout ( ) throws JAXBException { if (lohttpLocation != null && lohttpLocation.length() > 0) { SingleLogoutServiceElement slsElemRed = - objFact.createSingleLogoutServiceElement(); - slsElemRed.setBinding(httpRedirectBinding); - slsElemRed.setLocation(lohttpLocation); - slsElemRed.setResponseLocation(lohttpRespLocation); + objFact.createSingleLogoutServiceElement(objFact.createAttributeServiceType()); + slsElemRed.getValue().setBinding(httpRedirectBinding); + slsElemRed.getValue().setLocation(lohttpLocation); + slsElemRed.getValue().setResponseLocation(lohttpRespLocation); logList.add(slsElemRed); } } @@ -3519,10 +3493,10 @@ private void savepostLogout( ) throws JAXBException { if (postLocation != null && postLocation.length() > 0) { SingleLogoutServiceElement slsElemPost = - objFact.createSingleLogoutServiceElement(); - slsElemPost.setBinding(httpPostBinding); - slsElemPost.setLocation(postLocation); - slsElemPost.setResponseLocation(postRespLocation); + objFact.createSingleLogoutServiceElement(objFact.createAttributeServiceType()); + slsElemPost.getValue().setBinding(httpPostBinding); + slsElemPost.getValue().setLocation(postLocation); + slsElemPost.getValue().setResponseLocation(postRespLocation); logList.add(slsElemPost); } } @@ -3542,9 +3516,9 @@ private void savesoapLogout( ) throws JAXBException { if (losoapLocation != null && losoapLocation.length() > 0) { SingleLogoutServiceElement slsElemSoap = - objFact.createSingleLogoutServiceElement(); - slsElemSoap.setBinding(soapBinding); - slsElemSoap.setLocation(losoapLocation); + objFact.createSingleLogoutServiceElement(objFact.createEndpointType()); + slsElemSoap.getValue().setBinding(soapBinding); + slsElemSoap.getValue().setLocation(losoapLocation); logList.add(slsElemSoap); } } @@ -3566,10 +3540,10 @@ private void savehttpRedMni ( ) throws JAXBException { if (mnihttpLocation != null && mnihttpLocation.length() > 0) { ManageNameIDServiceElement slsElemRed = - objFact.createManageNameIDServiceElement(); - slsElemRed.setBinding(httpRedirectBinding); - slsElemRed.setLocation(mnihttpLocation); - slsElemRed.setResponseLocation(mnihttpRespLocation); + objFact.createManageNameIDServiceElement(objFact.createEndpointType()); + slsElemRed.getValue().setBinding(httpRedirectBinding); + slsElemRed.getValue().setLocation(mnihttpLocation); + slsElemRed.getValue().setResponseLocation(mnihttpRespLocation); manageNameIdList.add(slsElemRed); } } @@ -3591,10 +3565,10 @@ private void savepostMni( ) throws JAXBException { if (mnipostLocation != null && mnipostLocation.length() > 0) { ManageNameIDServiceElement slsElemPost = - objFact.createManageNameIDServiceElement(); - slsElemPost.setBinding(httpPostBinding); - slsElemPost.setLocation(mnipostLocation); - slsElemPost.setResponseLocation(mnipostRespLocation); + objFact.createManageNameIDServiceElement(objFact.createEndpointType()); + slsElemPost.getValue().setBinding(httpPostBinding); + slsElemPost.getValue().setLocation(mnipostLocation); + slsElemPost.getValue().setResponseLocation(mnipostRespLocation); manageNameIdList.add(slsElemPost); } } @@ -3614,9 +3588,9 @@ private void savesoapMni( ) throws JAXBException { if (mnisoapLocation != null && mnisoapLocation.length() > 0) { ManageNameIDServiceElement slsElemSoap = - objFact.createManageNameIDServiceElement(); - slsElemSoap.setBinding(soapBinding); - slsElemSoap.setLocation(mnisoapLocation); + objFact.createManageNameIDServiceElement(objFact.createEndpointType()); + slsElemSoap.getValue().setBinding(soapBinding); + slsElemSoap.getValue().setLocation(mnisoapLocation); manageNameIdList.add(slsElemSoap); } } @@ -3638,10 +3612,10 @@ private void saveSPsoapMni( ) throws JAXBException { if (mnisoapLocation != null && mnisoapLocation.length() > 0) { ManageNameIDServiceElement slsElemSoap = - objFact.createManageNameIDServiceElement(); - slsElemSoap.setBinding(soapBinding); - slsElemSoap.setLocation(mnisoapLocation); - slsElemSoap.setResponseLocation(mnirespLoaction); + objFact.createManageNameIDServiceElement(objFact.createEndpointType()); + slsElemSoap.getValue().setBinding(soapBinding); + slsElemSoap.getValue().setLocation(mnisoapLocation); + slsElemSoap.getValue().setResponseLocation(mnirespLoaction); manageNameIdList.add(slsElemSoap); } } diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/WSFedPropertiesModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/WSFedPropertiesModelImpl.java index 3286b8206f..c6f471eb6a 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/WSFedPropertiesModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/WSFedPropertiesModelImpl.java @@ -25,13 +25,14 @@ * $Id: WSFedPropertiesModelImpl.java,v 1.14 2009/11/10 01:19:50 exu Exp $ * * Portions copyright 2012-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.federation.model; import com.sun.identity.console.base.model.AMConsoleException; +import com.sun.identity.wsfederation.jaxb.wsfederation.AttributeExtensibleURI; import com.sun.identity.wsfederation.meta.WSFederationMetaManager; import com.sun.identity.wsfederation.meta.WSFederationMetaException; import com.sun.identity.wsfederation.meta.WSFederationMetaUtils; @@ -50,7 +51,9 @@ import com.sun.identity.wsfederation.jaxb.wsfederation.TokenIssuerNameElement; import com.sun.identity.wsfederation.jaxb.entityconfig.ObjectFactory; import java.util.Set; -import javax.xml.bind.JAXBException; + +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.HashMap; @@ -164,7 +167,7 @@ public Map getServiceProviderAttributes(String realm, String fedId) SPSSOConfigElement spconfig = metaManager.getSPSSOConfig(realm,fedId); if (spconfig != null) { - SPAttributes = WSFederationMetaUtils.getAttributes(spconfig); + SPAttributes = WSFederationMetaUtils.getAttributes(spconfig.getValue()); } } catch (WSFederationMetaException e) { debug.warning( @@ -192,7 +195,7 @@ public Map getIdentityProviderAttributes(String realm, String fedId) IDPSSOConfigElement idpconfig = metaManager.getIDPSSOConfig(realm,fedId); if (idpconfig != null) { - IDPAttributes = WSFederationMetaUtils.getAttributes(idpconfig); + IDPAttributes = WSFederationMetaUtils.getAttributes(idpconfig.getValue()); } } catch (WSFederationMetaException e) { debug.warning( @@ -286,7 +289,7 @@ public String getClaimType(FederationElement fedElem) { if(UriNamedclaimTypes != null) { int iClaim = 0; int arr = 0; - claimList = UriNamedclaimTypes.getClaimType(); + claimList = UriNamedclaimTypes.getValue().getClaimType(); for(iClaim = 0; iClaim < claimList.size(); iClaim += 1) { ClaimType claimType = (ClaimType)claimList.get(iClaim); displayName = claimType.getDisplayName().getValue(); @@ -375,15 +378,17 @@ public void setGenAttributeValues( } throw new AMConsoleException("invalid.federation.element"); } else { - for (Iterator iter = fedElem.getAny().iterator(); + for (Iterator iter = fedElem.getValue().getAny().iterator(); iter.hasNext(); ) { Object o = iter.next(); if (o instanceof TokenIssuerEndpointElement) { - ((TokenIssuerEndpointElement)o).getAddress(). + ((TokenIssuerEndpointElement)o).getValue().getAddress(). setValue(tknissEndPt); } else if (o instanceof TokenIssuerNameElement) { - ((TokenIssuerNameElement)o).setValue(tknissName); + AttributeExtensibleURI attr = new AttributeExtensibleURI(); + attr.setValue(tknissName); + ((TokenIssuerNameElement)o).setValue(attr); } } metaManager.setFederation(realm, fedElem); @@ -425,7 +430,7 @@ public void setSPExtAttributeValues( } SPSSOConfigElement spsso = getspsso(fed); if (spsso != null) { - BaseConfigType baseConfig = (BaseConfigType)spsso; + BaseConfigType baseConfig = spsso.getValue(); updateBaseConfig(baseConfig, spExtvalues, role); } //saves the attributes by passing the new fed object @@ -468,8 +473,8 @@ public void setIDPExtAttributeValues( } IDPSSOConfigElement idpsso = getidpsso(fed); if (idpsso != null){ - BaseConfigType baseConfig = (BaseConfigType)idpsso; - updateBaseConfig(idpsso, idpExtValues, role); + BaseConfigType baseConfig = idpsso.getValue(); + updateBaseConfig(idpsso.getValue(), idpExtValues, role); } //saves the new configuration by passing new fed element created @@ -519,7 +524,7 @@ public void setIDPSTDAttributeValues( if(UriNamedclaimTypes != null) { int iClaim = 0; - claimList = UriNamedclaimTypes.getClaimType(); + claimList = UriNamedclaimTypes.getValue().getClaimType(); for(iClaim = 0; iClaim < claimList.size(); iClaim += 1) { claimType = (ClaimType)claimList.get(iClaim); displayName = claimType.getDisplayName(); @@ -578,13 +583,13 @@ public void setIDPSTDAttributeValues( * @return the corresponding IDPSSOConfigType Object. */ private IDPSSOConfigElement getidpsso(FederationConfigElement fed) { - List listFed = fed.getIDPSSOConfigOrSPSSOConfig(); + List> listFed = fed.getValue().getIDPSSOConfigOrSPSSOConfig(); IDPSSOConfigElement idpsso = null; - Iterator i = listFed.iterator(); + Iterator> i = listFed.iterator(); //TBD -- one config will have only one instance of //IDPSSOConfigElement ????? while (i.hasNext()) { - BaseConfigType bc = (BaseConfigType) i.next(); + JAXBElement bc = i.next(); if (bc instanceof IDPSSOConfigElement) { idpsso = (IDPSSOConfigElement) bc; break; @@ -600,13 +605,13 @@ private IDPSSOConfigElement getidpsso(FederationConfigElement fed) { * @return the corresponding SPSSOConfigType Object. */ private SPSSOConfigElement getspsso(FederationConfigElement fed) { - List listFed = fed.getIDPSSOConfigOrSPSSOConfig(); + List> listFed = fed.getValue().getIDPSSOConfigOrSPSSOConfig(); SPSSOConfigElement spsso = null; - Iterator i = listFed.iterator(); + Iterator> i = listFed.iterator(); //TBD -- one config will have only one instance of //SPSSOConfigElement ????? while (i.hasNext()) { - BaseConfigType bc = (BaseConfigType) i.next(); + JAXBElement bc = i.next(); if (bc instanceof SPSSOConfigElement) { spsso = (SPSSOConfigElement) bc; break; @@ -639,12 +644,12 @@ private void updateBaseConfig( } for (Iterator it = attrList.iterator(); it.hasNext(); ) { AttributeElement avpnew = (AttributeElement)it.next(); - String name = avpnew.getName(); + String name = avpnew.getValue().getName(); if (values.keySet().contains(name)) { Set set = (Set)values.get(name); if (set != null) { - avpnew.getValue().clear(); - avpnew.getValue().addAll(set); + avpnew.getValue().getValue().clear(); + avpnew.getValue().getValue().addAll(set); } } } @@ -688,12 +693,12 @@ private void createExtendedObject( if (eConfig == null) { BaseConfigType bctype = null; FederationConfigElement ele = - objFactory.createFederationConfigElement(); - ele.setFederationID(fedId); + objFactory.createFederationConfigElement(objFactory.createFederationConfigType()); + ele.getValue().setFederationID(fedId); if (location.equals("remote")) { - ele.setHosted(false); + ele.getValue().setHosted(false); } - List ll = ele.getIDPSSOConfigOrSPSSOConfig(); + List> ll = ele.getValue().getIDPSSOConfigOrSPSSOConfig(); // Decide which role EntityDescriptorElement includes // Right now, it is either an SP or an IdP or dual role if (isDualRole(edes)) { @@ -701,27 +706,24 @@ private void createExtendedObject( //for dual role create both idp and sp config objects BaseConfigType bctype_idp = null; BaseConfigType bctype_sp = null; - bctype_idp = objFactory.createIDPSSOConfigElement(); + bctype_idp = new BaseConfigType() {}; bctype_idp = createAttributeElement(keys, bctype_idp); - bctype_sp = objFactory.createSPSSOConfigElement(); + bctype_sp = new BaseConfigType() {}; bctype_sp = createAttributeElement(keys, bctype_sp); - ll.add(bctype_idp); - ll.add(bctype_sp); + ll.add(objFactory.createIDPSSOConfigElement(bctype_idp)); + ll.add(objFactory.createSPSSOConfigElement(bctype_sp)); } else if (role.equals(IDENTITY_PROVIDER)) { - bctype = objFactory.createIDPSSOConfigElement(); + bctype = new BaseConfigType() {}; //bctype.getAttribute().add(atype); bctype = createAttributeElement(keys, bctype); - ll.add(bctype); + ll.add(objFactory.createIDPSSOConfigElement(bctype)); } else if (role.equals(SERVICE_PROVIDER)) { - bctype = objFactory.createSPSSOConfigElement(); + bctype = new BaseConfigType() {}; bctype = createAttributeElement(keys, bctype); - ll.add(bctype); + ll.add(objFactory.createSPSSOConfigElement(bctype)); } metaManager.setEntityConfig(realm,ele); } - } catch (JAXBException e) { - debug.warning("WSFedPropertiesModelImpl.createExtendedObject", e); - throw new AMConsoleException(getErrorString(e)); } catch (WSFederationMetaException e) { debug.warning("WSFedPropertiesModelImpl.createExtendedObject", e); throw new AMConsoleException(getErrorString(e)); @@ -739,19 +741,13 @@ private BaseConfigType createAttributeElement( Map values, BaseConfigType bconfig )throws AMConsoleException { - try { - ObjectFactory objFactory = new ObjectFactory(); - for (Iterator iter=values.keySet().iterator(); - iter.hasNext();) { - AttributeElement avp = objFactory.createAttributeElement(); - String key = (String)iter.next(); - avp.setName(key); - bconfig.getAttribute().add(avp); - } - } catch (JAXBException e) { - debug.warning - ("WSFedPropertiesModelImpl.createAttributeElement", e); - throw new AMConsoleException(e.getMessage()); + ObjectFactory objFactory = new ObjectFactory(); + for (Iterator iter=values.keySet().iterator(); + iter.hasNext();) { + AttributeElement avp = objFactory.createAttributeElement(objFactory.createAttributeType()); + String key = (String)iter.next(); + avp.getValue().setName(key); + bconfig.getAttribute().add(avp); } return bconfig; } @@ -767,7 +763,7 @@ private boolean isDualRole(FederationElement edes) { int cnt = 0; boolean dual = false; if (edes != null) { - for (Iterator iter = edes.getAny().iterator(); iter.hasNext(); ) { + for (Iterator iter = edes.getValue().getAny().iterator(); iter.hasNext(); ) { Object o = iter.next(); if (o instanceof TokenIssuerEndpointElement) { cnt++; diff --git a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java index 8179bd8bdd..7c83b6f010 100644 --- a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java +++ b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: SMDiscoEntryData.java,v 1.2 2008/06/25 05:49:46 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,6 +39,7 @@ import com.sun.identity.liberty.ws.disco.jaxb.DescriptionType; import com.sun.identity.liberty.ws.disco.jaxb.DirectiveType; import com.sun.identity.liberty.ws.disco.jaxb.EncryptResourceIDElement; +import com.sun.identity.liberty.ws.disco.jaxb.InsertEntryType; import com.sun.identity.liberty.ws.disco.jaxb.OptionsType; import com.sun.identity.liberty.ws.disco.jaxb.ResourceIDType; import com.sun.identity.liberty.ws.disco.jaxb.ResourceOfferingType; @@ -53,9 +56,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import javax.xml.namespace.QName; /* - NEED NOT LOG - */ @@ -136,8 +139,8 @@ public void setDiscoStr(boolean isUserView) res.setOptions(createOptionsEntry()); } - DiscoEntryElement de = entryFac.createDiscoEntryElement(); - de.setResourceOffering(res); + DiscoEntryElement de = entryFac.createDiscoEntryElement(new InsertEntryType()); + de.getValue().setResourceOffering(res); createDirectivesEntry(de, descriptionTypeList); String str = convertDiscoEntryToXmlStr(de); @@ -208,33 +211,33 @@ private void createDirectivesEntry( if (dName.equals(DiscoConstants.AUTHN_DIRECTIVE)) { AuthenticateRequesterElement authenticateRequester = - discoFac.createAuthenticateRequesterElement(); - createDirectiveEntry(de, authenticateRequester, idRefs, + discoFac.createAuthenticateRequesterElement(discoFac.createDirectiveType()); + createDirectiveEntry(de, authenticateRequester.getValue(), idRefs, descriptionTypeList); } else if (dName.equals(DiscoConstants.ENCRYPT_DIRECTIVE)) { EncryptResourceIDElement encryptResourceId = - discoFac.createEncryptResourceIDElement(); - createDirectiveEntry(de, encryptResourceId, idRefs, + discoFac.createEncryptResourceIDElement(discoFac.createDirectiveType()); + createDirectiveEntry(de, encryptResourceId.getValue(), idRefs, descriptionTypeList); } else if (dName.equals(DiscoConstants.SESSION_DIRECTIVE)) { AuthenticateSessionContextElement authSessionCntx = - discoFac.createAuthenticateSessionContextElement(); - createDirectiveEntry(de, authSessionCntx, idRefs, + discoFac.createAuthenticateSessionContextElement(discoFac.createDirectiveType()); + createDirectiveEntry(de, authSessionCntx.getValue(), idRefs, descriptionTypeList); } else if (dName.equals(DiscoConstants.AUTHZ_DIRECTIVE)) { AuthorizeRequesterElement authorizeRequester = - discoFac.createAuthorizeRequesterElement(); - createDirectiveEntry(de, authorizeRequester, idRefs, + discoFac.createAuthorizeRequesterElement(discoFac.createDirectiveType()); + createDirectiveEntry(de, authorizeRequester.getValue(), idRefs, descriptionTypeList); } else if (dName.equals(DiscoConstants.BEARER_DIRECTIVE)) { GenerateBearerTokenElement bearer = - disco11Fac.createGenerateBearerTokenElement(); - createDirectiveEntry(de, bearer, idRefs, + disco11Fac.createGenerateBearerTokenElement(discoFac.createDirectiveType()); + createDirectiveEntry(de, bearer.getValue(), idRefs, descriptionTypeList); } else if (dName.equals(DiscoConstants.LOGOUT_DIRECTIVE)) { SendSingleLogOutElement logout = - disco11Fac.createSendSingleLogOutElement(); - createDirectiveEntry(de, logout, idRefs, + disco11Fac.createSendSingleLogOutElement(discoFac.createDirectiveType()); + createDirectiveEntry(de, logout.getValue(), idRefs, descriptionTypeList); } } @@ -261,7 +264,7 @@ private void createDirectiveEntry( } } - de.getAny().add(dType); + de.getValue().getAny().add(dType); } private DescriptionType getDescriptionType(String id, List list) { diff --git a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java index a0cc4af404..c06fccfa41 100644 --- a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java +++ b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java @@ -27,6 +27,7 @@ */ /** * Portions Copyrighted 2012 ForgeRock Inc + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.console.service.model; @@ -58,9 +59,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.xml.sax.InputSource; /* - NEED NOT LOG - */ @@ -329,7 +330,7 @@ private static void setDiscoEntryData( DiscoEntryElement entry, SMDiscoEntryData smDisco) { - ResourceOfferingType resOff = entry.getResourceOffering(); + ResourceOfferingType resOff = entry.getValue().getResourceOffering(); ResourceIDType resourceIdType = resOff.getResourceID(); ServiceInstanceType serviceInstance = resOff.getServiceInstance(); String providerID = serviceInstance.getProviderID(); @@ -401,7 +402,7 @@ public String getAbstractValue(String discoStr) { */ public static Map getDirectiveEntry(DiscoEntryElement entry) { Map map = Collections.EMPTY_MAP; - List directiveList = entry.getAny(); + List directiveList = entry.getValue().getAny(); if ((directiveList != null) && !directiveList.isEmpty()) { map = new HashMap(directiveList.size() *2); @@ -412,32 +413,32 @@ public static Map getDirectiveEntry(DiscoEntryElement entry) { if (obj instanceof AuthenticateRequesterElement) { AuthenticateRequesterElement dType = (AuthenticateRequesterElement)obj; - setDirectiveData(dType, map, + setDirectiveData(dType.getValue(), map, DiscoConstants.AUTHN_DIRECTIVE); } else if (obj instanceof EncryptResourceIDElement) { EncryptResourceIDElement dType = (EncryptResourceIDElement)obj; - setDirectiveData(dType, map, + setDirectiveData(dType.getValue(), map, DiscoConstants.ENCRYPT_DIRECTIVE); } else if (obj instanceof AuthenticateSessionContextElement) { AuthenticateSessionContextElement dType = (AuthenticateSessionContextElement)obj; - setDirectiveData(dType, map, + setDirectiveData(dType.getValue(), map, DiscoConstants.SESSION_DIRECTIVE); } else if (obj instanceof AuthorizeRequesterElement) { AuthorizeRequesterElement dType = (AuthorizeRequesterElement)obj; - setDirectiveData(dType, map, + setDirectiveData(dType.getValue(), map, DiscoConstants.AUTHZ_DIRECTIVE); } else if (obj instanceof GenerateBearerTokenElement) { GenerateBearerTokenElement dType = (GenerateBearerTokenElement)obj; - setDirectiveData(dType, map, + setDirectiveData(dType.getValue(), map, DiscoConstants.BEARER_DIRECTIVE); } else if (obj instanceof SendSingleLogOutElement) { SendSingleLogOutElement dType = (SendSingleLogOutElement)obj; - setDirectiveData(dType, map, + setDirectiveData(dType.getValue(), map, DiscoConstants.LOGOUT_DIRECTIVE); } else { debug.error("unsupported directive type"); diff --git a/openam-console/src/main/java/com/sun/identity/console/task/model/TaskModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/task/model/TaskModelImpl.java index 0902727e69..00241d0659 100644 --- a/openam-console/src/main/java/com/sun/identity/console/task/model/TaskModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/task/model/TaskModelImpl.java @@ -28,7 +28,7 @@ /* * Portions Copyrighted 2011-2013 ForgeRock Inc. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.task.model; @@ -221,7 +221,7 @@ private Set getEntities( String entityId = (String) i.next(); EntityConfigElement elm = mgr.getEntityConfig(realm, entityId); // elm could be null due to OPENAM-269 - if (elm != null && elm.isHosted() == hosted) { + if (elm != null && elm.getValue().isHosted() == hosted) { EntityDescriptorElement desc = mgr.getEntityDescriptor( realm, entityId); @@ -286,14 +286,14 @@ public Map getConfigureGoogleAppsURLs(String realm, String entityId) String signinPageURL = null; if (idpssoDescriptor != null) { - List signonList = idpssoDescriptor.getSingleSignOnService(); + List signonList = idpssoDescriptor.getValue().getSingleSignOnService(); for (int i = 0; i < signonList.size(); i++) { SingleSignOnServiceElement signElem = (SingleSignOnServiceElement) signonList.get(i); - String tmp = signElem.getBinding(); + String tmp = signElem.getValue().getBinding(); if (tmp.contains("HTTP-Redirect")) { - signinPageURL = signElem.getLocation(); + signinPageURL = signElem.getValue().getLocation(); map.put("SigninPageURL", returnEmptySetIfValueIsNull( signinPageURL)); @@ -325,7 +325,7 @@ public Map getConfigureGoogleAppsURLs(String realm, String entityId) Map extValueMap = new HashMap(); IDPSSOConfigElement idpssoConfig = samlManager.getIDPSSOConfig(realm, entityId); if (idpssoConfig != null) { - BaseConfigType baseConfig = (BaseConfigType) idpssoConfig; + BaseConfigType baseConfig = idpssoConfig.getValue(); extValueMap = SAML2MetaUtils.getAttributes(baseConfig); } List aList = (List) extValueMap.get("signingCertAlias"); @@ -366,7 +366,7 @@ public Map getConfigureSalesForceAppsURLs( IDPSSOConfigElement idpssoConfig = samlManager.getIDPSSOConfig(realm, entityId); if (idpssoConfig != null) { - BaseConfigType baseConfig = (BaseConfigType) idpssoConfig; + BaseConfigType baseConfig = idpssoConfig.getValue(); extValueMap = SAML2MetaUtils.getAttributes(baseConfig); } List aList = (List) extValueMap.get("signingCertAlias"); @@ -436,13 +436,13 @@ public void setAcsUrl( samlManager.getSPSSODescriptor(realm, entityId); if (spssoDescriptor != null) { List asconsServiceList = - spssoDescriptor.getAssertionConsumerService(); + spssoDescriptor.getValue().getAssertionConsumerService(); for (Iterator i = asconsServiceList.listIterator(); i.hasNext();) { AssertionConsumerServiceElement acsElem = (AssertionConsumerServiceElement) i.next(); - if (acsElem.getBinding().contains("HTTP-POST")) { - acsElem.setLocation(acsUrl); + if (acsElem.getValue().getBinding().contains("HTTP-POST")) { + acsElem.getValue().setLocation(acsUrl); } } diff --git a/openam-core/pom.xml b/openam-core/pom.xml index 5d118a684f..7a9371bec9 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -456,17 +456,28 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 - com.sun.xml.bind - jaxb-core - - - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime + 3.0.2 + + + + + + + + + + + + + diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java index d467f94010..4725e10852 100755 --- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java +++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java @@ -26,6 +26,7 @@ * * Portions Copyrighted 2011-2016 ForgeRock AS. * Portions Copyrighted 2014 Nomura Research Institute, Ltd + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.entitlement.xacml3; @@ -46,11 +47,11 @@ import java.util.Set; import java.util.TimeZone; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import org.forgerock.util.annotations.VisibleForTesting; diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriter.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriter.java index 941332df3c..c54779eff3 100644 --- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriter.java +++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriter.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package com.sun.identity.entitlement.xacml3; @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.forgerock.openam.entitlement.ResourceType; import org.json.JSONException; diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactory.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactory.java index 9e774b80fa..00ef69509e 100644 --- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactory.java +++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactory.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.entitlement.xacml3; @@ -24,7 +25,7 @@ import com.sun.identity.entitlement.xacml3.core.EffectType; import com.sun.identity.entitlement.xacml3.core.ObjectFactory; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/FactoryMethods.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/FactoryMethods.java index 9456a3c913..0becc9c34d 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/FactoryMethods.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/FactoryMethods.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC. */ package com.sun.identity.entitlement.xacml3; @@ -32,7 +33,7 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.forgerock.openam.entitlement.conditions.environment.SessionCondition; import static org.forgerock.openam.utils.CollectionUtils.asSet; import org.json.JSONException; diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java index a2c568b68a..6f3ad87653 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java @@ -14,7 +14,7 @@ * Copyright 2014 Nomura Research Institute, Ltd. * * Portions Copyrighted 2014-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package com.sun.identity.entitlement.xacml3; @@ -28,7 +28,7 @@ import org.json.JSONException; import org.testng.annotations.Test; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java index a9573de258..aa5d73b694 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC. */ package com.sun.identity.entitlement.xacml3; @@ -29,7 +30,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.util.Arrays; import java.util.HashSet; diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/classloader/FAMClassLoader.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/classloader/FAMClassLoader.java index 1938724ca1..eabae227a3 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/classloader/FAMClassLoader.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/classloader/FAMClassLoader.java @@ -28,7 +28,7 @@ /** * Portions Copyrighted 2013 ForgeRock AS - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.classloader; @@ -222,7 +222,7 @@ private static void setSystemProperties() { "com.sun.xml.wss.", "com.sun.xml.security.", "com.sun.xml.xwss.", - "javax.xml.bind.", + "jakarta.xml.bind.", "javax.xml.ws.", "javax.jws.", "javax.jws.soap.", @@ -262,7 +262,7 @@ private static void setSystemProperties() { "com.sun.xml.wss.", "com.sun.xml.security.", "com.sun.xml.xwss.", - "javax.xml.bind.", + "jakarta.xml.bind.", "javax.xml.ws.", "javax.jws.", "javax.jws.soap.", @@ -288,7 +288,7 @@ private static void setSystemProperties() { * classLoader from loading. */ public static String[] maskedResouces = new String[]{ - "META-INF/services/javax.xml.bind.JAXBContext", + "META-INF/services/jakarta.xml.bind.JAXBContext", "META-INF/services", "/META-INF/services", "javax/xml/bind/", diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/configuration/ConfigFedMonitoring.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/configuration/ConfigFedMonitoring.java index c86dd6fb46..6b441544f5 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/configuration/ConfigFedMonitoring.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/configuration/ConfigFedMonitoring.java @@ -25,6 +25,7 @@ * $Id: ConfigFedMonitoring.java,v 1.2 2009/10/29 00:03:51 exu Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.configuration; @@ -326,7 +327,7 @@ public List getWSFedRoles(String entity, String realm) { FederationElement fedElem = metaManager.getEntityDescriptor(realm, entity); if (fedElem != null) { - for (Iterator iter = fedElem.getAny().iterator(); + for (Iterator iter = fedElem.getValue().getAny().iterator(); iter.hasNext(); ) { Object o = iter.next(); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/federation/plugins/FSDefaultSPAdapter.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/federation/plugins/FSDefaultSPAdapter.java index 51bd9095b8..86d8326f5c 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/federation/plugins/FSDefaultSPAdapter.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/federation/plugins/FSDefaultSPAdapter.java @@ -24,7 +24,7 @@ * * $Id: FSDefaultSPAdapter.java,v 1.6 2008/06/25 05:49:54 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.plugins; @@ -297,7 +297,7 @@ public boolean postSSOFederationSuccess( metaManager.getSPDescriptorConfig( realm, hostedEntityID); if (spConfig != null) { - metaAlias = spConfig.getMetaAlias(); + metaAlias = spConfig.getValue().getMetaAlias(); } } } catch (IDFFMetaException ie) { diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java index f9857d5bc9..7b0e516f84 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java @@ -27,6 +27,7 @@ */ /** * Portions Copyrighted 2012 ForgeRock Inc + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.liberty.ws.disco.plugins; @@ -43,7 +44,7 @@ import java.util.Set; import javax.xml.transform.stream.StreamSource; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import com.sun.identity.shared.debug.Debug; import com.sun.identity.liberty.ws.disco.common.DiscoConstants; @@ -57,8 +58,7 @@ import com.sun.identity.liberty.ws.disco.jaxb.RemoveEntryType; import com.sun.identity.liberty.ws.disco.jaxb.ResourceIDType; import com.sun.identity.liberty.ws.disco.jaxb.ResourceOfferingType; -import - com.sun.identity.liberty.ws.disco.jaxb.QueryType.RequestedServiceTypeType; +import com.sun.identity.liberty.ws.disco.jaxb.QueryType.RequestedServiceType; import com.sun.identity.liberty.ws.disco.jaxb11.GenerateBearerTokenElement; import com.sun.identity.liberty.ws.disco.plugins.jaxb.DiscoEntryElement; import com.sun.identity.plugin.datastore.DataStoreProvider; @@ -104,10 +104,10 @@ public static boolean getUserDiscoEntries( entry = (DiscoEntryElement) DiscoUtils.getDiscoUnmarshaller().unmarshal( XMLUtils.createSAXSource(new InputSource(new StringReader(entryStr)))); - entryID = entry.getResourceOffering().getEntryID(); + entryID = entry.getValue().getResourceOffering().getEntryID(); if ((entryID == null) || (entryID.length() == 0)) { entryID = SAMLUtils.generateID(); - entry.getResourceOffering().setEntryID(entryID); + entry.getValue().getResourceOffering().setEntryID(entryID); needStore = true; } discoEntries.put(entryID, entry); @@ -191,7 +191,7 @@ public static Map getQueryResults( String curKey = (String) i.next(); DiscoEntryElement cur = (DiscoEntryElement) discoEntries.get(curKey); - ResourceOfferingType offering = cur.getResourceOffering(); + ResourceOfferingType offering = cur.getValue().getResourceOffering(); String serviceType = offering.getServiceInstance().getServiceType(); List options = null; @@ -201,8 +201,8 @@ public static Map getQueryResults( Iterator j = reqServiceTypes.iterator(); while (j.hasNext()) { - RequestedServiceTypeType curReqType = - (RequestedServiceTypeType)j.next(); + RequestedServiceType curReqType = + (RequestedServiceType)j.next(); String requestedServiceType = curReqType.getServiceType(); if (!requestedServiceType.equals(serviceType)) { continue; @@ -325,15 +325,8 @@ public static Map handleInserts(Set discoEntries, List inserts) { List newEntryIDs = new LinkedList(); while (i.hasNext()) { insertEntry = (InsertEntryType) i.next(); - try { - de = DiscoUtils.getDiscoEntryFactory(). - createDiscoEntryElement(); - } catch (JAXBException je) { - debug.error( - "DiscoEntryHandlerImplUtils.handleInserts: couldn't " - + "create DiscoEntry: ", je); - return insertResults; - } + de = DiscoUtils.getDiscoEntryFactory(). + createDiscoEntryElement(new InsertEntryType()); resOff = insertEntry.getResourceOffering(); String newEntryID = SAMLUtils.generateID(); if (debug.messageEnabled()) { @@ -342,7 +335,7 @@ public static Map handleInserts(Set discoEntries, List inserts) { } resOff.setEntryID(newEntryID); newEntryIDs.add(newEntryID); - de.setResourceOffering(resOff); + de.getValue().setResourceOffering(resOff); List dirs = insertEntry.getAny(); if ((dirs != null) && !dirs.isEmpty()) { @@ -395,7 +388,7 @@ public static Map handleInserts(Set discoEntries, List inserts) { return insertResults; } } - de.getAny().addAll(dirs); + de.getValue().getAny().addAll(dirs); } if (!discoEntries.add(de)) { @@ -447,7 +440,7 @@ public static void getGlobalDiscoEntries(AMIdentity amIdentity, entry = (DiscoEntryElement) DiscoUtils.getDiscoUnmarshaller().unmarshal( XMLUtils.createSAXSource(new InputSource(new StringReader(entryStr)))); - resOff = entry.getResourceOffering(); + resOff = entry.getValue().getResourceOffering(); entryID = resOff.getEntryID(); if(entryID == null) { entryID = SAMLUtils.generateID(); @@ -463,7 +456,7 @@ public static void getGlobalDiscoEntries(AMIdentity amIdentity, resID.setValue(DiscoConstants.IMPLIED_RESOURCE); resOff.setResourceID(resID); } - entry.setResourceOffering(resOff); + entry.getValue().setResourceOffering(resOff); discoEntries.put(entryID, entry); } catch (Exception e) { debug.error("DiscoEntryHandlerImplUtils.getServiceDiscoEntries:" diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureGoogleApps.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureGoogleApps.java index a1d2e4ff9c..ee73e61049 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureGoogleApps.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureGoogleApps.java @@ -28,6 +28,7 @@ /** * Portions Copyrighted 2012 ForgeRock Inc + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; @@ -46,7 +47,7 @@ import java.util.Locale; import java.util.Map; import java.util.StringTokenizer; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** ** Configure GoogleApps. @@ -90,20 +91,20 @@ private void updateIDPMeta(String realm, String entityId) samlManager.getEntityConfig(realm, entityId); IDPSSOConfigElement idpssoConfig = samlManager.getIDPSSOConfig(realm, entityId); - List attrList = idpssoConfig.getAttribute(); + List attrList = idpssoConfig.getValue().getAttribute(); if (idpssoConfig != null) { for (Iterator it = attrList.iterator(); it.hasNext();) { AttributeElement avpnew = (AttributeElement) it.next(); - String name = avpnew.getName(); + String name = avpnew.getValue().getName(); if (name.equals("nameIDFormatMap")) { - for (Iterator itt = avpnew.getValue().listIterator(); + for (Iterator itt = avpnew.getValue().getValue().listIterator(); itt.hasNext();) { String temp = (String) itt.next(); if (temp.contains("unspecified")) { itt.remove(); } } - avpnew.getValue().add(0, nameidMapping); + avpnew.getValue().getValue().add(0, nameidMapping); } } } @@ -132,7 +133,7 @@ private void updateSPMeta(String realm, String cot, String domainId) try { EntityDescriptorElement e = SAML2MetaUtils.getEntityDescriptorElement(metadata); - String eId = e.getEntityID(); + String eId = e.getValue().getEntityID(); String metaAlias = generateMetaAliasForSP(realm); Map map = new HashMap(); map.put(MetaTemplateParameters.P_SP, metaAlias); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSalesForceApps.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSalesForceApps.java index a5e6c940eb..4a1c123d1c 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSalesForceApps.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSalesForceApps.java @@ -28,11 +28,13 @@ /** * Portions Copyrighted 2012-2013 ForgeRock Inc + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; import com.sun.identity.cot.COTException; import com.sun.identity.saml2.common.SAML2Constants; +import com.sun.identity.saml2.jaxb.entityconfig.AttributeElement; import com.sun.identity.saml2.jaxb.entityconfig.AttributeType; import com.sun.identity.saml2.jaxb.entityconfig.EntityConfigElement; import com.sun.identity.saml2.jaxb.entityconfig.ObjectFactory; @@ -46,7 +48,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** ** Configure SalesForceApps. @@ -103,7 +105,7 @@ private void updateSPMeta(String entityId, String realm, String cot, List attrMa localMetadata = METADATA.replace(ENTITY_ID_PLACEHOLDER, entityId); EntityDescriptorElement e = SAML2MetaUtils.getEntityDescriptorElement(localMetadata); - String eId = e.getEntityID(); + String eId = e.getValue().getEntityID(); String metaAlias = generateMetaAliasForSP(realm); Map map = new HashMap(); map.put(MetaTemplateParameters.P_SP, metaAlias); @@ -136,18 +138,16 @@ private void updateSPMeta(String entityId, String realm, String cot, List attrMa if (ssoConfig != null) { ObjectFactory objFactory = new ObjectFactory(); - AttributeType avp = objFactory.createAttributeElement(); + AttributeElement avp = objFactory.createAttributeElement(objFactory.createAttributeType()); String key = SAML2Constants.ATTRIBUTE_MAP; - avp.setName(key); - avp.getValue().addAll(attrMapping); - ssoConfig.getAttribute().add(avp); + avp.getValue().setName(key); + avp.getValue().getValue().addAll(attrMapping); + ssoConfig.getValue().getAttribute().add(avp); } manager.setEntityConfig(realm, config); } } catch (SAML2MetaException e) { throw new WorkflowException(e.getMessage()); - } catch (JAXBException e) { - throw new WorkflowException(e.getMessage()); } } diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedIDP.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedIDP.java index 60ffae231c..93042f9a45 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedIDP.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedIDP.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: CreateHostedIDP.java,v 1.9 2008/06/25 05:50:01 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -114,7 +116,7 @@ public String execute(Locale locale, Map params) IDPSSOConfigElement ssoConfig = manager.getIDPSSOConfig(realm, entityId); - Map attribConfig = SAML2MetaUtils.getAttributes(ssoConfig); + Map attribConfig = SAML2MetaUtils.getAttributes(ssoConfig.getValue()); List mappedAttributes = (List)attribConfig.get( SAML2Constants.ATTRIBUTE_MAP); mappedAttributes.addAll(attrMapping); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedSP.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedSP.java index 529235d8a0..e02b5f5176 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedSP.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateHostedSP.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: CreateHostedSP.java,v 1.9 2010/01/04 19:10:50 veiming Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -122,7 +124,7 @@ public String execute(Locale locale, Map params) realm, entityId); SPSSOConfigElement ssoConfig = manager.getSPSSOConfig( realm, entityId); - Map attribConfig = SAML2MetaUtils.getAttributes(ssoConfig); + Map attribConfig = SAML2MetaUtils.getAttributes(ssoConfig.getValue()); List mappedAttributes = (List) attribConfig.get( SAML2Constants.ATTRIBUTE_MAP); mappedAttributes.addAll(attrMapping); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateRemoteSP.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateRemoteSP.java index 33c5852e32..fbf7ce9fc8 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateRemoteSP.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateRemoteSP.java @@ -28,11 +28,13 @@ /* * Portions Copyrighted 2012 ForgeRock Inc + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; import com.sun.identity.cot.COTException; import com.sun.identity.saml2.common.SAML2Constants; +import com.sun.identity.saml2.jaxb.entityconfig.AttributeElement; import com.sun.identity.saml2.jaxb.entityconfig.AttributeType; import com.sun.identity.saml2.jaxb.entityconfig.EntityConfigElement; import com.sun.identity.saml2.jaxb.entityconfig.ObjectFactory; @@ -44,7 +46,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** * Creates Remote Service Provider. @@ -75,7 +77,7 @@ public String execute(Locale locale, Map params) try { EntityDescriptorElement e = SAML2MetaUtils.getEntityDescriptorElement(metadata); - String eId = e.getEntityID(); + String eId = e.getValue().getEntityID(); extendedMeta = createExtendedDataTemplate( eId, false); @@ -108,18 +110,16 @@ public String execute(Locale locale, Map params) if (ssoConfig != null) { ObjectFactory objFactory = new ObjectFactory(); - AttributeType avp = objFactory.createAttributeElement(); + AttributeElement avp = objFactory.createAttributeElement(objFactory.createAttributeType()); String key = SAML2Constants.ATTRIBUTE_MAP; - avp.setName(key); - avp.getValue().addAll(attrMapping); - ssoConfig.getAttribute().add(avp); + avp.getValue().setName(key); + avp.getValue().getValue().addAll(attrMapping); + ssoConfig.getValue().getAttribute().add(avp); } manager.setEntityConfig(realm, config); } } catch (SAML2MetaException e) { throw new WorkflowException(e.getMessage()); - } catch (JAXBException e) { - throw new WorkflowException(e.getMessage()); } return getMessage("sp.configured", locale); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateWSFedMetaDataTemplate.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateWSFedMetaDataTemplate.java index 392d810e9c..d23cabb300 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateWSFedMetaDataTemplate.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateWSFedMetaDataTemplate.java @@ -25,6 +25,7 @@ * $Id: CreateWSFedMetaDataTemplate.java,v 1.9 2009/12/14 23:42:49 mallas Exp $ * * Portions Copyrighted 2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; @@ -35,7 +36,9 @@ import com.sun.identity.saml2.key.KeyUtil; import com.sun.identity.saml2.meta.SAML2MetaManager; import com.sun.identity.wsfederation.common.WSFederationConstants; +import com.sun.identity.wsfederation.jaxb.entityconfig.BaseConfigType; import com.sun.identity.wsfederation.jaxb.entityconfig.FederationConfigElement; +import com.sun.identity.wsfederation.jaxb.wsaddr.EndpointReferenceType; import com.sun.identity.wsfederation.jaxb.wsfederation.ClaimType; import com.sun.identity.wsfederation.jaxb.wsfederation.DisplayNameType; import com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement; @@ -46,13 +49,14 @@ import com.sun.identity.wsfederation.jaxb.wsfederation.TokenType; import com.sun.identity.wsfederation.jaxb.wsfederation.TokenTypesOfferedElement; import com.sun.identity.wsfederation.jaxb.wsfederation.UriNamedClaimTypesOfferedElement; +import com.sun.identity.wsfederation.jaxb.wsse.SecurityTokenReferenceType; import com.sun.identity.wsfederation.meta.WSFederationMetaUtils; import java.io.StringWriter; import java.security.cert.CertificateEncodingException; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import com.sun.identity.wsfederation.jaxb.wsse.SecurityTokenReferenceElement; import com.sun.identity.wsfederation.jaxb.xmlsig.X509DataElement; import com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509Certificate; @@ -76,8 +80,8 @@ public static String createStandardMetaTemplate( objFactory = new com.sun.identity.wsfederation.jaxb.wsfederation.ObjectFactory(); - FederationElement fed = objFactory.createFederationElement(); - fed.setFederationID(entityId); + FederationElement fed = objFactory.createFederationElement(objFactory.createFederationType()); + fed.getValue().setFederationID(entityId); String idpAlias = (String)mapParams.get(MetaTemplateParameters.P_IDP); if (idpAlias != null) { @@ -124,42 +128,42 @@ private static void addWSFedIdentityProviderTemplate( com.sun.identity.wsfederation.jaxb.xmlsig.ObjectFactory(); TokenSigningKeyInfoElement tski = - objFactory.createTokenSigningKeyInfoElement(); + objFactory.createTokenSigningKeyInfoElement(objFactory.createTokenKeyInfoType()); SecurityTokenReferenceElement str = - secextObjFactory.createSecurityTokenReferenceElement(); - X509DataElement x509Data = dsObjectFactory.createX509DataElement(); + secextObjFactory.createSecurityTokenReferenceElement(secextObjFactory.createSecurityTokenReferenceType()); + X509DataElement x509Data = dsObjectFactory.createX509DataElement(dsObjectFactory.createX509DataType()); X509Certificate x509Cert = - dsObjectFactory.createX509DataTypeX509Certificate(); + dsObjectFactory.createX509DataTypeX509Certificate(new byte[]{}); x509Cert.setValue( KeyUtil.getKeyProviderInstance().getX509Certificate(idpSCertAlias).getEncoded()); - x509Data.getX509IssuerSerialOrX509SKIOrX509SubjectName().add(x509Cert); - str.getAny().add(x509Data); - tski.setSecurityTokenReference(str); - fed.getAny().add(tski); + x509Data.getValue().getX509IssuerSerialOrX509SKIOrX509SubjectName().add(x509Cert); + str.getValue().getAny().add(x509Data); + tski.getValue().setSecurityTokenReference(str); + fed.getValue().getAny().add(tski); } - TokenIssuerNameElement tin = objFactory.createTokenIssuerNameElement(); - tin.setValue(entityId); - fed.getAny().add(tin); + TokenIssuerNameElement tin = objFactory.createTokenIssuerNameElement(objFactory.createAttributeExtensibleURI()); + tin.getValue().setValue(entityId); + fed.getValue().getAny().add(tin); TokenIssuerEndpointElement tie = - objFactory.createTokenIssuerEndpointElement(); + objFactory.createTokenIssuerEndpointElement(new EndpointReferenceType()); com.sun.identity.wsfederation.jaxb.wsaddr.ObjectFactory addrObjFactory = new com.sun.identity.wsfederation.jaxb.wsaddr.ObjectFactory(); AttributedURIType auri = addrObjFactory.createAttributedURIType(); auri.setValue(url + "/WSFederationServlet" + maStr); - tie.setAddress(auri); - fed.getAny().add(tie); + tie.getValue().setAddress(auri); + fed.getValue().getAny().add(tie); TokenTypesOfferedElement tto = - objFactory.createTokenTypesOfferedElement(); + objFactory.createTokenTypesOfferedElement(objFactory.createTokenTypesOfferedType()); TokenType tt = objFactory.createTokenType(); tt.setUri(WSFederationConstants.URN_OASIS_NAMES_TC_SAML_11); - tto.getTokenType().add(tt); - fed.getAny().add(tto); + tto.getValue().getTokenType().add(tt); + fed.getValue().getAny().add(tto); UriNamedClaimTypesOfferedElement uncto = - objFactory.createUriNamedClaimTypesOfferedElement(); + objFactory.createUriNamedClaimTypesOfferedElement(objFactory.createUriNamedClaimTypesOfferedType()); ClaimType ct = objFactory.createClaimType(); ct.setUri(WSFederationConstants.NAMED_CLAIM_TYPES[ WSFederationConstants.NAMED_CLAIM_UPN]); @@ -167,8 +171,8 @@ private static void addWSFedIdentityProviderTemplate( dnt.setValue(WSFederationConstants.NAMED_CLAIM_DISPLAY_NAMES[ WSFederationConstants.NAMED_CLAIM_UPN]); ct.setDisplayName(dnt); - uncto.getClaimType().add(ct); - fed.getAny().add(uncto); + uncto.getValue().getClaimType().add(ct); + fed.getValue().getAny().add(uncto); } private static void addWSFedServiceProviderTemplate( @@ -185,25 +189,25 @@ private static void addWSFedServiceProviderTemplate( String spAlias = (String)mapParams.get(MetaTemplateParameters.P_SP); String maStr = buildMetaAliasInURI(spAlias); - TokenIssuerNameElement tin = objFactory.createTokenIssuerNameElement(); - tin.setValue(entityId); - fed.getAny().add(tin); + TokenIssuerNameElement tin = objFactory.createTokenIssuerNameElement(objFactory.createAttributeExtensibleURI()); + tin.getValue().setValue(entityId); + fed.getValue().getAny().add(tin); TokenIssuerEndpointElement tie = - objFactory.createTokenIssuerEndpointElement(); + objFactory.createTokenIssuerEndpointElement(new EndpointReferenceType()); com.sun.identity.wsfederation.jaxb.wsaddr.ObjectFactory addrObjFactory = new com.sun.identity.wsfederation.jaxb.wsaddr.ObjectFactory(); AttributedURIType auri = addrObjFactory.createAttributedURIType(); auri.setValue(url + "/WSFederationServlet" + maStr); - tie.setAddress(auri); - fed.getAny().add(tie); + tie.getValue().setAddress(auri); + fed.getValue().getAny().add(tie); SingleSignOutNotificationEndpointElement ssne = - objFactory.createSingleSignOutNotificationEndpointElement(); + objFactory.createSingleSignOutNotificationEndpointElement(new EndpointReferenceType()); AttributedURIType ssneUri = addrObjFactory.createAttributedURIType(); ssneUri.setValue(url + "/WSFederationServlet" + maStr); - ssne.setAddress(auri); - fed.getAny().add(ssne); + ssne.getValue().setAddress(auri); + fed.getValue().getAny().add(ssne); } public static String createExtendedMetaTemplate( @@ -215,10 +219,10 @@ public static String createExtendedMetaTemplate( objFactory = new com.sun.identity.wsfederation.jaxb.entityconfig.ObjectFactory(); FederationConfigElement fedConfig = - objFactory.createFederationConfigElement(); + objFactory.createFederationConfigElement(objFactory.createFederationConfigType()); - fedConfig.setFederationID(entityId); - fedConfig.setHosted(true); + fedConfig.getValue().setFederationID(entityId); + fedConfig.getValue().setHosted(true); String idpAlias = (String)mapParams.get(MetaTemplateParameters.P_IDP); if (idpAlias != null) { @@ -271,23 +275,23 @@ private static void buildWSFedIDPConfigTemplate( }; com.sun.identity.wsfederation.jaxb.entityconfig.IDPSSOConfigElement - idpSSOConfig = objFactory.createIDPSSOConfigElement(); + idpSSOConfig = objFactory.createIDPSSOConfigElement(new BaseConfigType() {}); - idpSSOConfig.setMetaAlias(idpAlias); + idpSSOConfig.getValue().setMetaAlias(idpAlias); for ( int i = 0; i < configDefaults.length; i++ ) { com.sun.identity.wsfederation.jaxb.entityconfig.AttributeElement - attribute = objFactory.createAttributeElement(); - attribute.setName(configDefaults[i][0]); + attribute = objFactory.createAttributeElement(objFactory.createAttributeType()); + attribute.getValue().setName(configDefaults[i][0]); if (configDefaults[i][1] != null) { - attribute.getValue().add(configDefaults[i][1]); + attribute.getValue().getValue().add(configDefaults[i][1]); } - idpSSOConfig.getAttribute().add(attribute); + idpSSOConfig.getValue().getAttribute().add(attribute); } - fedConfig.getIDPSSOConfigOrSPSSOConfig().add(idpSSOConfig); + fedConfig.getValue().getIDPSSOConfigOrSPSSOConfig().add(idpSSOConfig); } private static void buildWSFedSPConfigTemplate( @@ -333,23 +337,23 @@ private static void buildWSFedSPConfigTemplate( }; com.sun.identity.wsfederation.jaxb.entityconfig.SPSSOConfigElement - spSSOConfig = objFactory.createSPSSOConfigElement(); + spSSOConfig = objFactory.createSPSSOConfigElement(new BaseConfigType() {}); - spSSOConfig.setMetaAlias(spAlias); + spSSOConfig.getValue().setMetaAlias(spAlias); for ( int i = 0; i < configDefaults.length; i++ ) { com.sun.identity.wsfederation.jaxb.entityconfig.AttributeElement - attribute = objFactory.createAttributeElement(); - attribute.setName(configDefaults[i][0]); + attribute = objFactory.createAttributeElement(objFactory.createAttributeType()); + attribute.getValue().setName(configDefaults[i][0]); if (configDefaults[i][1] != null) { - attribute.getValue().add(configDefaults[i][1]); + attribute.getValue().getValue().add(configDefaults[i][1]); } - spSSOConfig.getAttribute().add(attribute); + spSSOConfig.getValue().getAttribute().add(attribute); } - fedConfig.getIDPSSOConfigOrSPSSOConfig().add(spSSOConfig); + fedConfig.getValue().getIDPSSOConfigOrSPSSOConfig().add(spSSOConfig); } private static String getHostURL() { diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ExportSAML2MetaData.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ExportSAML2MetaData.java index 79d6bec1dd..306e0fb85b 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ExportSAML2MetaData.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ExportSAML2MetaData.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: ExportSAML2MetaData.java,v 1.4 2009/09/21 17:27:04 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -35,7 +37,7 @@ import com.sun.identity.saml2.meta.SAML2MetaUtils; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** * Export SAML2 Metadata. diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java index bf23ad3598..55e0111085 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java @@ -28,6 +28,7 @@ /* * Portions Copyrighted 2014 ForgeRock AS. * Portions Copyrighted 2014 Nomura Research Institute, Ltd. + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; @@ -43,7 +44,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.forgerock.openam.utils.StringUtils; @@ -111,9 +112,9 @@ private String getRealmFromExtData(String xml) EntityConfigElement configElt = (obj instanceof EntityConfigElement) ? (EntityConfigElement)obj : null; - if (configElt != null && configElt.isHosted()) { + if (configElt != null && configElt.getValue().isHosted()) { List config = - configElt.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + configElt.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); if (!config.isEmpty()) { BaseConfigType bConfig = (BaseConfigType) config.iterator().next(); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetHostedIDPs.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetHostedIDPs.java index 807a387048..8448f3dfbe 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetHostedIDPs.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetHostedIDPs.java @@ -28,6 +28,7 @@ /* * Portions Copyrighted 2011 ForgeRock AS + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; @@ -68,7 +69,7 @@ public String execute(Locale locale, Map params) String entityId = (String) i.next(); EntityConfigElement elm = mgr.getEntityConfig(realm, entityId); // elm could be null due to OPENAM-269 - if (elm != null && elm.isHosted()) { + if (elm != null && elm.getValue().isHosted()) { EntityDescriptorElement desc = mgr.getEntityDescriptor( realm, entityId); if (SAML2MetaUtils.getIDPSSODescriptor(desc) != null) { diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetIDPSPPairingInCOT.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetIDPSPPairingInCOT.java index 6e2f101297..026fd8c2b1 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetIDPSPPairingInCOT.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetIDPSPPairingInCOT.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: GetIDPSPPairingInCOT.java,v 1.3 2009/01/09 17:42:55 veiming Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -99,7 +101,7 @@ private List getHostedIDPMetaAlias(String realm, List hostedIDP) for (Iterator i = hostedIDP.iterator(); i.hasNext();) { String e = (String) i.next(); IDPSSOConfigElement cfg = mgr.getIDPSSOConfig(realm, e); - list.add(e + "(" + cfg.getMetaAlias() + ")"); + list.add(e + "(" + cfg.getValue().getMetaAlias() + ")"); } return list; } catch (SAML2MetaException ex) { @@ -115,7 +117,7 @@ private List getHostedSPMetaAlias(String realm, List hostedSP) for (Iterator i = hostedSP.iterator(); i.hasNext();) { String e = (String) i.next(); SPSSOConfigElement cfg = mgr.getSPSSOConfig(realm, e); - list.add(e + "(" + cfg.getMetaAlias() + ")"); + list.add(e + "(" + cfg.getValue().getMetaAlias() + ")"); } return list; } catch (SAML2MetaException ex) { @@ -182,7 +184,7 @@ private List getEntities( for (Iterator i = entities.iterator(); i.hasNext();) { String entityId = (String) i.next(); EntityConfigElement elm = mgr.getEntityConfig(realm, entityId); - if (elm.isHosted() == hosted) { + if (elm.getValue().isHosted() == hosted) { EntityDescriptorElement desc = mgr.getEntityDescriptor( realm, entityId); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java index 515569cfdb..b840c76a97 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java @@ -25,6 +25,7 @@ * $Id: ImportSAML2MetaData.java,v 1.5 2008/07/08 01:12:01 exu Exp $ * * Portions Copyrighted 2011-2014 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; @@ -36,7 +37,7 @@ import com.sun.identity.shared.debug.Debug; import com.sun.identity.shared.xml.XMLUtils; import java.util.List; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.w3c.dom.Document; /** @@ -72,9 +73,9 @@ public static String[] importData( Object obj = SAML2MetaUtils.convertStringToJAXB(extended); configElt = (obj instanceof EntityConfigElement) ? (EntityConfigElement)obj : null; - if (configElt != null && configElt.isHosted()) { + if (configElt != null && configElt.getValue().isHosted()) { List config = - configElt.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + configElt.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); if (!config.isEmpty()) { BaseConfigType bConfig = (BaseConfigType) config.iterator().next(); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ValidateSAML2.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ValidateSAML2.java index 92bc28e6d3..58546328d5 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ValidateSAML2.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ValidateSAML2.java @@ -25,6 +25,7 @@ * $Id: ValidateSAML2.java,v 1.4 2009/11/20 22:45:57 ggennaro Exp $ * * Portions Copyrighted 2014-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.workflow; @@ -98,14 +99,14 @@ private void validateIDP() Object[] param = {idpEntityId}; throw new WorkflowException("cannot.locate.idp", param); } else { - if (!idpConfig.getMetaAlias().equals(idpMetaAlias)) { + if (!idpConfig.getValue().getMetaAlias().equals(idpMetaAlias)) { Object[] param = {idpEntityId}; throw new WorkflowException("cannot.locate.idp", param); } } } - List ssoServiceList = elt.getSingleSignOnService(); + List ssoServiceList = elt.getValue().getSingleSignOnService(); idpBaseURL = getIDPBaseURL(ssoServiceList); if (idpBaseURL == null) { Object[] param = {idpEntityId}; @@ -127,8 +128,8 @@ private String getIDPBaseURL(List ssoServiceList) { i.hasNext() && (url == null);) { SingleSignOnServiceElement sso = (SingleSignOnServiceElement) i.next(); - if ((sso != null) && (sso.getBinding() != null)) { - String ssoURL = sso.getLocation(); + if ((sso != null) && (sso.getValue().getBinding() != null)) { + String ssoURL = sso.getValue().getLocation(); int loc = ssoURL.indexOf("/metaAlias/"); if (loc != -1) { String tmp = ssoURL.substring(0, loc); @@ -159,13 +160,13 @@ private void validateSP() Object[] param = {spEntityId}; throw new WorkflowException("cannot.locate.sp", param); } else { - if (!spConfig.getMetaAlias().equals(spMetaAlias)) { + if (!spConfig.getValue().getMetaAlias().equals(spMetaAlias)) { Object[] param = {spEntityId}; throw new WorkflowException("cannot.locate.sp", param); } } } - List sloServiceList = elt.getSingleLogoutService(); + List sloServiceList = elt.getValue().getSingleLogoutService(); spBaseURL = getSPBaseURL(sloServiceList); if (spBaseURL == null) { bFedlet = true; @@ -203,8 +204,8 @@ private String getSPBaseURL(List sloServiceList) { i.hasNext() && (url == null);) { SingleLogoutServiceElement sso = (SingleLogoutServiceElement) i.next(); - if ((sso != null) && (sso.getBinding() != null)) { - String ssoURL = sso.getLocation(); + if ((sso != null) && (sso.getValue().getBinding() != null)) { + String ssoURL = sso.getValue().getLocation(); int loc = ssoURL.indexOf("/metaAlias/"); if (loc != -1) { String tmp = ssoURL.substring(0, loc); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wsfederation/plugins/DefaultADFSPartnerAccountMapper.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wsfederation/plugins/DefaultADFSPartnerAccountMapper.java index 5c20b37f70..a0c65f8f0d 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wsfederation/plugins/DefaultADFSPartnerAccountMapper.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wsfederation/plugins/DefaultADFSPartnerAccountMapper.java @@ -24,6 +24,8 @@ * * $Id: DefaultADFSPartnerAccountMapper.java,v 1.5 2009/10/29 00:03:49 exu Exp $ * + * Portions Copyrighted 2026 3A Systems LLC + * */ package com.sun.identity.wsfederation.plugins; @@ -84,16 +86,16 @@ protected Map getSearchParameters(NameIdentifier nameID, throw new WSFederationException(wsfme); } - String nameIdAttribute = WSFederationMetaUtils.getAttribute(idpConfig, + String nameIdAttribute = WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.NAMEID_ATTRIBUTE); // Search on uid by default if ( nameIdAttribute == null || nameIdAttribute.length() == 0) { nameIdAttribute = WSFederationConstants.UID; } - String domainAttribute = WSFederationMetaUtils.getAttribute(idpConfig, + String domainAttribute = WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.DOMAIN_ATTRIBUTE); String strNameIncludesDomain = - WSFederationMetaUtils.getAttribute(idpConfig, + WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.NAME_INCLUDES_DOMAIN); boolean nameIncludesDomain = Boolean.valueOf(strNameIncludesDomain); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/NamespacePrefixMapperImpl.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/NamespacePrefixMapperImpl.java index d899485f6a..b96f73f1a3 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/NamespacePrefixMapperImpl.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/NamespacePrefixMapperImpl.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: NamespacePrefixMapperImpl.java,v 1.1 2009/09/17 05:49:29 mallas Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -32,7 +34,7 @@ import java.util.Map; import java.util.HashMap; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; /** diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyManager.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyManager.java index d07ed13bd2..dd1ae19249 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyManager.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyManager.java @@ -23,11 +23,13 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: WSSPolicyManager.java,v 1.2 2009/12/19 00:09:41 asyhuang Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ package com.sun.identity.wss.policy; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; import java.util.List; import java.util.Iterator; @@ -54,16 +56,14 @@ import com.sun.identity.wsfederation.jaxb.wsspolicy.LayoutElement; import com.sun.identity.wsfederation.jaxb.wsspolicy.ProtectionTokenElement; import com.sun.identity.wsfederation.jaxb.wsspolicy.KerberosTokenElement; -import com.sun.identity.wsfederation.jaxb.wsspolicy. - WssKerberosV5ApReqToken11Element; +import com.sun.identity.wsfederation.jaxb.wsspolicy.WssKerberosV5ApReqToken11Element; import com.sun.identity.wsfederation.jaxb.wsspolicy.SignedPartsElement; import com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptedPartsElement; import com.sun.identity.wsfederation.jaxb.wsspolicy.HeaderType; import com.sun.identity.wsfederation.jaxb.wsspolicy.IssuedTokenElement; import com.sun.identity.wsfederation.jaxb.wsaddr.EndpointReferenceElement; import com.sun.identity.wsfederation.jaxb.wsaddr.AttributedURIType; -import com.sun.identity.wsfederation.jaxb.wsspolicy. - RequestSecurityTokenTemplateType; +import com.sun.identity.wsfederation.jaxb.wsspolicy.RequestSecurityTokenTemplateType; import com.sun.identity.wss.provider.ProviderConfig; import com.sun.identity.wss.security.SecurityMechanism; import com.sun.identity.wss.security.WSSConstants; @@ -117,7 +117,7 @@ public String getPolicy(ProviderConfig providerConfig) try { PolicyElement policyElement = wsPolicyFactory.createPolicyElement(); ExactlyOneElement exactlyOneElement = - wsPolicyFactory.createExactlyOneElement(); + wsPolicyFactory.createExactlyOneElement(wsPolicyFactory.createPolicyElement()); //TODO - Need to add a config in the WSP config and then create the // issued token policy. boolean useIssuedTokenPolicy = false; @@ -128,14 +128,14 @@ public String getPolicy(ProviderConfig providerConfig) } for (Iterator iter = securityMech.iterator(); iter.hasNext();) { String secMech = (String)iter.next(); - AllElement allElement = wsPolicyFactory.createAllElement(); + AllElement allElement = wsPolicyFactory.createAllElement(wsPolicyFactory.createPolicyElement()); if(SecurityMechanism.WSS_NULL_KERBEROS_TOKEN_URI.equals( secMech)) { SymmetricBindingElement sbe = - wssPolicyFactory.createSymmetricBindingElement(); + wssPolicyFactory.createSymmetricBindingElement(wssPolicyFactory.createNestedPolicyType()); PolicyElement policyElement1 = wsPolicyFactory.createPolicyElement(); - sbe.setPolicy(policyElement1); + sbe.getValue().setPolicy(policyElement1); ProtectionTokenElement pte = createProtectionTokenElement(secMech); policyElement1.getPolicyOrAllOrExactlyOne().add(pte); @@ -151,17 +151,17 @@ public String getPolicy(ProviderConfig providerConfig) policyElement1.getPolicyOrAllOrExactlyOne().add( createLayoutElement()); policyElement1.getPolicyOrAllOrExactlyOne().add( - wssPolicyFactory.createIncludeTimestampElement()); + wssPolicyFactory.createIncludeTimestamp(wssPolicyFactory.createQNameAssertionType())); policyElement1.getPolicyOrAllOrExactlyOne().add( wssPolicyFactory. - createOnlySignEntireHeadersAndBodyElement()); - allElement.getPolicyOrAllOrExactlyOne().add(sbe); + createOnlySignEntireHeadersAndBody(wssPolicyFactory.createQNameAssertionType())); + allElement.getValue().getPolicyOrAllOrExactlyOne().add(sbe); } else if (useIssuedTokenPolicy) { AsymmetricBindingElement abe = - wssPolicyFactory.createAsymmetricBindingElement(); + wssPolicyFactory.createAsymmetricBindingElement(wssPolicyFactory.createNestedPolicyType()); PolicyElement policyElement1 = wsPolicyFactory.createPolicyElement(); - abe.setPolicy(policyElement1); + abe.getValue().setPolicy(policyElement1); IssuedTokenElement ite = createIssuedTokenElement(); policyElement1.getPolicyOrAllOrExactlyOne().add(ite); @@ -178,20 +178,20 @@ public String getPolicy(ProviderConfig providerConfig) policyElement1.getPolicyOrAllOrExactlyOne().add( createLayoutElement()); policyElement1.getPolicyOrAllOrExactlyOne().add( - wssPolicyFactory.createIncludeTimestampElement()); + wssPolicyFactory.createIncludeTimestamp(wssPolicyFactory.createQNameAssertionType())); policyElement1.getPolicyOrAllOrExactlyOne().add( wssPolicyFactory. - createOnlySignEntireHeadersAndBodyElement()); - allElement.getPolicyOrAllOrExactlyOne().add(abe); - exactlyOneElement.getPolicyOrAllOrExactlyOne().add( + createOnlySignEntireHeadersAndBody(wssPolicyFactory.createQNameAssertionType())); + allElement.getValue().getPolicyOrAllOrExactlyOne().add(abe); + exactlyOneElement.getValue().getPolicyOrAllOrExactlyOne().add( allElement); break; } else { AsymmetricBindingElement abe = - wssPolicyFactory.createAsymmetricBindingElement(); + wssPolicyFactory.createAsymmetricBindingElement(wssPolicyFactory.createNestedPolicyType()); PolicyElement policyElement1 = wsPolicyFactory.createPolicyElement(); - abe.setPolicy(policyElement1); + abe.getValue().setPolicy(policyElement1); InitiatorTokenElement ite = createInitiatorTokenElement(secMech); @@ -210,13 +210,13 @@ public String getPolicy(ProviderConfig providerConfig) policyElement1.getPolicyOrAllOrExactlyOne().add( createLayoutElement()); policyElement1.getPolicyOrAllOrExactlyOne().add( - wssPolicyFactory.createIncludeTimestampElement()); + wssPolicyFactory.createIncludeTimestamp(wssPolicyFactory.createQNameAssertionType())); policyElement1.getPolicyOrAllOrExactlyOne().add( wssPolicyFactory. - createOnlySignEntireHeadersAndBodyElement()); - allElement.getPolicyOrAllOrExactlyOne().add(abe); + createOnlySignEntireHeadersAndBody(wssPolicyFactory.createQNameAssertionType())); + allElement.getValue().getPolicyOrAllOrExactlyOne().add(abe); } - exactlyOneElement.getPolicyOrAllOrExactlyOne().add(allElement); + exactlyOneElement.getValue().getPolicyOrAllOrExactlyOne().add(allElement); } policyElement.getPolicyOrAllOrExactlyOne().add(exactlyOneElement); @@ -246,24 +246,24 @@ public String getInputPolicy(ProviderConfig providerConfig) try { PolicyElement policyElement = wsPolicyFactory.createPolicyElement(); ExactlyOneElement exactlyOneElement = - wsPolicyFactory.createExactlyOneElement(); - AllElement allElement = wsPolicyFactory.createAllElement(); + wsPolicyFactory.createExactlyOneElement(wsPolicyFactory.createPolicyElement()); + AllElement allElement = wsPolicyFactory.createAllElement(wsPolicyFactory.createPolicyElement()); policyElement.getPolicyOrAllOrExactlyOne().add(exactlyOneElement); if(providerConfig.isRequestSignEnabled()) { SignedPartsElement signedParts = - wssPolicyFactory.createSignedPartsElement(); - signedParts.setBody(wssPolicyFactory.createEmptyType()); - allElement.getPolicyOrAllOrExactlyOne().add(signedParts); + wssPolicyFactory.createSignedPartsElement(wssPolicyFactory.createSePartsType()); + signedParts.getValue().setBody(wssPolicyFactory.createEmptyType()); + allElement.getValue().getPolicyOrAllOrExactlyOne().add(signedParts); } if(providerConfig.isRequestEncryptEnabled() || providerConfig.isRequestHeaderEncryptEnabled()) { EncryptedPartsElement encryptedParts = - wssPolicyFactory.createEncryptedPartsElement(); + wssPolicyFactory.createEncryptedPartsElement(wssPolicyFactory.createSePartsType()); if(providerConfig.isRequestEncryptEnabled()) { - encryptedParts.setBody(wssPolicyFactory.createEmptyType()); + encryptedParts.getValue().setBody(wssPolicyFactory.createEmptyType()); } if(providerConfig.isRequestHeaderEncryptEnabled()) { HeaderType headerType = @@ -271,11 +271,11 @@ public String getInputPolicy(ProviderConfig providerConfig) headerType.setName( new QName(WSSConstants.WSSE_SECURITY_LNAME)); headerType.setNamespace(WSSConstants.WSSE11_NS); - encryptedParts.getHeader().add(headerType); + encryptedParts.getValue().getHeader().add(headerType); } - allElement.getPolicyOrAllOrExactlyOne().add(encryptedParts); + allElement.getValue().getPolicyOrAllOrExactlyOne().add(encryptedParts); } - exactlyOneElement.getPolicyOrAllOrExactlyOne().add(allElement); + exactlyOneElement.getValue().getPolicyOrAllOrExactlyOne().add(allElement); return WSSPolicyUtils.convertJAXBToString(policyElement); } catch (JAXBException je) { WSSUtils.debug.error("WSSPolicyManager.getInputPolicy: " + @@ -299,25 +299,25 @@ public String getOutputPolicy(ProviderConfig providerConfig) try { PolicyElement policyElement = wsPolicyFactory.createPolicyElement(); ExactlyOneElement exactlyOneElement = - wsPolicyFactory.createExactlyOneElement(); - AllElement allElement = wsPolicyFactory.createAllElement(); + wsPolicyFactory.createExactlyOneElement(wsPolicyFactory.createPolicyElement()); + AllElement allElement = wsPolicyFactory.createAllElement(wsPolicyFactory.createPolicyElement()); policyElement.getPolicyOrAllOrExactlyOne().add(exactlyOneElement); if(providerConfig.isResponseSignEnabled()) { SignedPartsElement signedParts = - wssPolicyFactory.createSignedPartsElement(); - signedParts.setBody(wssPolicyFactory.createEmptyType()); - allElement.getPolicyOrAllOrExactlyOne().add(signedParts); + wssPolicyFactory.createSignedPartsElement(wssPolicyFactory.createSePartsType()); + signedParts.getValue().setBody(wssPolicyFactory.createEmptyType()); + allElement.getValue().getPolicyOrAllOrExactlyOne().add(signedParts); } if(providerConfig.isResponseEncryptEnabled()) { EncryptedPartsElement encryptedParts = - wssPolicyFactory.createEncryptedPartsElement(); - encryptedParts.setBody(wssPolicyFactory.createEmptyType()); - allElement.getPolicyOrAllOrExactlyOne().add(encryptedParts); + wssPolicyFactory.createEncryptedPartsElement(wssPolicyFactory.createSePartsType()); + encryptedParts.getValue().setBody(wssPolicyFactory.createEmptyType()); + allElement.getValue().getPolicyOrAllOrExactlyOne().add(encryptedParts); } - exactlyOneElement.getPolicyOrAllOrExactlyOne().add(allElement); + exactlyOneElement.getValue().getPolicyOrAllOrExactlyOne().add(allElement); return WSSPolicyUtils.convertJAXBToString(policyElement); } catch (JAXBException je) { WSSUtils.debug.error("WSSPolicyManager.geOutputPolicy: " + @@ -362,251 +362,215 @@ public String getSTSOutputPolicy() throws WSSPolicyException { private InitiatorTokenElement createInitiatorTokenElement( String secMech) throws WSSPolicyException { - - try { - InitiatorTokenElement ite = - wssPolicyFactory.createInitiatorTokenElement(); - PolicyElement policyElement1 = + + InitiatorTokenElement ite = + wssPolicyFactory.createInitiatorTokenElement(wssPolicyFactory.createNestedPolicyType()); + PolicyElement policyElement1 = + wsPolicyFactory.createPolicyElement(); + ite.getValue().setPolicy(policyElement1); + if(SecurityMechanism.WSS_NULL_X509_TOKEN_URI.equals(secMech)) { + X509TokenElement x509Token = + wssPolicyFactory.createX509TokenElement(wssPolicyFactory.createTokenAssertionType()); + x509Token.getValue().setIncludeToken(INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); + policyElement1.getPolicyOrAllOrExactlyOne().add(x509Token); + + PolicyElement policyElement2 = + wsPolicyFactory.createPolicyElement(); + x509Token.getValue().getAny().add(policyElement2); + + WssX509V3Token10Element wssX509v3TokenElement = + wssPolicyFactory.createWssX509V3Token10Element(wssPolicyFactory.createQNameAssertionType()); + policyElement2.getPolicyOrAllOrExactlyOne().add( + wssX509v3TokenElement); + } else if(SecurityMechanism.WSS_NULL_USERNAME_TOKEN_URI. + equals(secMech)) { + UsernameTokenElement userNameTokenElement = + wssPolicyFactory.createUsernameTokenElement(wssPolicyFactory.createTokenAssertionType()); + userNameTokenElement.getValue().setIncludeToken( + INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); + policyElement1.getPolicyOrAllOrExactlyOne().add( + userNameTokenElement); + + PolicyElement policyElement2 = + wsPolicyFactory.createPolicyElement(); + userNameTokenElement.getValue().getAny().add(policyElement2); + + WssUsernameToken10Element wssUserTokenElement = + wssPolicyFactory.createWssUsernameToken10Element(wssPolicyFactory.createQNameAssertionType()); + policyElement2.getPolicyOrAllOrExactlyOne().add( + wssUserTokenElement); + } else if(SecurityMechanism.WSS_NULL_SAML2_HK_URI.equals(secMech)|| + SecurityMechanism.WSS_NULL_SAML2_SV_URI.equals(secMech)) { + SamlTokenElement samlTokenElement = + wssPolicyFactory.createSamlTokenElement(wssPolicyFactory.createTokenAssertionType()); + samlTokenElement.getValue().setIncludeToken( + INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); + policyElement1.getPolicyOrAllOrExactlyOne().add( + samlTokenElement); + + PolicyElement policyElement2 = wsPolicyFactory.createPolicyElement(); - ite.setPolicy(policyElement1); - if(SecurityMechanism.WSS_NULL_X509_TOKEN_URI.equals(secMech)) { - X509TokenElement x509Token = - wssPolicyFactory.createX509TokenElement(); - x509Token.setIncludeToken(INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); - policyElement1.getPolicyOrAllOrExactlyOne().add(x509Token); - - PolicyElement policyElement2 = - wsPolicyFactory.createPolicyElement(); - x509Token.getAny().add(policyElement2); - - WssX509V3Token10Element wssX509v3TokenElement = - wssPolicyFactory.createWssX509V3Token10Element(); - policyElement2.getPolicyOrAllOrExactlyOne().add( - wssX509v3TokenElement); - } else if(SecurityMechanism.WSS_NULL_USERNAME_TOKEN_URI. - equals(secMech)) { - UsernameTokenElement userNameTokenElement = - wssPolicyFactory.createUsernameTokenElement(); - userNameTokenElement.setIncludeToken( - INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); - policyElement1.getPolicyOrAllOrExactlyOne().add( - userNameTokenElement); - - PolicyElement policyElement2 = - wsPolicyFactory.createPolicyElement(); - userNameTokenElement.getAny().add(policyElement2); - - WssUsernameToken10Element wssUserTokenElement = - wssPolicyFactory.createWssUsernameToken10Element(); - policyElement2.getPolicyOrAllOrExactlyOne().add( - wssUserTokenElement); - } else if(SecurityMechanism.WSS_NULL_SAML2_HK_URI.equals(secMech)|| - SecurityMechanism.WSS_NULL_SAML2_SV_URI.equals(secMech)) { - SamlTokenElement samlTokenElement = - wssPolicyFactory.createSamlTokenElement(); - samlTokenElement.setIncludeToken( - INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); - policyElement1.getPolicyOrAllOrExactlyOne().add( - samlTokenElement); - - PolicyElement policyElement2 = - wsPolicyFactory.createPolicyElement(); - samlTokenElement.getAny().add(policyElement2); - - WssSamlV20Token11Element wssSaml20TokenElement = - wssPolicyFactory.createWssSamlV20Token11Element(); - policyElement2.getPolicyOrAllOrExactlyOne().add( - wssSaml20TokenElement); - - } else if(SecurityMechanism.WSS_NULL_SAML_HK_URI.equals(secMech)|| - SecurityMechanism.WSS_NULL_SAML_SV_URI.equals(secMech)) { - SamlTokenElement samlTokenElement = - wssPolicyFactory.createSamlTokenElement(); - samlTokenElement.setIncludeToken( - INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); - policyElement1.getPolicyOrAllOrExactlyOne().add( - samlTokenElement); - - PolicyElement policyElement2 = - wsPolicyFactory.createPolicyElement(); - samlTokenElement.getAny().add(policyElement2); - - WssSamlV11Token11Element wssSaml11TokenElement = - wssPolicyFactory.createWssSamlV11Token11Element(); - policyElement2.getPolicyOrAllOrExactlyOne().add( - wssSaml11TokenElement); - - } - - return ite; - } catch (JAXBException je) { - WSSUtils.debug.error("WSSPolicyManager.createInitiateTokenElement: " - + " JAXB Exception "); - throw new WSSPolicyException (je.getMessage()); + samlTokenElement.getValue().getAny().add(policyElement2); + + WssSamlV20Token11Element wssSaml20TokenElement = + wssPolicyFactory.createWssSamlV20Token11Element(wssPolicyFactory.createQNameAssertionType()); + policyElement2.getPolicyOrAllOrExactlyOne().add( + wssSaml20TokenElement); + + } else if(SecurityMechanism.WSS_NULL_SAML_HK_URI.equals(secMech)|| + SecurityMechanism.WSS_NULL_SAML_SV_URI.equals(secMech)) { + SamlTokenElement samlTokenElement = + wssPolicyFactory.createSamlTokenElement(wssPolicyFactory.createTokenAssertionType()); + samlTokenElement.getValue().setIncludeToken( + INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); + policyElement1.getPolicyOrAllOrExactlyOne().add( + samlTokenElement); + + PolicyElement policyElement2 = + wsPolicyFactory.createPolicyElement(); + samlTokenElement.getValue().getAny().add(policyElement2); + + WssSamlV11Token11Element wssSaml11TokenElement = + wssPolicyFactory.createWssSamlV11Token11Element(wssPolicyFactory.createQNameAssertionType()); + policyElement2.getPolicyOrAllOrExactlyOne().add( + wssSaml11TokenElement); + } - + + return ite; + } private RecipientTokenElement createRecipientTokenElement() throws WSSPolicyException { - - try { - RecipientTokenElement rte = - wssPolicyFactory.createRecipientTokenElement(); - PolicyElement policyElement1 = - wsPolicyFactory.createPolicyElement(); - rte.setPolicy(policyElement1); - X509TokenElement x509Token = - wssPolicyFactory.createX509TokenElement(); - x509Token.setIncludeToken(INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); - policyElement1.getPolicyOrAllOrExactlyOne().add(x509Token); - - PolicyElement policyElement2 = - wsPolicyFactory.createPolicyElement(); - x509Token.getAny().add(policyElement2); - - WssX509V3Token10Element wssX509v3TokenElement = - wssPolicyFactory.createWssX509V3Token10Element(); - policyElement2.getPolicyOrAllOrExactlyOne().add( - wssX509v3TokenElement); - return rte; - } catch (JAXBException je) { - WSSUtils.debug.error("WSSPolicyManager.createRecipientTokenElement:" - + " JAXB Exception "); - throw new WSSPolicyException (je.getMessage()); - } + + RecipientTokenElement rte = + wssPolicyFactory.createRecipientTokenElement(wssPolicyFactory.createNestedPolicyType()); + PolicyElement policyElement1 = + wsPolicyFactory.createPolicyElement(); + rte.getValue().setPolicy(policyElement1); + X509TokenElement x509Token = + wssPolicyFactory.createX509TokenElement(wssPolicyFactory.createTokenAssertionType()); + x509Token.getValue().setIncludeToken(INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); + policyElement1.getPolicyOrAllOrExactlyOne().add(x509Token); + + PolicyElement policyElement2 = + wsPolicyFactory.createPolicyElement(); + x509Token.getValue().getAny().add(policyElement2); + + WssX509V3Token10Element wssX509v3TokenElement = + wssPolicyFactory.createWssX509V3Token10Element(wssPolicyFactory.createQNameAssertionType()); + policyElement2.getPolicyOrAllOrExactlyOne().add( + wssX509v3TokenElement); + return rte; } private AlgorithmSuiteElement createAlgorithmSuiteElement( ProviderConfig config) throws WSSPolicyException { - - try { - AlgorithmSuiteElement ase = - wssPolicyFactory.createAlgorithmSuiteElement(); - PolicyElement policyElement1 = - wsPolicyFactory.createPolicyElement(); - ase.setPolicy(policyElement1); - String encAlg = config.getEncryptionAlgorithm(); - int keyStrength = config.getEncryptionStrength(); - if("AES".equals(encAlg)) { - if(keyStrength == 128) { - Basic128Element basic128Element = - wssPolicyFactory.createBasic128Element(); - policyElement1.getPolicyOrAllOrExactlyOne().add( - basic128Element); - } else if (keyStrength == 192) { - Basic192Element basic192Element = - wssPolicyFactory.createBasic192Element(); - policyElement1.getPolicyOrAllOrExactlyOne().add( - basic192Element); - } else if (keyStrength == 256) { - Basic256Element basic256Element = - wssPolicyFactory.createBasic256Element(); - policyElement1.getPolicyOrAllOrExactlyOne().add( - basic256Element); - } else { - if(WSSUtils.debug.warningEnabled()) { - WSSUtils.debug.warning("WSSPolicyManager.create" + - "AlgorithmSuite: Invalid key strenghth for AES" + - keyStrength); - } - } - } else if ("DESede".equals(encAlg)) { - TripleDesElement tripleDesElement = - wssPolicyFactory.createTripleDesElement(); - policyElement1.getPolicyOrAllOrExactlyOne().add( - tripleDesElement); - } else { - return null; - } - return ase; - } catch (JAXBException je) { - WSSUtils.debug.error("WSSPolicyManager.createAlgorithmSuite: " - + " JAXB Exception "); - throw new WSSPolicyException (je.getMessage()); + + AlgorithmSuiteElement ase = + wssPolicyFactory.createAlgorithmSuiteElement(wssPolicyFactory.createNestedPolicyType()); + PolicyElement policyElement1 = + wsPolicyFactory.createPolicyElement(); + ase.getValue().setPolicy(policyElement1); + String encAlg = config.getEncryptionAlgorithm(); + int keyStrength = config.getEncryptionStrength(); + if("AES".equals(encAlg)) { + if(keyStrength == 128) { + Basic128Element basic128Element = + wssPolicyFactory.createBasic128Element(wssPolicyFactory.createQNameAssertionType()); + policyElement1.getPolicyOrAllOrExactlyOne().add( + basic128Element); + } else if (keyStrength == 192) { + Basic192Element basic192Element = + wssPolicyFactory.createBasic192Element(wssPolicyFactory.createQNameAssertionType()); + policyElement1.getPolicyOrAllOrExactlyOne().add( + basic192Element); + } else if (keyStrength == 256) { + Basic256Element basic256Element = + wssPolicyFactory.createBasic256Element(wssPolicyFactory.createQNameAssertionType()); + policyElement1.getPolicyOrAllOrExactlyOne().add( + basic256Element); + } else { + if(WSSUtils.debug.warningEnabled()) { + WSSUtils.debug.warning("WSSPolicyManager.create" + + "AlgorithmSuite: Invalid key strenghth for AES" + + keyStrength); + } + } + } else if ("DESede".equals(encAlg)) { + TripleDesElement tripleDesElement = + wssPolicyFactory.createTripleDesElement(wssPolicyFactory.createQNameAssertionType()); + policyElement1.getPolicyOrAllOrExactlyOne().add( + tripleDesElement); + } else { + return null; } + return ase; } private LayoutElement createLayoutElement() throws WSSPolicyException { - try { - LayoutElement le = - wssPolicyFactory.createLayoutElement(); - PolicyElement policyElement1 = - wsPolicyFactory.createPolicyElement(); - le.setPolicy(policyElement1); - policyElement1.getPolicyOrAllOrExactlyOne().add( - wssPolicyFactory.createLaxElement()); - return le; - } catch (JAXBException je) { - WSSUtils.debug.error("WSSPolicyManager.createLayout: " - + " JAXB Exception "); - throw new WSSPolicyException (je.getMessage()); - } - + LayoutElement le = + wssPolicyFactory.createLayoutElement(wssPolicyFactory.createNestedPolicyType()); + PolicyElement policyElement1 = + wsPolicyFactory.createPolicyElement(); + le.getValue().setPolicy(policyElement1); + policyElement1.getPolicyOrAllOrExactlyOne().add( + wssPolicyFactory.createLax(wssPolicyFactory.createQNameAssertionType())); + return le; + } private ProtectionTokenElement createProtectionTokenElement( String secMech) throws WSSPolicyException { - - try { - ProtectionTokenElement protectionElement = - wssPolicyFactory.createProtectionTokenElement(); - PolicyElement policyElement1 = - wsPolicyFactory.createPolicyElement(); - protectionElement.setPolicy(policyElement1); - - if(SecurityMechanism.WSS_NULL_KERBEROS_TOKEN_URI.equals(secMech)) { - KerberosTokenElement kerberosTokenElement = - wssPolicyFactory.createKerberosTokenElement(); - kerberosTokenElement.setIncludeToken( - INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); - policyElement1.getPolicyOrAllOrExactlyOne().add( - kerberosTokenElement); - - PolicyElement policyElement2 = - wsPolicyFactory.createPolicyElement(); - kerberosTokenElement.getAny().add(policyElement2); - - WssKerberosV5ApReqToken11Element wssKrbElement = - wssPolicyFactory.createWssKerberosV5ApReqToken11Element(); - policyElement2.getPolicyOrAllOrExactlyOne().add( - wssKrbElement); - } - - return protectionElement; - } catch (JAXBException je) { - WSSUtils.debug.error("WSSPolicyManager.createProtectionToken: " - + " JAXB Exception "); - throw new WSSPolicyException (je.getMessage()); + + ProtectionTokenElement protectionElement = + wssPolicyFactory.createProtectionTokenElement(wssPolicyFactory.createNestedPolicyType()); + PolicyElement policyElement1 = + wsPolicyFactory.createPolicyElement(); + protectionElement.getValue().setPolicy(policyElement1); + + if(SecurityMechanism.WSS_NULL_KERBEROS_TOKEN_URI.equals(secMech)) { + KerberosTokenElement kerberosTokenElement = + wssPolicyFactory.createKerberosTokenElement(wssPolicyFactory.createTokenAssertionType()); + kerberosTokenElement.getValue().setIncludeToken( + INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); + policyElement1.getPolicyOrAllOrExactlyOne().add( + kerberosTokenElement); + + PolicyElement policyElement2 = + wsPolicyFactory.createPolicyElement(); + kerberosTokenElement.getValue().getAny().add(policyElement2); + + WssKerberosV5ApReqToken11Element wssKrbElement = + wssPolicyFactory.createWssKerberosV5ApReqToken11Element(wssPolicyFactory.createQNameAssertionType()); + policyElement2.getPolicyOrAllOrExactlyOne().add( + wssKrbElement); } + + return protectionElement; } private IssuedTokenElement createIssuedTokenElement() throws WSSPolicyException { - - try { - IssuedTokenElement issuedTokenElement = - wssPolicyFactory.createIssuedTokenElement(); - issuedTokenElement.setIncludeToken( - INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); - EndpointReferenceElement epr = - wsAddressingFactory.createEndpointReferenceElement(); - AttributedURIType uriType = - wsAddressingFactory.createAttributedURIType(); - uriType.setValue("SunSTS"); - epr.setAddress(uriType); - issuedTokenElement.setIssuer(epr); - RequestSecurityTokenTemplateType rstTemplate = - wssPolicyFactory.createRequestSecurityTokenTemplateType(); - issuedTokenElement.setRequestSecurityTokenTemplate(rstTemplate); - return issuedTokenElement; - } catch (JAXBException je) { - WSSUtils.debug.error("WSSPolicyManager.createIssuedTokenElement: " - + " JAXB Exception "); - throw new WSSPolicyException (je.getMessage()); - } - + + IssuedTokenElement issuedTokenElement = + wssPolicyFactory.createIssuedTokenElement(wssPolicyFactory.createIssuedTokenType()); + issuedTokenElement.getValue().setIncludeToken( + INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT); + EndpointReferenceElement epr = + wsAddressingFactory.createEndpointReferenceElement(wsAddressingFactory.createEndpointReferenceType()); + AttributedURIType uriType = + wsAddressingFactory.createAttributedURIType(); + uriType.setValue("SunSTS"); + epr.getValue().setAddress(uriType); + issuedTokenElement.getValue().setIssuer(epr.getValue()); + RequestSecurityTokenTemplateType rstTemplate = + wssPolicyFactory.createRequestSecurityTokenTemplateType(); + issuedTokenElement.getValue().setRequestSecurityTokenTemplate(rstTemplate); + return issuedTokenElement; + } private ProviderConfig getSTSConfig() throws WSSPolicyException { diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java index 442d2985d5..d95764d34f 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java @@ -23,15 +23,17 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: WSSPolicyUtils.java,v 1.1 2009/09/17 05:49:29 mallas Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ package com.sun.identity.wss.policy; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; public class WSSPolicyUtils { diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/ProviderConfig.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/ProviderConfig.java index 0ca1617677..33d27e8158 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/ProviderConfig.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/ProviderConfig.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: ProviderConfig.java,v 1.31 2009/11/16 21:52:58 mallas Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ package com.sun.identity.wss.provider; @@ -79,7 +81,7 @@ public abstract class ProviderConfig { public static final String WSS_PROVIDER_CONFIG_PLUGIN = "com.sun.identity.wss.provider.config.plugin"; - protected List secMech = null; + protected List secMech = null; protected String serviceURI = null; protected String providerName = null; protected String wspEndpoint = null; @@ -134,7 +136,7 @@ public abstract class ProviderConfig { * * @return list of security mechanisms. */ - public List getSecurityMechanisms() { + public List getSecurityMechanisms() { return secMech; } diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/plugins/AgentProvider.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/plugins/AgentProvider.java index 339f8d8c8b..8109633953 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/plugins/AgentProvider.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/plugins/AgentProvider.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyght owner]" * * $Id: AgentProvider.java,v 1.41 2009/11/16 21:52:58 mallas Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -531,11 +533,11 @@ public void store() throws ProviderException { config.put(SERVICE_TYPE, serviceType); } - Set secMechSet = new HashSet(); + Set secMechSet = new HashSet<>(); if(secMech != null) { - Iterator iter = secMech.iterator(); + Iterator iter = secMech.iterator(); while(iter.hasNext()) { - secMechSet.add((String)iter.next()); + secMechSet.add(iter.next()); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/common/SystemConfigurationUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/common/SystemConfigurationUtil.java index e643025797..d87bd5fc40 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/common/SystemConfigurationUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/common/SystemConfigurationUtil.java @@ -25,7 +25,7 @@ * $Id: SystemConfigurationUtil.java,v 1.7 2008/08/06 17:26:14 exu Exp $ * * Portions Copyrighted 2010-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.common; @@ -116,7 +116,7 @@ public static Set getCookieDomainsForRequest(HttpServletRequest request) * @return list of server names. * @throws SystemConfigurationException if unable to get the server list. */ - public static List getServerList() throws SystemConfigurationException { + public static List getServerList() throws SystemConfigurationException { if (!platformNamingInitialized) { initPlatformNaming(); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/cot/CircleOfTrustManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/cot/CircleOfTrustManager.java index 57ae00797a..4f02b1478b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/cot/CircleOfTrustManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/cot/CircleOfTrustManager.java @@ -25,10 +25,11 @@ * $Id: CircleOfTrustManager.java,v 1.13 2009/10/28 23:58:56 exu Exp $ * * Portions Copyrighted 2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.cot; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import com.sun.identity.federation.meta.IDFFCOTUtils; import com.sun.identity.federation.meta.IDFFMetaException; import com.sun.identity.federation.meta.IDFFMetaManager; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/FSAccountManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/FSAccountManager.java index d479754f20..2aa85ffe3c 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/FSAccountManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/FSAccountManager.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FSAccountManager.java,v 1.5 2008/06/25 05:46:39 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -87,12 +89,12 @@ private FSAccountManager(String metaAlias) BaseConfigType hostedConfig = null; if (role != null && role.equalsIgnoreCase(IFSConstants.IDP)) { hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostedEntityID); + metaManager.getIDPDescriptorConfig(realm, hostedEntityID).getValue(); } else if (role != null && role.equalsIgnoreCase(IFSConstants.SP)) { hostedConfig = - metaManager.getSPDescriptorConfig(realm, hostedEntityID); + metaManager.getSPDescriptorConfig(realm, hostedEntityID).getValue(); SP_PROVIDER_ID = hostedEntityID; SP_FILTER = "|" + SP_PROVIDER_ID + "|"; } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/key/KeyUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/key/KeyUtil.java index c9ea678af5..7135182865 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/key/KeyUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/key/KeyUtil.java @@ -25,6 +25,7 @@ * $Id: KeyUtil.java,v 1.5 2009/06/08 23:41:03 madan_ranganath Exp $ * * Portions Copyrighted 2013-2016 ForgeRock AS + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.federation.key; @@ -39,6 +40,7 @@ import java.security.PrivateKey; import java.security.cert.X509Certificate; +import com.sun.identity.liberty.ws.meta.jaxb.KeyDescriptorElement; import org.apache.xml.security.encryption.XMLCipher; import com.sun.identity.common.SystemConfigurationUtil; @@ -288,14 +290,14 @@ public static KeyDescriptorType getKeyDescriptor( return null; } - List list = providerDescriptor.getKeyDescriptor(); - Iterator iter = list.iterator(); - KeyDescriptorType kd = null; + List list = providerDescriptor.getKeyDescriptor(); + Iterator iter = list.iterator(); + KeyDescriptorElement kd = null; String use = null; - KeyDescriptorType noUsageKD = null; + KeyDescriptorElement noUsageKD = null; while (iter.hasNext()) { - kd = (KeyDescriptorType)iter.next(); - use = kd.getUse(); + kd = iter.next(); + use = kd.getValue().getUse().value(); if ((use == null) || (use.trim().length() == 0)) { if (noUsageKD == null) { noUsageKD = kd; @@ -309,9 +311,9 @@ public static KeyDescriptorType getKeyDescriptor( } } if (kd != null) { - return kd; + return kd.getValue(); } else { - return noUsageKD; + return noUsageKD.getValue(); } } @@ -351,7 +353,7 @@ public static X509Certificate getCert(KeyDescriptorType kd) { X509DataElement data = (X509DataElement) ki.getContent().get(0); byte[] bt = ((com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509Certificate) - data.getX509IssuerSerialOrX509SKIOrX509SubjectName().get(0)). + data.getValue().getX509IssuerSerialOrX509SKIOrX509SubjectName().get(0)). getValue(); CertificateFactory cf = null; try { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPostLogin.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPostLogin.java index a36187d298..d7c225d054 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPostLogin.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPostLogin.java @@ -24,7 +24,7 @@ * * $Id: FSPostLogin.java,v 1.6 2008/07/31 00:55:33 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.login; @@ -325,12 +325,12 @@ private void setMetaInfo(String metaAlias,HttpServletRequest request) { isIDP = true; hostedConfig = metaManager.getIDPDescriptorConfig( - realm, entityID); + realm, entityID).getValue(); } else if (providerRole != null && providerRole.equalsIgnoreCase(IFSConstants.SP)) { hostedConfig = metaManager.getSPDescriptorConfig( - realm, entityID); + realm, entityID).getValue(); } } catch (IDFFMetaException ie) { FSUtils.debug.error("FSPostLogin::setMetaInfo: exception:",ie); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPreLogin.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPreLogin.java index ac2dfe378c..4d8caa8da1 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPreLogin.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/login/FSPreLogin.java @@ -25,7 +25,7 @@ * $Id: FSPreLogin.java,v 1.6 2008/08/19 19:11:04 veiming Exp $ * * Portions Copyrighted 2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.login; @@ -259,11 +259,11 @@ private void setMetaInfo(String metaAlias, if (hostedProviderRole.equals(IFSConstants.SP)) { hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityID); + realm, hostedEntityID).getValue(); } else if (hostedProviderRole.equals(IFSConstants.IDP)) { hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityID); + realm, hostedEntityID).getValue(); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptedNameIdentifier.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptedNameIdentifier.java index 657365f93b..bcb115879b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptedNameIdentifier.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptedNameIdentifier.java @@ -24,6 +24,7 @@ * * $Id: EncryptedNameIdentifier.java,v 1.4 2008/06/25 05:46:46 qcheng Exp $ * Portions Copyrighted 2014 ForgeRock AS + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.federation.message.common; @@ -222,10 +223,10 @@ public static NameIdentifier getDecryptedNameIdentifier( BaseConfigType providerConfig = null; try { providerConfig = FSUtils.getIDFFMetaManager(). - getSPDescriptorConfig(realm, providerID); + getSPDescriptorConfig(realm, providerID).getValue(); if (providerConfig == null) { providerConfig = FSUtils.getIDFFMetaManager(). - getIDPDescriptorConfig(realm, providerID); + getIDPDescriptorConfig(realm, providerID).getValue(); } } catch (Exception ae) { FSUtils.debug.error("EncryptedNameIdentifier.getDecryptedName" + diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java index 5270fb2b5d..039890cb53 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java @@ -23,17 +23,20 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDFFCOTUtils.java,v 1.6 2009/10/28 23:58:57 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ package com.sun.identity.federation.meta; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import com.sun.identity.cot.COTConstants; -import com.sun.identity.federation.jaxb.entityconfig.AffiliationDescriptorConfigElement; import com.sun.identity.federation.jaxb.entityconfig.AttributeType; import com.sun.identity.federation.jaxb.entityconfig.BaseConfigType; import com.sun.identity.federation.jaxb.entityconfig.EntityConfigElement; +import com.sun.identity.federation.jaxb.entityconfig.IDPDescriptorConfigElement; import com.sun.identity.federation.jaxb.entityconfig.ObjectFactory; +import com.sun.identity.federation.jaxb.entityconfig.SPDescriptorConfigElement; import com.sun.identity.liberty.ws.meta.jaxb.EntityDescriptorElement; import com.sun.identity.shared.debug.Debug; import java.util.ArrayList; @@ -93,39 +96,42 @@ public void updateEntityConfig(String realm, String cotName,String entityID) atype.setName(COT_LIST); atype.getValue().add(cotName); // add to entityConfig - entityConfig = objFactory.createEntityConfigElement(); - entityConfig.setEntityID(entityID); - entityConfig.setHosted(false); + entityConfig = objFactory.createEntityConfigElement(objFactory.createEntityConfigType()); + entityConfig.getValue().setEntityID(entityID); + entityConfig.getValue().setHosted(false); // Decide which role EntityDescriptorElement includes // It could have one sp and one idp. if (IDFFMetaUtils.getSPDescriptor(entityDesc) != null) { - IDFFCOTUtils = objFactory.createSPDescriptorConfigElement(); - IDFFCOTUtils.getAttribute().add(atype); - entityConfig.getSPDescriptorConfig().add(IDFFCOTUtils); + IDFFCOTUtils = new BaseConfigType() {}; + IDFFCOTUtils.getAttribute().add(objFactory.createAttributeElement(atype)); + entityConfig.getValue().getSPDescriptorConfig().add( + objFactory.createSPDescriptorConfigElement(IDFFCOTUtils)); } if (IDFFMetaUtils.getIDPDescriptor(entityDesc) != null) { - IDFFCOTUtils = objFactory.createIDPDescriptorConfigElement(); - IDFFCOTUtils.getAttribute().add(atype); - entityConfig.getIDPDescriptorConfig().add(IDFFCOTUtils); + IDFFCOTUtils = new BaseConfigType() {}; + IDFFCOTUtils.getAttribute().add(objFactory.createAttributeElement(atype)); + entityConfig.getValue().getIDPDescriptorConfig().add( + objFactory.createIDPDescriptorConfigElement(IDFFCOTUtils)); } - if (entityDesc.getAffiliationDescriptor() != null) { - IDFFCOTUtils = - objFactory.createAffiliationDescriptorConfigElement(); - IDFFCOTUtils.getAttribute().add(atype); - entityConfig.setAffiliationDescriptorConfig(IDFFCOTUtils); + if (entityDesc.getValue().getAffiliationDescriptor() != null) { + IDFFCOTUtils = + new BaseConfigType() {};; + IDFFCOTUtils.getAttribute().add(objFactory.createAttributeElement(atype)); + entityConfig.getValue().setAffiliationDescriptorConfig( + objFactory.createAffiliationDescriptorConfigElement(IDFFCOTUtils)); } idffMetaMgr.setEntityConfig(realm, entityConfig); } else { // update the sp and idp entity config - List spConfigList = entityConfig.getSPDescriptorConfig(); - List idpConfigList = entityConfig.getIDPDescriptorConfig(); + List spConfigList = entityConfig.getValue().getSPDescriptorConfig(); + List idpConfigList = entityConfig.getValue().getIDPDescriptorConfig(); updateCOTAttrInConfig( realm,spConfigList,cotName,entityConfig,objFactory,idffMetaMgr); updateCOTAttrInConfig( realm, idpConfigList,cotName,entityConfig,objFactory, idffMetaMgr); BaseConfigType affiConfig = - entityConfig.getAffiliationDescriptorConfig(); + entityConfig.getValue().getAffiliationDescriptorConfig().getValue(); if (affiConfig != null) { List affiConfigList = new ArrayList(); affiConfigList.add(affiConfig); @@ -163,14 +169,14 @@ public void removeFromEntityConfig( EntityConfigElement entityConfig = idffMetaMgr.getEntityConfig(realm, entityID); if (entityConfig != null) { - List spConfigList = entityConfig.getSPDescriptorConfig(); - List idpConfigList = entityConfig.getIDPDescriptorConfig(); + List spConfigList = entityConfig.getValue().getSPDescriptorConfig(); + List idpConfigList = entityConfig.getValue().getIDPDescriptorConfig(); removeCOTNameFromConfig(realm, spConfigList,cotName, entityConfig,idffMetaMgr); removeCOTNameFromConfig(realm, idpConfigList,cotName, entityConfig,idffMetaMgr); BaseConfigType affiConfig = - entityConfig.getAffiliationDescriptorConfig(); + entityConfig.getValue().getAffiliationDescriptorConfig().getValue(); if (affiConfig != null) { List affiConfigList = new ArrayList(); affiConfigList.add(affiConfig); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaManager.java index 431ae93ac7..1185ba63c3 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaManager.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDFFMetaManager.java,v 1.9 2009/10/28 23:58:57 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -58,7 +60,7 @@ import java.util.Set; import java.util.logging.Level; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** * The IDFFMetaManager provides methods to manage the Service and @@ -163,7 +165,7 @@ public void createEntityDescriptor( LogUtil.error(Level.INFO, LogUtil.NULL_ENTITY_DESCRIPTOR, null); throw new IDFFMetaException("nullEntityDescriptor",null); } else { - entityId = entityDescriptor.getProviderID(); + entityId = entityDescriptor.getValue().getProviderID(); if (entityId == null) { debug.error(classMethod + "Entity ID is null"); LogUtil.error(Level.INFO, LogUtil.NULL_ENTITY_ID, null); @@ -179,13 +181,13 @@ public void createEntityDescriptor( realm,entityId); if (descriptor != null) { - List idps = descriptor.getIDPDescriptor(); + List idps = descriptor.getValue().getIDPDescriptor(); boolean hasIDP = (idps != null) && !idps.isEmpty(); - List sps = descriptor.getSPDescriptor(); + List sps = descriptor.getValue().getSPDescriptor(); boolean hasSP = (sps != null) && !sps.isEmpty(); - List newIDPs = entityDescriptor.getIDPDescriptor(); - List newSPs = entityDescriptor.getSPDescriptor(); + List newIDPs = entityDescriptor.getValue().getIDPDescriptor(); + List newSPs = entityDescriptor.getValue().getSPDescriptor(); if ((newIDPs != null) && !newIDPs.isEmpty() && hasIDP) { LogUtil.error(Level.INFO, LogUtil.SET_ENTITY_FAILED, args); @@ -317,7 +319,7 @@ public void setEntityDescriptor( throws IDFFMetaException { String classMethod = "IDFFMetaManager:setEntityDescriptor"; if (entityDescriptor != null) { - String entityID = entityDescriptor.getProviderID(); + String entityID = entityDescriptor.getValue().getProviderID(); if ((realm == null) || (realm.length() == 0)) { realm = ROOT_REALM; } @@ -506,7 +508,7 @@ public AffiliationDescriptorType getAffiliationDescriptor( EntityDescriptorElement entityDescriptor = getEntityDescriptor(realm, entityID); if (entityDescriptor != null) { - affiliationDescriptor = entityDescriptor.getAffiliationDescriptor(); + affiliationDescriptor = entityDescriptor.getValue().getAffiliationDescriptor(); } return affiliationDescriptor; } @@ -528,7 +530,7 @@ public void createEntityConfig( LogUtil.error(Level.INFO, LogUtil.NULL_ENTITY_CONFIG, null); throw new IDFFMetaException("nullEntityConfig",null); } else { - entityID = entityConfig.getEntityID(); + entityID = entityConfig.getValue().getEntityID(); if (entityID == null) { LogUtil.error(Level.INFO, LogUtil.NULL_ENTITY_ID, null); debug.error( classMethod + "entity ID is null"); @@ -676,7 +678,7 @@ public void setEntityConfig(String realm, EntityConfigElement entityConfig) throws IDFFMetaException { String classMethod = "IDFFMetaManager:setEntityConfig"; if (entityConfig != null) { - String entityID = entityConfig.getEntityID(); + String entityID = entityConfig.getValue().getEntityID(); if ((realm == null) || (realm.length() == 0)) { realm = ROOT_REALM; } @@ -783,7 +785,7 @@ public IDPDescriptorConfigElement getIDPDescriptorConfig( if (entityConfig != null) { affiliationDesConfig = (AffiliationDescriptorConfigElement) - entityConfig.getAffiliationDescriptorConfig(); + entityConfig.getValue().getAffiliationDescriptorConfig(); } return affiliationDesConfig; } @@ -832,7 +834,7 @@ public List getAllHostedEntities(String realm) throws IDFFMetaException { String entityID = (String) entityIterator.next(); EntityConfigElement entityConfig = getEntityConfig(realm, entityID); - if (entityConfig != null && entityConfig.isHosted()) { + if (entityConfig != null && entityConfig.getValue().isHosted()) { hostedEntityList.add(entityID); } } @@ -867,7 +869,7 @@ public List getAllRemoteEntities(String realm) throws IDFFMetaException { String entityID = (String) entityIterator.next(); EntityConfigElement entityConfig = getEntityConfig(realm, entityID); - if (entityConfig != null && !entityConfig.isHosted()) { + if (entityConfig != null && !entityConfig.getValue().isHosted()) { remoteEntityList.add(entityID); } } @@ -998,12 +1000,12 @@ public boolean isTrustedProvider( SPDescriptorConfigElement spConfig = getSPDescriptorConfig(realm, entityID); if (spConfig != null) { - isTrusted = isSameCircleOfTrust(spConfig,realm, entityID); + isTrusted = isSameCircleOfTrust(spConfig.getValue(),realm, entityID); } else { IDPDescriptorConfigElement idpConfig = getIDPDescriptorConfig(realm, entityID); if (idpConfig != null) { - isTrusted = isSameCircleOfTrust(idpConfig,realm, entityID); + isTrusted = isSameCircleOfTrust(idpConfig.getValue(),realm, entityID); } } } catch (IDFFMetaException ide) { @@ -1202,7 +1204,7 @@ public String getEntityIDByMetaAlias(String metaAlias) SPDescriptorConfigElement spconfig = getSPDescriptorConfig(realm, tmpId); if (spconfig != null) { - String tmpMetaAlias = spconfig.getMetaAlias(); + String tmpMetaAlias = spconfig.getValue().getMetaAlias(); if (tmpMetaAlias != null && tmpMetaAlias.length() > 0) { if (metaAlias.equals(tmpMetaAlias)) { // remember this and continue to process others, @@ -1224,7 +1226,7 @@ public String getEntityIDByMetaAlias(String metaAlias) IDPDescriptorConfigElement idpconfig = getIDPDescriptorConfig(realm, tmpId); if (idpconfig != null) { - String tmpMetaAlias = idpconfig.getMetaAlias(); + String tmpMetaAlias = idpconfig.getValue().getMetaAlias(); if (tmpMetaAlias != null && tmpMetaAlias.length() > 0) { if (metaAlias.equals(tmpMetaAlias)) { // remember this and continue to process others, @@ -1460,13 +1462,13 @@ private void addEntityToCOT(String realm, String entityID) IDPDescriptorConfigElement idpConfig = getIDPDescriptorConfig(realm, entityID); if (idpConfig !=null) { - addToCircleOfTrust(idpConfig, realm, entityID); + addToCircleOfTrust(idpConfig.getValue(), realm, entityID); } SPDescriptorConfigElement spConfig = getSPDescriptorConfig( realm, entityID); if (spConfig != null) { - addToCircleOfTrust(spConfig,realm, entityID); + addToCircleOfTrust(spConfig.getValue(),realm, entityID); } } @@ -1482,19 +1484,19 @@ private void removeEntityFromCOT(String realm, String entityID) IDPDescriptorConfigElement idpConfig = getIDPDescriptorConfig(realm, entityID); if (idpConfig != null) { - removeFromCircleOfTrust(idpConfig, realm, entityID); + removeFromCircleOfTrust(idpConfig.getValue(), realm, entityID); } SPDescriptorConfigElement spConfig = getSPDescriptorConfig( realm, entityID); if (spConfig != null) { - removeFromCircleOfTrust(spConfig, realm, entityID); + removeFromCircleOfTrust(spConfig.getValue(), realm, entityID); } AffiliationDescriptorConfigElement affiConfig = getAffiliationDescriptorConfig(realm, entityID); if (affiConfig != null) { - removeFromCircleOfTrust(affiConfig, realm, entityID); + removeFromCircleOfTrust(affiConfig.getValue(), realm, entityID); } } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaSecurityUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaSecurityUtils.java index 73e880adca..739786702b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaSecurityUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaSecurityUtils.java @@ -25,6 +25,7 @@ * $Id: IDFFMetaSecurityUtils.java,v 1.5 2009/06/08 23:40:42 madan_ranganath Exp $ * * Portions Copyrighted 2011-2014 ForgeRock AS + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.federation.meta; @@ -56,7 +57,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** * The IDFFMetaSecurityUtils class provides metadata security @@ -154,7 +155,7 @@ public static void updateProviderKeyInfo(String realm, IDFFMetaManager metaManager = FSUtils.getIDFFMetaManager(); EntityConfigElement config = metaManager.getEntityConfig(realm, entityID); - if (!config.isHosted()) { + if (!config.getValue().isHosted()) { String[] args = {entityID, realm}; throw new IDFFMetaException("entityNotHosted", args); } @@ -175,10 +176,10 @@ public static void updateProviderKeyInfo(String realm, // remove key info removeKeyDescriptor(idpDesp, isSigning); if (isSigning) { - setExtendedAttributeValue(idpConfig, + setExtendedAttributeValue(idpConfig.getValue(), IFSConstants.SIGNING_CERT_ALIAS, null); } else { - setExtendedAttributeValue(idpConfig, + setExtendedAttributeValue(idpConfig.getValue(), IFSConstants.ENCRYPTION_CERT_ALIAS, null); } } else { @@ -189,10 +190,10 @@ public static void updateProviderKeyInfo(String realm, Set value = new HashSet(); value.add(certAlias); if (isSigning) { - setExtendedAttributeValue(idpConfig, + setExtendedAttributeValue(idpConfig.getValue(), IFSConstants.SIGNING_CERT_ALIAS, value); } else { - setExtendedAttributeValue(idpConfig, + setExtendedAttributeValue(idpConfig.getValue(), IFSConstants.ENCRYPTION_CERT_ALIAS, value); } } @@ -212,10 +213,10 @@ public static void updateProviderKeyInfo(String realm, // remove key info removeKeyDescriptor(spDesp, isSigning); if (isSigning) { - setExtendedAttributeValue(spConfig, + setExtendedAttributeValue(spConfig.getValue(), IFSConstants.SIGNING_CERT_ALIAS, null); } else { - setExtendedAttributeValue(spConfig, + setExtendedAttributeValue(spConfig.getValue(), IFSConstants.ENCRYPTION_CERT_ALIAS, null); } } else { @@ -226,10 +227,10 @@ public static void updateProviderKeyInfo(String realm, Set value = new HashSet(); value.add(certAlias); if (isSigning) { - setExtendedAttributeValue(spConfig, + setExtendedAttributeValue(spConfig.getValue(), IFSConstants.SIGNING_CERT_ALIAS, value); } else { - setExtendedAttributeValue(spConfig, + setExtendedAttributeValue(spConfig.getValue(), IFSConstants.ENCRYPTION_CERT_ALIAS, value); } } @@ -243,10 +244,10 @@ private static void updateKeyDescriptor(ProviderDescriptorType desp, // NOTE : we only support one signing and one encryption key right now // the code need to be change if we need to support multiple signing // and/or encryption keys in one entity - List keys = desp.getKeyDescriptor(); - for (Iterator iter = keys.iterator(); iter.hasNext();) { - KeyDescriptorElement key = (KeyDescriptorElement) iter.next(); - if (key.getUse().equalsIgnoreCase(newKey.getUse())) { + List keys = desp.getKeyDescriptor(); + for (Iterator iter = keys.iterator(); iter.hasNext();) { + KeyDescriptorElement key = iter.next(); + if (key.getValue().getUse().value().equalsIgnoreCase(newKey.getValue().getUse().value())) { iter.remove(); } } @@ -255,14 +256,14 @@ private static void updateKeyDescriptor(ProviderDescriptorType desp, private static void removeKeyDescriptor(ProviderDescriptorType desp, boolean isSigningUse) { - List keys = desp.getKeyDescriptor(); + List keys = desp.getKeyDescriptor(); String keyUse = "encryption"; if (isSigningUse) { keyUse = "signing"; } - for (Iterator iter = keys.iterator(); iter.hasNext();) { - KeyDescriptorElement key = (KeyDescriptorElement) iter.next(); - if (key.getUse().equalsIgnoreCase(keyUse)) { + for (Iterator iter = keys.iterator(); iter.hasNext();) { + KeyDescriptorElement key = iter.next(); + if (key.getValue().getUse().value().equalsIgnoreCase(keyUse)) { iter.remove(); } } @@ -271,23 +272,19 @@ private static void removeKeyDescriptor(ProviderDescriptorType desp, private static void setExtendedAttributeValue( BaseConfigType config, String attrName, Set attrVal) throws IDFFMetaException { - try { - List attributes = config.getAttribute(); - for(Iterator iter = attributes.iterator(); iter.hasNext();) { - AttributeType avp = (AttributeType)iter.next(); - if (avp.getName().trim().equalsIgnoreCase(attrName)) { - iter.remove(); - } - } - if (attrVal != null) { - ObjectFactory factory = new ObjectFactory(); - AttributeType atype = factory.createAttributeType(); - atype.setName(attrName); - atype.getValue().addAll(attrVal); - config.getAttribute().add(atype); + List attributes = config.getAttribute(); + for(Iterator iter = attributes.iterator(); iter.hasNext();) { + AttributeType avp = (AttributeType)iter.next(); + if (avp.getName().trim().equalsIgnoreCase(attrName)) { + iter.remove(); } - } catch (JAXBException e) { - throw new IDFFMetaException(e); + } + if (attrVal != null) { + ObjectFactory factory = new ObjectFactory(); + AttributeType atype = factory.createAttributeType(); + atype.setName(attrName); + atype.getValue().addAll(attrVal); + config.getAttribute().add(factory.createAttributeElement(atype)); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java index 820c1a255f..21f17c441a 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDFFMetaUtils.java,v 1.5 2008/11/10 22:56:57 veiming Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -56,10 +58,10 @@ import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.w3c.dom.Node; import org.xml.sax.InputSource; @@ -190,7 +192,7 @@ public static SPDescriptorType getSPDescriptor( EntityDescriptorElement entityDescriptor) { SPDescriptorType spDescriptor = null; if (entityDescriptor != null) { - List spList = entityDescriptor.getSPDescriptor(); + List spList = entityDescriptor.getValue().getSPDescriptor(); if (spList != null && !spList.isEmpty()) { Iterator spIterator = spList.iterator(); while (spIterator.hasNext()) { @@ -216,7 +218,7 @@ public static IDPDescriptorType getIDPDescriptor( EntityDescriptorElement entityDescriptor) { IDPDescriptorType idpDescriptor = null; if (entityDescriptor != null) { - List idpList = entityDescriptor.getIDPDescriptor(); + List idpList = entityDescriptor.getValue().getIDPDescriptor(); if (idpList != null && !idpList.isEmpty()) { Iterator idpIterator = idpList.iterator(); while (idpIterator.hasNext()) { @@ -243,7 +245,7 @@ public static SPDescriptorConfigElement getSPDescriptorConfig( EntityConfigElement entityConfig) { SPDescriptorConfigElement spEntityConfig = null; if (entityConfig != null) { - List spCfgList = entityConfig.getSPDescriptorConfig(); + List spCfgList = entityConfig.getValue().getSPDescriptorConfig(); if (spCfgList != null && !spCfgList.isEmpty()) { Iterator spCfgIterator = spCfgList.iterator(); while (spCfgIterator.hasNext()) { @@ -270,7 +272,7 @@ public static IDPDescriptorConfigElement getIDPDescriptorConfig( EntityConfigElement entityConfig) { IDPDescriptorConfigElement idpEntityConfig = null; if (entityConfig != null) { - List idpCfgList = entityConfig.getIDPDescriptorConfig(); + List idpCfgList = entityConfig.getValue().getIDPDescriptorConfig(); if (idpCfgList != null && !idpCfgList.isEmpty()) { Iterator idpCfgIterator = idpCfgList.iterator(); while (idpCfgIterator.hasNext()) { @@ -351,7 +353,7 @@ public static String getFirstAttributeValueFromIDPConfig( IDPDescriptorConfigElement idpConfig = metaManager.getIDPDescriptorConfig(realm, idpEntityID); if (idpConfig != null) { - Map attributes = getAttributes(idpConfig); + Map attributes = getAttributes(idpConfig.getValue()); returnVal = getFirstAttributeValue(attributes, attrName); } } catch (IDFFMetaException e) { @@ -482,10 +484,10 @@ public static BaseConfigType getExtendedConfig( try { if (providerRole.equalsIgnoreCase(IFSConstants.IDP)) { providerConfig = metaManager.getIDPDescriptorConfig( - realm, providerId); + realm, providerId).getValue(); } else if (providerRole.equalsIgnoreCase(IFSConstants.SP)) { providerConfig = metaManager.getSPDescriptorConfig( - realm, providerId); + realm, providerId).getValue(); } } catch (IDFFMetaException ie) { debug.error( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/NamespacePrefixMapperImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/NamespacePrefixMapperImpl.java index 426210a7fe..720b980b52 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/NamespacePrefixMapperImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/NamespacePrefixMapperImpl.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: NamespacePrefixMapperImpl.java,v 1.2 2008/06/25 05:46:49 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ package com.sun.identity.federation.meta; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; public class NamespacePrefixMapperImpl extends NamespacePrefixMapper { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManager.java index eb38fec55b..408a2baad5 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManager.java @@ -25,6 +25,7 @@ * $Id: FSAssertionManager.java,v 1.12 2009/08/03 18:18:36 bigfatrat Exp $ * * Portions Copyrighted 2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.federation.services; @@ -187,7 +188,7 @@ private FSAssertionManager(String metaAlias) artifactTimeout = IFSConstants.ARTIFACT_TIMEOUT_DEFAULT * 1000; try { BaseConfigType idpConfig = FSUtils.getIDFFMetaManager(). - getIDPDescriptorConfig(realm, hostEntityId); + getIDPDescriptorConfig(realm, hostEntityId).getValue(); attributes = IDFFMetaUtils.getAttributes(idpConfig); try { cleanupInterval = Integer.parseInt( @@ -490,7 +491,7 @@ public FSAssertion createFSAssertion( BaseConfigType idpConfig = null; try { idpConfig = metaManager.getIDPDescriptorConfig( - realm, hostEntityId); + realm, hostEntityId).getValue(); } catch (IDFFMetaException e) { if (FSUtils.debug.messageEnabled()) { FSUtils.debug.message( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAuthnDecisionHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAuthnDecisionHandler.java index fdbdc25489..7b4e125652 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAuthnDecisionHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAuthnDecisionHandler.java @@ -24,7 +24,7 @@ * * $Id: FSAuthnDecisionHandler.java,v 1.4 2008/06/25 05:46:53 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -97,7 +97,7 @@ private void getIDPAuthContextInfo(String realm, String entityID) { if (entityConfig == null) { return; } - Map attributes = IDFFMetaUtils.getAttributes(entityConfig); + Map attributes = IDFFMetaUtils.getAttributes(entityConfig.getValue()); List mappings = (List) attributes.get( IFSConstants.IDP_AUTHNCONTEXT_MAPPING); if (mappings != null && !mappings.isEmpty()) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributeMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributeMapper.java index b9e9135916..e7fdf1d0bc 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributeMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributeMapper.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FSDefaultAttributeMapper.java,v 1.3 2008/06/25 05:46:53 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -90,7 +92,7 @@ public Map getAttributes( SPDescriptorConfigElement spConfig = metaManager.getSPDescriptorConfig("/", hostEntityId); if (spConfig != null) { - Map attributes = IDFFMetaUtils.getAttributes(spConfig); + Map attributes = IDFFMetaUtils.getAttributes(spConfig.getValue()); configMap = FSServiceUtils.parseAttributeConfig((List) attributes.get(IFSConstants.SP_ATTRIBUTE_MAP)); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributePlugin.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributePlugin.java index 58a485a7ac..e8f681a6ac 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributePlugin.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultAttributePlugin.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FSDefaultAttributePlugin.java,v 1.4 2008/11/10 22:56:58 veiming Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -112,7 +114,7 @@ public List getAttributeStatements( IDPDescriptorConfigElement idpConfig = metaManager.getIDPDescriptorConfig(realm, hostEntityId); if (idpConfig != null) { - Map attributes = IDFFMetaUtils.getAttributes(idpConfig); + Map attributes = IDFFMetaUtils.getAttributes(idpConfig.getValue()); attributeMap = FSServiceUtils.parseAttributeConfig((List) attributes.get(IFSConstants.IDP_ATTRIBUTE_MAP)); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributeMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributeMapper.java index 56077d484f..07e889b614 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributeMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributeMapper.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FSDefaultRealmAttributeMapper.java,v 1.2 2008/06/25 05:46:53 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -92,7 +94,7 @@ public Map getAttributes( SPDescriptorConfigElement spConfig = metaManager.getSPDescriptorConfig(realm, hostEntityId); if (spConfig != null) { - Map attributes = IDFFMetaUtils.getAttributes(spConfig); + Map attributes = IDFFMetaUtils.getAttributes(spConfig.getValue()); configMap = FSServiceUtils.parseAttributeConfig((List) attributes.get(IFSConstants.SP_ATTRIBUTE_MAP)); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributePlugin.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributePlugin.java index ffd3c9903d..097951c4f4 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributePlugin.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDefaultRealmAttributePlugin.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FSDefaultRealmAttributePlugin.java,v 1.2 2008/06/25 05:46:53 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -91,7 +93,7 @@ public List getAttributeStatements( IDPDescriptorConfigElement idpConfig = metaManager.getIDPDescriptorConfig(realm, hostEntityId); if (idpConfig != null) { - Map attributes = IDFFMetaUtils.getAttributes(idpConfig); + Map attributes = IDFFMetaUtils.getAttributes(idpConfig.getValue()); attributeMap = FSServiceUtils.parseAttributeConfig((List) attributes.get(IFSConstants.IDP_ATTRIBUTE_MAP)); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java index 379ef3bdaf..a083934737 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FSDiscoveryBootStrap.java,v 1.4 2008/12/05 00:18:00 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -140,7 +142,7 @@ private Document getResourceOffering( } try { - ResourceOfferingType offering = discoEntry.getResourceOffering(); + ResourceOfferingType offering = discoEntry.getValue().getResourceOffering(); ServiceInstanceType serviceInstance = offering.getServiceInstance(); String providerID = serviceInstance.getProviderID(); if (!DiscoServiceManager.useImpliedResource()) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSIDPProxyImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSIDPProxyImpl.java index da33e21014..0fa0442e30 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSIDPProxyImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSIDPProxyImpl.java @@ -24,7 +24,7 @@ * * $Id: FSIDPProxyImpl.java,v 1.3 2008/06/25 05:46:54 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -79,7 +79,7 @@ public String getPreferredIDP( try { Map attributes = IDFFMetaUtils.getAttributes( FSUtils.getIDFFMetaManager().getSPDescriptorConfig( - "/", authnRequest.getProviderId())); + "/", authnRequest.getProviderId()).getValue()); String useIntroductionForProxying = IDFFMetaUtils.getFirstAttributeValue( attributes, IFSConstants.USE_INTRODUCTION_FOR_IDP_PROXY); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelper.java index 85424b9f83..7ab14a3b47 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelper.java @@ -25,7 +25,7 @@ * $Id: FSLoginHelper.java,v 1.5 2008/06/25 05:46:54 qcheng Exp $ * * Portions Copyrighted 2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services; @@ -139,7 +139,7 @@ private void setMetaInfo(String metaAlias, String authLevel) hostDescriptor = metaManager.getSPDescriptor( realm, hostEntityID); hostConfig = metaManager.getSPDescriptorConfig( - realm, hostEntityID); + realm, hostEntityID).getValue(); } else { FSUtils.debug.error("FSLoginHelper::setMetaInfo " + "could not get meta manager handle " @@ -499,7 +499,7 @@ private Set getIDPs(String metaAlias) { provider = (String) it.next(); providerDesc = metaManager.getIDPDescriptor(realm,provider); providerConfig = - metaManager.getIDPDescriptorConfig(realm, provider); + metaManager.getIDPDescriptorConfig(realm, provider).getValue(); if (providerDesc == null || providerConfig == null) { continue; } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmIDPProxyImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmIDPProxyImpl.java index 5ea442d59f..044c5bb993 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmIDPProxyImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmIDPProxyImpl.java @@ -24,7 +24,7 @@ * * $Id: FSRealmIDPProxyImpl.java,v 1.2 2008/06/25 05:46:55 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -79,7 +79,7 @@ public String getPreferredIDP( try { Map attributes = IDFFMetaUtils.getAttributes( FSUtils.getIDFFMetaManager().getSPDescriptorConfig( - realm, authnRequest.getProviderId())); + realm, authnRequest.getProviderId()).getValue()); String useIntroductionForProxying = IDFFMetaUtils.getFirstAttributeValue( attributes, IFSConstants.USE_INTRODUCTION_FOR_IDP_PROXY); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPReceiver.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPReceiver.java index 4fd596b637..655a4d1498 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPReceiver.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPReceiver.java @@ -24,7 +24,7 @@ * * $Id: FSSOAPReceiver.java,v 1.7 2008/06/25 05:46:56 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -215,7 +215,7 @@ public void onMessage(HttpServletRequest request, metaManager.getIDPDescriptor(realm, hostedEntityId); BaseConfigType hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); FSServiceManager sm = FSServiceManager.getInstance(); FSSSOBrowserArtifactProfileHandler handler = (FSSSOBrowserArtifactProfileHandler)sm @@ -409,14 +409,14 @@ public void onMessage(HttpServletRequest request, getIDPDescriptor(realm, hostedEntityId); hostedConfig = metaManager. getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } else if (hostedRole != null && hostedRole.equals(IFSConstants.SP)) { hostedProviderDesc = metaManager. getSPDescriptor(realm, hostedEntityId); hostedConfig = metaManager. - getSPDescriptorConfig(realm,hostedEntityId); + getSPDescriptorConfig(realm,hostedEntityId).getValue(); } if (hostedProviderDesc == null) { @@ -562,7 +562,7 @@ public void onMessage(HttpServletRequest request, ProviderDescriptorType hostedDesc = metaManager.getIDPDescriptor(realm, hostedEntityId); BaseConfigType hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostedEntityId); + metaManager.getIDPDescriptorConfig(realm, hostedEntityId).getValue(); FSNameIdentifierMappingRequest mappingRequest = new FSNameIdentifierMappingRequest(elt); if (FSServiceUtils.isSigningOn()) { @@ -704,7 +704,7 @@ public void onMessage(HttpServletRequest request, realm, hostedEntityId); hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } else if (hostedRole.equalsIgnoreCase( IFSConstants.SP)) { @@ -713,7 +713,7 @@ public void onMessage(HttpServletRequest request, realm, hostedEntityId); hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } } } catch (Exception e){ @@ -1042,14 +1042,14 @@ private boolean handleTerminationRequest( hostedProviderDesc = metaManager.getIDPDescriptor( realm, hostedEntityId); hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); remoteDesc = metaManager.getSPDescriptor( realm, remoteEntityId); } else if (hostedRole.equalsIgnoreCase(IFSConstants.SP)) { hostedProviderDesc = metaManager.getSPDescriptor( realm, hostedEntityId); hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); remoteDesc = metaManager.getIDPDescriptor( realm, remoteEntityId); } @@ -1450,7 +1450,7 @@ private void handleLECPRequest( handler.setHostedDescriptor( metaManager.getIDPDescriptor(realm, hostedEntityId)); handler.setHostedDescriptorConfig( - metaManager.getIDPDescriptorConfig(realm, hostedEntityId)); + metaManager.getIDPDescriptorConfig(realm, hostedEntityId).getValue()); handler.setRealm(realm); handler.processLECPAuthnRequest(authnRequest); } catch(Exception se) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSServiceManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSServiceManager.java index f936168c91..09d0d66d75 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSServiceManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSServiceManager.java @@ -24,7 +24,7 @@ * * $Id: FSServiceManager.java,v 1.5 2008/06/25 05:46:56 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services; @@ -243,7 +243,7 @@ public FSSSOAndFedHandler getSSOAndFedHandler( SPDescriptorType spDescriptor = metaManager.getSPDescriptor(realm, spEntityId); BaseConfigType spConfig = - metaManager.getSPDescriptorConfig(realm, spEntityId); + metaManager.getSPDescriptorConfig(realm, spEntityId).getValue(); String relayState = authnRequest.getRelayState(); if (FSUtils.debug.messageEnabled()) { @@ -379,7 +379,7 @@ public FSSSOLECPProfileHandler getLECPProfileHandler( response, authnRequest, metaManager.getSPDescriptor(realm, spEntityId), - metaManager.getSPDescriptorConfig(realm, spEntityId), + metaManager.getSPDescriptorConfig(realm, spEntityId).getValue(), spEntityId, authnRequest.getRelayState()); } catch(IDFFMetaException ex){ @@ -710,12 +710,12 @@ public FSNameRegistrationHandler getNameRegistrationHandler( remoteDesc = metaManager.getSPDescriptor( realm, remoteEntityId); remoteConfig = metaManager.getSPDescriptorConfig( - realm, remoteEntityId); + realm, remoteEntityId).getValue(); } else { remoteDesc = metaManager.getIDPDescriptor( realm, remoteEntityId); remoteConfig = metaManager.getIDPDescriptorConfig( - realm, remoteEntityId); + realm, remoteEntityId).getValue(); } handlerRegistration.setRealm(realm); handlerRegistration.setRemoteEntityId(remoteEntityId); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionArtifactHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionArtifactHandler.java index 231b5b01e8..f69b85d1d6 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionArtifactHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionArtifactHandler.java @@ -25,7 +25,7 @@ * $Id: FSAssertionArtifactHandler.java,v 1.14 2009/11/03 00:49:49 madan_ranganath Exp $ * * Portions Copyrighted 2015-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.fednsso; @@ -1904,7 +1904,7 @@ protected void sendProxyResponse(String requestID) { BaseConfigType proxySPConfig = null; try { proxySPConfig = metaManager.getSPDescriptorConfig( - realm, proxySPEntityId); + realm, proxySPEntityId).getValue(); } catch (Exception e) { FSUtils.debug.error("FSAssertionArtifactHandler.sendProxyResponse:" + "Couldn't obtain proxy sp meta:", e); @@ -1920,7 +1920,7 @@ protected void sendProxyResponse(String requestID) { try { localIDPDesc = metaManager.getIDPDescriptor(realm, hostEntityId); localIDPConfig = metaManager.getIDPDescriptorConfig( - realm, hostEntityId); + realm, hostEntityId).getValue(); localIDPMetaAlias = localIDPConfig.getMetaAlias(); } catch (Exception e) { FSUtils.debug.error("FSAssertionartifactHandler.sendProxyResponse:" diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionConsumerService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionConsumerService.java index 4a023f31f6..f98e7c809c 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionConsumerService.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSAssertionConsumerService.java @@ -24,7 +24,7 @@ * * $Id: FSAssertionConsumerService.java,v 1.3 2008/06/25 05:46:57 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.fednsso; @@ -125,7 +125,7 @@ public void doGet( hostEntityId = metaManager.getEntityIDByMetaAlias(metaAlias); hostDesc = metaManager.getSPDescriptor(realm, hostEntityId); hostConfig = metaManager.getSPDescriptorConfig( - realm, hostEntityId); + realm, hostEntityId).getValue(); } catch (Exception e) { FSUtils.debug.error("FSAssertionConsumerService.doGet: ", e); FSUtils.forwardRequest(request, response, framedPageURL); @@ -251,7 +251,7 @@ public void doPost( try { hostEntityId = metaManager.getEntityIDByMetaAlias(metaAlias); hostDesc = metaManager.getSPDescriptor(realm, hostEntityId); - hostConfig = metaManager.getSPDescriptorConfig(realm, hostEntityId); + hostConfig = metaManager.getSPDescriptorConfig(realm, hostEntityId).getValue(); } catch (Exception e) { FSUtils.debug.error("FSAssertionConsumerService.doPost: " + "Exception when obtain host meta data:", e); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIDPFinderService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIDPFinderService.java index b6f5cf59ef..08296b9332 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIDPFinderService.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIDPFinderService.java @@ -24,7 +24,7 @@ * * $Id: FSIDPFinderService.java,v 1.4 2008/06/25 05:46:58 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -128,7 +128,7 @@ public void doGet( try { if (metaManager != null ) { hostConfig = metaManager.getIDPDescriptorConfig( - realm, entityID); + realm, entityID).getValue(); if (hostConfig != null) { hostMetaAlias = hostConfig.getMetaAlias(); } @@ -242,7 +242,7 @@ private String getCommonDomainIDP( List cotList = null; if (metaManager != null) { BaseConfigType spConfig = - metaManager.getSPDescriptorConfig(realm, entityID); + metaManager.getSPDescriptorConfig(realm, entityID).getValue(); cotList = IDFFMetaUtils.getAttributeValueFromConfig( spConfig, IFSConstants.COT_LIST); } @@ -346,7 +346,7 @@ private String getLoginURL( IDFFMetaManager metaManager = FSUtils.getIDFFMetaManager(); idpDescriptor = metaManager.getIDPDescriptor(realm, hostProviderID); idpConfig = metaManager.getIDPDescriptorConfig( - realm, hostProviderID); + realm, hostProviderID).getValue(); } catch (Exception e) { FSUtils.debug.error("FSIDPFinderServer.getLoginURL : exception "+ "while retrieving meta config", e); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIntersiteTransferService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIntersiteTransferService.java index 80109728be..a8a9fca10d 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIntersiteTransferService.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSIntersiteTransferService.java @@ -24,7 +24,7 @@ * * $Id: FSIntersiteTransferService.java,v 1.6 2008/08/29 04:57:16 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.fednsso; @@ -418,7 +418,7 @@ public void doGet( SPDescriptorType hostDesc = metaManager.getSPDescriptor(realm, hostEntityId); BaseConfigType hostConfig = - metaManager.getSPDescriptorConfig(realm, hostEntityId); + metaManager.getSPDescriptorConfig(realm, hostEntityId).getValue(); if (IDFFMetaUtils.getBooleanAttributeValueFromConfig( hostConfig, IFSConstants.ENABLE_AFFILIATION)) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedHandler.java index 54c925d01b..80813c6f11 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedHandler.java @@ -25,7 +25,7 @@ * $Id: FSSSOAndFedHandler.java,v 1.12 2009/11/04 00:06:11 exu Exp $ * * Portions Copyrighted 2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.fednsso; @@ -1150,7 +1150,7 @@ public void processAuthnRequest( try { spDescriptor = metaManager.getSPDescriptor(realm, spEntityId); - spConfig = metaManager.getSPDescriptorConfig(realm, spEntityId); + spConfig = metaManager.getSPDescriptorConfig(realm, spEntityId).getValue(); if (!metaManager.isTrustedProvider( realm, hostedEntityId, spEntityId)) { @@ -1513,7 +1513,7 @@ protected void sendProxyAuthnRequest ( localDescriptor = metaManager.getSPDescriptor( realm, hostedEntityId); localDescriptorConfig = - metaManager.getSPDescriptorConfig(realm, hostedEntityId); + metaManager.getSPDescriptorConfig(realm, hostedEntityId).getValue(); } catch (Exception e) { FSUtils.debug.error( "FSSSOAndFedHandler.sendProxyAuthnRequest:",e); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedService.java index 40a54b319c..fc5553a9c7 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedService.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/fednsso/FSSSOAndFedService.java @@ -24,7 +24,7 @@ * * $Id: FSSSOAndFedService.java,v 1.8 2009/06/19 02:45:50 bigfatrat Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.fednsso; @@ -244,7 +244,7 @@ public void doGet( hostEntityId = metaManager.getEntityIDByMetaAlias(metaAlias); hostedDesc = metaManager.getIDPDescriptor(realm, hostEntityId); hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostEntityId); + realm, hostEntityId).getValue(); } catch (Exception e) { if (FSUtils.debug.messageEnabled()) { FSUtils.debug.message( @@ -369,7 +369,7 @@ public void doPost( hostEntityId = metaManager.getEntityIDByMetaAlias(metaAlias); hostedDesc = metaManager.getIDPDescriptor(realm, hostEntityId); hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostEntityId); + realm, hostEntityId).getValue(); } catch (Exception e) { if (FSUtils.debug.messageEnabled()) { FSUtils.debug.message( @@ -428,7 +428,7 @@ private void handleAuthnRequest( try { hostedDesc = metaManager.getIDPDescriptor(realm, hostEntityId); hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostEntityId); + realm, hostEntityId).getValue(); if (hostedConfig != null) { metaAlias = hostedConfig.getMetaAlias(); } @@ -725,7 +725,7 @@ public void onMessage(HttpServletRequest request, IDPDescriptorType hostedDesc = metaManager.getIDPDescriptor(realm, hostEntityId); BaseConfigType hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostEntityId); + metaManager.getIDPDescriptorConfig(realm, hostEntityId).getValue(); FSSessionManager sessionService = FSSessionManager.getInstance(metaAlias); sessionService.setAuthnRequest( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSLogoutUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSLogoutUtil.java index a48cf1527c..5145c1f7f1 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSLogoutUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSLogoutUtil.java @@ -25,7 +25,7 @@ * $Id: FSLogoutUtil.java,v 1.12 2008/11/10 22:56:58 veiming Exp $ * * Portions Copyrighted 2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.logout; @@ -1037,12 +1037,12 @@ protected static void sendErrorPage(HttpServletRequest request, IFSConstants.IDP.equalsIgnoreCase(hostedRole)) { hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } else if (hostedEntityId != null && IFSConstants.SP.equalsIgnoreCase(hostedRole)) { hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } retURL = FSServiceUtils.getLogoutDonePageURL( request, hostedConfig, providerAlias); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSProcessLogoutServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSProcessLogoutServlet.java index 691b652cff..d19bf63a65 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSProcessLogoutServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSProcessLogoutServlet.java @@ -24,7 +24,7 @@ * * $Id: FSProcessLogoutServlet.java,v 1.7 2008/12/19 06:50:47 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -166,12 +166,12 @@ private void doGetPost(HttpServletRequest request, hostedProviderDesc = metaManager.getIDPDescriptor( realm, hostedEntityId); hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } else if (hostedRole.equalsIgnoreCase(IFSConstants.SP)) { hostedProviderDesc = metaManager.getSPDescriptor( realm, hostedEntityId); hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } } if (hostedProviderDesc == null){ diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnLogoutServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnLogoutServlet.java index e64dc530b6..dd768b090f 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnLogoutServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnLogoutServlet.java @@ -24,7 +24,7 @@ * * $Id: FSReturnLogoutServlet.java,v 1.6 2008/12/19 06:50:47 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.logout; @@ -185,10 +185,10 @@ private void doGetPost(HttpServletRequest request, if (hostedRole != null) { if (hostedRole.equalsIgnoreCase(IFSConstants.IDP)) { hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } else if (hostedRole.equalsIgnoreCase(IFSConstants.SP)) { hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } } if (hostedConfig == null) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSSingleLogoutHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSSingleLogoutHandler.java index 6ee5c6519b..2311ce0280 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSSingleLogoutHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSSingleLogoutHandler.java @@ -25,7 +25,7 @@ * $Id: FSSingleLogoutHandler.java,v 1.15 2009/11/04 00:06:11 exu Exp $ * * Portions Copyrighted 2013 ForgeRock AS - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. * */ package com.sun.identity.federation.services.logout; @@ -1778,7 +1778,7 @@ private FSLogoutStatus handleIDPProxyLogout(String sourceEntityId) try { BaseConfigType sourceSPConfig = metaManager.getSPDescriptorConfig( - realm, sourceEntityId); + realm, sourceEntityId).getValue(); String enabledString = IDFFMetaUtils.getFirstAttributeValueFromConfig( sourceSPConfig, IFSConstants.ENABLE_IDP_PROXY); @@ -1808,7 +1808,7 @@ private FSLogoutStatus handleIDPProxyLogout(String sourceEntityId) FSSingleLogoutHandler handler = new FSSingleLogoutHandler(); proxySPConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); proxySPDescriptor = metaManager.getSPDescriptor( realm, hostedEntityId); handler.setHostedDescriptor(proxySPDescriptor); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationInitiationServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationInitiationServlet.java index 569ec6006a..cae62954d2 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationInitiationServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationInitiationServlet.java @@ -24,7 +24,7 @@ * * $Id: FSRegistrationInitiationServlet.java,v 1.7 2008/12/19 06:50:47 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -180,14 +180,14 @@ private void doGetPost( hostedProviderDesc = metaManager.getSPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getSPDescriptorConfig(realm, hostedEntityId); + metaManager.getSPDescriptorConfig(realm, hostedEntityId).getValue(); } else if (hostedRole != null && hostedRole.equalsIgnoreCase(IFSConstants.IDP)) { hostedProviderDesc = metaManager.getIDPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostedEntityId); + metaManager.getIDPDescriptorConfig(realm, hostedEntityId).getValue(); } if (hostedProviderDesc == null) { throw new IDFFMetaException((String) null); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationRequestServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationRequestServlet.java index 1bd8d233f5..e2a8749cc5 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationRequestServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationRequestServlet.java @@ -24,7 +24,7 @@ * * $Id: FSRegistrationRequestServlet.java,v 1.4 2008/06/25 05:47:03 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.registration; @@ -178,14 +178,14 @@ private void doGetPost( hostedProviderDesc = metaManager.getIDPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostedEntityId); + metaManager.getIDPDescriptorConfig(realm, hostedEntityId).getValue(); } else if (hostedProviderRole != null && hostedProviderRole.equalsIgnoreCase(IFSConstants.SP)) { hostedProviderDesc = metaManager.getSPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getSPDescriptorConfig(realm, hostedEntityId); + metaManager.getSPDescriptorConfig(realm, hostedEntityId).getValue(); } if (hostedProviderDesc == null) { throw new IDFFMetaException((String) null); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationReturnServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationReturnServlet.java index 8e9bf7a778..11d836f528 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationReturnServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSRegistrationReturnServlet.java @@ -24,7 +24,7 @@ * * $Id: FSRegistrationReturnServlet.java,v 1.4 2008/06/25 05:47:03 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.registration; @@ -165,14 +165,14 @@ private void doGetPost(HttpServletRequest request, hostedProviderDesc = metaManager.getIDPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostedEntityId); + metaManager.getIDPDescriptorConfig(realm, hostedEntityId).getValue(); } else if (hostedProviderRole != null && hostedProviderRole.equalsIgnoreCase(IFSConstants.SP)) { hostedProviderDesc = metaManager.getSPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getSPDescriptorConfig(realm, hostedEntityId); + metaManager.getSPDescriptorConfig(realm, hostedEntityId).getValue(); } if (hostedProviderDesc == null) { throw new IDFFMetaException((String) null); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationInitiationServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationInitiationServlet.java index 43c181ae41..cd172c6042 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationInitiationServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationInitiationServlet.java @@ -24,7 +24,7 @@ * * $Id: FSTerminationInitiationServlet.java,v 1.7 2008/12/19 06:50:47 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -158,14 +158,14 @@ private void doGetPost( hostedProviderDesc = metaManager.getSPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getSPDescriptorConfig(realm, hostedEntityId); + metaManager.getSPDescriptorConfig(realm, hostedEntityId).getValue(); } else if (hostedRole != null && hostedRole.equalsIgnoreCase(IFSConstants.IDP)) { hostedProviderDesc = metaManager.getIDPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostedEntityId); + metaManager.getIDPDescriptorConfig(realm, hostedEntityId).getValue(); } if (hostedProviderDesc == null) { throw new IDFFMetaException((String) null); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationRequestServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationRequestServlet.java index 7be4a30c40..de90324a7d 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationRequestServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationRequestServlet.java @@ -24,7 +24,7 @@ * * $Id: FSTerminationRequestServlet.java,v 1.4 2008/06/25 05:47:04 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -172,14 +172,14 @@ private void doGetPost( hostedProviderDesc = metaManager.getIDPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getIDPDescriptorConfig(realm, hostedEntityId); + metaManager.getIDPDescriptorConfig(realm, hostedEntityId).getValue(); } else if (hostedProviderRole != null && hostedProviderRole.equalsIgnoreCase(IFSConstants.SP)) { hostedProviderDesc = metaManager.getSPDescriptor(realm, hostedEntityId); hostedConfig = - metaManager.getSPDescriptorConfig(realm, hostedEntityId); + metaManager.getSPDescriptorConfig(realm, hostedEntityId).getValue(); } if (hostedProviderDesc == null) { throw new IDFFMetaException((String) null); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationReturnServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationReturnServlet.java index eb28f308f6..0e5691341f 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationReturnServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/termination/FSTerminationReturnServlet.java @@ -24,7 +24,7 @@ * * $Id: FSTerminationReturnServlet.java,v 1.4 2008/12/19 06:50:48 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -140,11 +140,11 @@ private void doGetPost( if (hostedRole != null && hostedRole.equalsIgnoreCase(IFSConstants.IDP)) { hostedConfig = metaManager.getIDPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } else if (hostedRole != null && hostedRole.equalsIgnoreCase(IFSConstants.SP)) { hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityId); + realm, hostedEntityId).getValue(); } if (hostedRole == null || hostedConfig == null) { throw new IDFFMetaException((String) null); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSAttributeStatementHelper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSAttributeStatementHelper.java index c59c6f7199..4fac8487f3 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSAttributeStatementHelper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSAttributeStatementHelper.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FSAttributeStatementHelper.java,v 1.3 2008/06/25 05:47:04 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -80,7 +82,7 @@ public static AttributeStatement getAutoFedAttributeStatement( BaseConfigType hostConfig = null; try { if (metaManager != null) { - hostConfig = metaManager.getIDPDescriptorConfig(realm,entityID); + hostConfig = metaManager.getIDPDescriptorConfig(realm,entityID).getValue(); } } catch (IDFFMetaException fae) { FSUtils.debug.error("FSAttributeStatementHelper.getAutoFed" + diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSServiceUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSServiceUtils.java index 88438546fb..2bcdc09ce3 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSServiceUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/util/FSServiceUtils.java @@ -25,7 +25,7 @@ * $Id: FSServiceUtils.java,v 1.11 2008/11/10 22:56:59 veiming Exp $ * * Portions Copyrighted 2012-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.federation.services.util; @@ -60,7 +60,6 @@ import org.w3c.dom.Document; -import com.sun.identity.common.SystemConfigurationException; import com.sun.identity.common.SystemConfigurationUtil; import com.sun.identity.federation.accountmgmt.FSAccountFedInfo; import com.sun.identity.federation.accountmgmt.FSAccountManager; @@ -177,10 +176,10 @@ public static String getCommonLoginPageURL ( if (role != null) { if (role.equalsIgnoreCase(IFSConstants.SP)) { hostConfig = metaManager.getSPDescriptorConfig( - realm, entityId); + realm, entityId).getValue(); } else if (role.equalsIgnoreCase(IFSConstants.IDP)) { hostConfig = metaManager.getIDPDescriptorConfig( - realm, entityId); + realm, entityId).getValue(); } } }catch(Exception e){ @@ -933,13 +932,12 @@ public static String getAssertionConsumerServiceURL( String matching = null; String defaultValue = null; String first = null; - List urls = spDescriptor.getAssertionConsumerServiceURL(); + List urls = spDescriptor.getAssertionConsumerServiceURL(); if (urls != null && !urls.isEmpty()) { - Iterator iter = urls.iterator(); - SPDescriptorType.AssertionConsumerServiceURLType curUrl = null; + Iterator iter = urls.iterator(); + SPDescriptorType.AssertionConsumerServiceURL curUrl = null; while (iter.hasNext()) { - curUrl = (SPDescriptorType.AssertionConsumerServiceURLType) - iter.next(); + curUrl = iter.next(); String curId = curUrl.getId(); String curValue = curUrl.getValue(); if (id != null && curId != null && curId.equals(id)) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java index 8459f1bf76..4748d19c48 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: AuthnSvcUtils.java,v 1.5 2008/12/05 00:18:02 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -117,7 +119,7 @@ public static boolean setResourceOfferingAndCredentials( try { DiscoEntryElement discoEntry = (DiscoEntryElement) DiscoServiceManager.getBootstrappingDiscoEntry(); - ResourceOfferingType offering = discoEntry.getResourceOffering(); + ResourceOfferingType offering = discoEntry.getValue().getResourceOffering(); if (!DiscoServiceManager.useImpliedResource()) { ServiceInstanceType serviceInstance = offering.getServiceInstance(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java index 925bce4764..d353682643 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: DiscoveryService.java,v 1.5 2008/12/05 00:18:30 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,7 +39,7 @@ import java.util.Collection; import java.util.logging.Level; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.w3c.dom.*; import com.sun.identity.shared.xml.XMLUtils; @@ -318,16 +320,11 @@ private com.sun.identity.liberty.ws.disco.jaxb.ModifyResponseElement update( DiscoUtils.debug.message("in update."); ModifyResponseElement resp = null; StatusType status = null; - try { - resp = - DiscoUtils.getDiscoFactory().createModifyResponseElement(); - status = DiscoUtils.getDiscoFactory().createStatusType(); - resp.setStatus(status); - } catch (JAXBException je) { - DiscoUtils.debug.error("DiscoService.update: couldn't form " - + "ModifyResponse."); - throw je; - } + resp = + DiscoUtils.getDiscoFactory().createModifyResponseElement( + DiscoUtils.getDiscoFactory().createModifyResponseType()); + status = DiscoUtils.getDiscoFactory().createStatusType(); + resp.getValue().setStatus(DiscoUtils.getDiscoFactory().createStatusElement(status)); String providerID = DiscoServiceManager.getDiscoProviderID(); String resourceID = null; @@ -415,7 +412,7 @@ private com.sun.identity.liberty.ws.disco.jaxb.ModifyResponseElement update( List entryIds = (List) results.get( DiscoEntryHandler.NEW_ENTRY_IDS); if ((entryIds != null) && (entryIds.size() != 0)) { - resp.getNewEntryIDs().addAll(entryIds); + resp.getValue().getNewEntryIDs().addAll(entryIds); } String[] data = { logMsg }; LogUtil.access(Level.INFO, diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoSDKUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoSDKUtils.java index 8c107f312f..68fa12f05f 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoSDKUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoSDKUtils.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: DiscoSDKUtils.java,v 1.3 2008/08/06 17:28:08 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -38,10 +40,10 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import javax.xml.namespace.QName; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import java.util.ResourceBundle; import com.sun.identity.shared.debug.Debug; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoServiceManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoServiceManager.java index 924bcf2a33..4a5ed2d6b9 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoServiceManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoServiceManager.java @@ -28,6 +28,7 @@ /** * Portions Copyrighted 2012 ForgeRock Inc + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.liberty.ws.disco.common; @@ -39,7 +40,7 @@ import java.util.StringTokenizer; import javax.xml.transform.stream.StreamSource; -import javax.xml.bind.*; +import jakarta.xml.bind.*; import com.sun.identity.common.SystemConfigurationUtil; import com.sun.identity.liberty.ws.disco.plugins.Default64ResourceIDMapper; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java index ad8711b5cf..8d982e4b74 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: DiscoUtils.java,v 1.5 2008/06/25 05:47:12 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -39,19 +41,16 @@ import java.util.Iterator; import java.util.BitSet; +import com.sun.identity.liberty.ws.disco.jaxb11.GenerateBearerTokenElement; import com.sun.identity.saml.assertion.NameIdentifier; import com.sun.identity.saml.assertion.Statement; -import com.sun.identity.liberty.ws.disco.DiscoveryException; import com.sun.identity.liberty.ws.disco.EncryptedResourceID; import com.sun.identity.liberty.ws.disco.ResourceOffering; import com.sun.identity.liberty.ws.disco.ResourceID; import com.sun.identity.liberty.ws.disco.Description; import com.sun.identity.liberty.ws.disco.jaxb.*; -import com.sun.identity.liberty.ws.disco.jaxb11.*; import com.sun.identity.liberty.ws.disco.plugins.NameIdentifierMapper; -import com.sun.identity.liberty.ws.disco.plugins.jaxb.*; import com.sun.identity.liberty.ws.interfaces.Authorizer; -import com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType; import com.sun.identity.liberty.ws.security.*; import com.sun.identity.liberty.ws.soapbinding.Message; import com.sun.identity.liberty.ws.soapbinding.ProviderHeader; @@ -178,7 +177,7 @@ private static void handleDirectives(ResourceOffering current, Iterator iter0 = directives.iterator(); while(iter0.hasNext()) { Object directive = iter0.next(); - List descIDRefs = + List descIDRefs = ((DirectiveType) directive).getDescriptionIDRefs(); if (directive instanceof EncryptResourceIDElement) { debug.message("DiscoService: has encrypt D"); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/IDFFNameIdentifierMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/IDFFNameIdentifierMapper.java index 8d33832ad7..a6bac6c308 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/IDFFNameIdentifierMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/IDFFNameIdentifierMapper.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDFFNameIdentifierMapper.java,v 1.3 2008/06/25 05:47:12 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -106,7 +108,7 @@ public NameIdentifier getNameIdentifier(String spProviderID, IDFFMetaManager metaManager = FSUtils.getIDFFMetaManager(); String metaAlias = metaManager.getIDPDescriptorConfig( - "/", idpProviderID).getMetaAlias(); + "/", idpProviderID).getValue().getMetaAlias(); FSAccountManager fsaccountmgr = FSAccountManager.getInstance(metaAlias); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java index e4ed2d0e4f..4ccfe4b088 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java @@ -23,12 +23,16 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: PPRequestHandler.java,v 1.2 2008/06/25 05:47:14 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp; +import com.sun.identity.liberty.ws.idpp.jaxb.ResponseType; +import com.sun.identity.liberty.ws.interaction.jaxb.InquiryElementType; import com.sun.identity.shared.xml.XMLUtils; import com.sun.identity.liberty.ws.idpp.jaxb.QueryResponseElement; import com.sun.identity.liberty.ws.idpp.jaxb.QueryElement; @@ -68,7 +72,9 @@ import java.util.Date; import java.util.logging.Level; import javax.xml.namespace.QName; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; + +import org.glassfish.jaxb.core.v2.model.core.ID; import org.w3c.dom.Document; //Interaction imports @@ -191,9 +197,9 @@ public Object processDSTRequest( IDPPUtils.debug.message("PPRequestHandler:processQueryRequest:" + "request received:" + XMLUtils.print(request.getDocumentElement())); } - Object resObj = query.getResourceID(); + Object resObj = query.getValue().getResourceID(); if(resObj == null) { - resObj = query.getEncryptedResourceID(); + resObj = query.getValue().getEncryptedResourceID(); } QueryResponseElement response = getQueryResponse(query); String resourceID = getResourceID(resObj, providerID, @@ -203,8 +209,9 @@ public Object processDSTRequest( IDPPUtils.debug.message("PPRequestHandler:processQuery" + "Request: resource id is invalid."); } - response.setStatus(setStatusType(false, DSTConstants.NO_RESOURCE, - IDPPUtils.bundle.getString("invalidResourceID"), null)); + StatusType status = setStatusType(false, DSTConstants.NO_RESOURCE, + IDPPUtils.bundle.getString("invalidResourceID"), null); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } if(LogUtil.isLogEnabled()) { @@ -216,15 +223,16 @@ public Object processDSTRequest( "securityMechID") + "=" + requestMsg.getAuthenticationMechanism() + " "; } - List queryItems = query.getQueryItem(); + List queryItems = query.getValue().getQueryItem(); if (queryItems.size() == 0) { if(IDPPUtils.debug.warningEnabled()) { IDPPUtils.debug.warning("PPRequestHandler:processQuery" + "Request: The request does not have any query items."); } - response.setStatus(setStatusType(false, - DSTConstants.UNEXPECTED_ERROR, - IDPPUtils.bundle.getString("nullQueryItems"), null)); + StatusType status = setStatusType(false, + DSTConstants.UNEXPECTED_ERROR, + IDPPUtils.bundle.getString("nullQueryItems"), null); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } @@ -235,8 +243,8 @@ public Object processDSTRequest( int queryItemsSize = queryItems.size(); for(int i= 0; i < queryItemsSize; i++) { boolean isQueryItemValid = true; - QueryType.QueryItemType item = - (QueryType.QueryItemType)queryItems.get(i); + QueryType.QueryItem item = + (QueryType.QueryItem)queryItems.get(i); String select = item.getSelect(); String ref = item.getItemID(); if(ref == null || ref.length() == 0) { @@ -248,9 +256,9 @@ public Object processDSTRequest( IDPPUtils.debug.warning("PPRequestHandler:process"+ "QueryRequest: There is no Select in the request."); } - response.setStatus( - setStatusType(false, DSTConstants.MISSING_SELECT, - IDPPUtils.bundle.getString("missingSelect"), ref)); + StatusType status = setStatusType(false, DSTConstants.MISSING_SELECT, + IDPPUtils.bundle.getString("missingSelect"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); isQueryItemValid = false; } @@ -259,9 +267,10 @@ public Object processDSTRequest( IDPPUtils.debug.warning("PPRequestHandler:process"+ "QueryRequest: Data not supported"); } - response.setStatus(setStatusType(false, - DSTConstants.INVALID_SELECT, - IDPPUtils.bundle.getString("invalidSelect"), ref)); + StatusType status = setStatusType(false, + DSTConstants.INVALID_SELECT, + IDPPUtils.bundle.getString("invalidSelect"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); isQueryItemValid = false; } @@ -273,9 +282,10 @@ public Object processDSTRequest( if(authZAction == null || authZAction.equalsIgnoreCase( IDPPConstants.AUTHZ_DENY)) { - response.setStatus(setStatusType(false, - DSTConstants.NOT_AUTHORIZED, - IDPPUtils.bundle.getString("notAuthorized"), ref)); + StatusType status = setStatusType(false, + DSTConstants.NOT_AUTHORIZED, + IDPPUtils.bundle.getString("notAuthorized"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); if(LogUtil.isLogEnabled()) { String[] data = {resourceID}; LogUtil.error(Level.INFO,LogUtil.PP_QUERY_FAILURE,data); @@ -295,9 +305,10 @@ public Object processDSTRequest( LogUtil.error(Level.INFO, LogUtil.PP_INTERACTION_FAILURE,data); } - response.setStatus(setStatusType(false, - DSTConstants.NOT_AUTHORIZED, - IDPPUtils.bundle.getString("interactionFailed"),ref)); + StatusType status = setStatusType(false, + DSTConstants.NOT_AUTHORIZED, + IDPPUtils.bundle.getString("interactionFailed"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); isQueryItemValid = false; } } else { @@ -317,9 +328,10 @@ public Object processDSTRequest( LogUtil.error(Level.INFO, LogUtil.PP_INTERACTION_FAILURE,data); } - response.setStatus(setStatusType(false, - DSTConstants.NOT_AUTHORIZED, - IDPPUtils.bundle.getString("interactionFailed"),ref)); + StatusType status = setStatusType(false, + DSTConstants.NOT_AUTHORIZED, + IDPPUtils.bundle.getString("interactionFailed"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); isQueryItemValid = false; } else { interactedData.putAll(intrData); @@ -353,7 +365,7 @@ public Object processDSTRequest( dstQueryItems, interactedData, request); List data = getData(queryResults); if(data != null && !data.isEmpty()) { - response.getData().addAll(data); + response.getValue().getData().addAll(data); } if(LogUtil.isLogEnabled()) { String[] msgData = { resourceID }; @@ -375,15 +387,9 @@ private List getData(Map queryResults) throws IDPPException { Set queryItems = queryResults.keySet(); Iterator iter = queryItems.iterator(); while(iter.hasNext()) { - QueryResponseType.DataType data = null; - try { - data = IDPPUtils.getIDPPFactory(). - createQueryResponseTypeDataType(); - } catch (JAXBException je) { - IDPPUtils.debug.error("PPRequestHandler:getData:jaxb fail", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + QueryResponseType.Data data = null; + data = IDPPUtils.getIDPPFactory(). + createQueryResponseTypeData(); DSTQueryItem dstQueryItem = (DSTQueryItem)iter.next(); List values = (List)queryResults.get(dstQueryItem); if(values.isEmpty()) { @@ -414,34 +420,28 @@ private StatusType setStatusType(boolean success, throw new IDPPException( IDPPUtils.bundle.getString("nullInputParams")); } - try { - StatusType status = IDPPUtils.getIDPPFactory().createStatusType(); - if(success) { - QName qName = new QName(IDPPConstants.XMLNS_IDPP, statusCode); - status.setCode(qName); - } else { - QName qName = - new QName(IDPPConstants.XMLNS_IDPP, DSTConstants.FAILED); - status.setCode(qName); - - StatusType secondStatus = - IDPPUtils.getIDPPFactory().createStatusType(); - QName secondQ = new QName(IDPPConstants.XMLNS_IDPP, statusCode); - secondStatus.setCode(secondQ); - if(comment != null) { - secondStatus.setComment(comment); - } - if(ref != null) { - secondStatus.setRef(ref); - } - status.getStatus().add(secondStatus); - } - return status; - } catch (JAXBException je) { - IDPPUtils.debug.error("PPRequestHandler:setStatusType:" + - "jaxb failure:" , je); - throw new IDPPException(IDPPUtils.bundle.getString("jaxbFailure")); + StatusType status = IDPPUtils.getIDPPFactory().createStatusType(); + if(success) { + QName qName = new QName(IDPPConstants.XMLNS_IDPP, statusCode); + status.setCode(qName); + } else { + QName qName = + new QName(IDPPConstants.XMLNS_IDPP, DSTConstants.FAILED); + status.setCode(qName); + + StatusType secondStatus = + IDPPUtils.getIDPPFactory().createStatusType(); + QName secondQ = new QName(IDPPConstants.XMLNS_IDPP, statusCode); + secondStatus.setCode(secondQ); + if(comment != null) { + secondStatus.setComment(comment); + } + if(ref != null) { + secondStatus.setRef(ref); + } + status.getStatus().add(IDPPUtils.getIDPPFactory().createStatusElement(secondStatus)); } + return status; } /** @@ -475,9 +475,9 @@ public ModifyResponseElement processModifyRequest( Map interactedData = new HashMap(); ModifyResponseElement response = getModifyResponse(modify); - Object resObj = modify.getResourceID(); + Object resObj = modify.getValue().getResourceID(); if(resObj == null) { - resObj = modify.getEncryptedResourceID(); + resObj = modify.getValue().getEncryptedResourceID(); } String resourceID = getResourceID(resObj, providerID, IDPPConstants.XMLNS_IDPP); @@ -486,8 +486,9 @@ public ModifyResponseElement processModifyRequest( IDPPUtils.debug.warning("PPRequestHandler:processModify" + "Request: resource id is invalid."); } - response.setStatus(setStatusType(false, DSTConstants.NO_RESOURCE, - IDPPUtils.bundle.getString("invalidResourceID"), null)); + StatusType status = setStatusType(false, DSTConstants.NO_RESOURCE, + IDPPUtils.bundle.getString("invalidResourceID"), null); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } if(LogUtil.isLogEnabled()) { @@ -499,13 +500,14 @@ public ModifyResponseElement processModifyRequest( "securityMechID") + "=" + requestMsg.getAuthenticationMechanism() + " "; } - List modificationElements = modify.getModification(); + List modificationElements = modify.getValue().getModification(); if(modificationElements.size() == 0) { IDPPUtils.debug.error("PPRequestHandler:process" + "ModifyRequest: Modification elements are null"); - response.setStatus(setStatusType(false, - DSTConstants.UNEXPECTED_ERROR, - IDPPUtils.bundle.getString("nullModifications"),null)); + StatusType status = setStatusType(false, + DSTConstants.UNEXPECTED_ERROR, + IDPPUtils.bundle.getString("nullModifications"), null); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } @@ -513,8 +515,8 @@ public ModifyResponseElement processModifyRequest( List dstModifications = new ArrayList(); int size = modificationElements.size(); for (int i=0; i < size; i++) { - ModifyType.ModificationType modificationType = - (ModifyType.ModificationType)modificationElements.get(i); + ModifyType.Modification modificationType = + modificationElements.get(i); String select = modificationType.getSelect(); String ref = modificationType.getId(); @@ -524,9 +526,10 @@ public ModifyResponseElement processModifyRequest( IDPPUtils.debug.warning("PersonalProfileService:process"+ "ModifyRequest: select is null"); } - response.setStatus(setStatusType(false, - DSTConstants.MISSING_SELECT, - IDPPUtils.bundle.getString("missingSelect"), ref)); + StatusType status = setStatusType(false, + DSTConstants.MISSING_SELECT, + IDPPUtils.bundle.getString("missingSelect"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } if(!pp.isSelectDataSupported(select)){ @@ -534,9 +537,10 @@ public ModifyResponseElement processModifyRequest( IDPPUtils.debug.warning("PersonalProfileService:process"+ "ModifyRequest: Data not supported"); } - response.setStatus(setStatusType(false, - DSTConstants.INVALID_SELECT, - IDPPUtils.bundle.getString("invalidSelect"), ref)); + StatusType status = setStatusType(false, + DSTConstants.INVALID_SELECT, + IDPPUtils.bundle.getString("invalidSelect"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } //Check for authorization & interaction. @@ -547,9 +551,10 @@ public ModifyResponseElement processModifyRequest( if(authZAction == null || authZAction.equalsIgnoreCase( IDPPConstants.AUTHZ_DENY)) { - response.setStatus(setStatusType(false, - DSTConstants.NOT_AUTHORIZED, - IDPPUtils.bundle.getString("notAuthorized"), ref)); + StatusType status = setStatusType(false, + DSTConstants.NOT_AUTHORIZED, + IDPPUtils.bundle.getString("notAuthorized"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); if(LogUtil.isLogEnabled()) { String[] data = { resourceID }; LogUtil.error(Level.INFO,LogUtil.PP_MODIFY_FAILURE,data); @@ -573,9 +578,10 @@ public ModifyResponseElement processModifyRequest( LogUtil.error(Level.INFO, LogUtil.PP_INTERACTION_FAILURE,data); } - response.setStatus(setStatusType(false, - DSTConstants.NOT_AUTHORIZED, - IDPPUtils.bundle.getString("interactionFailed"), ref)); + StatusType status = setStatusType(false, + DSTConstants.NOT_AUTHORIZED, + IDPPUtils.bundle.getString("interactionFailed"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } } else { @@ -596,9 +602,10 @@ public ModifyResponseElement processModifyRequest( LogUtil.error(Level.INFO, LogUtil.PP_INTERACTION_FAILURE,data); } - response.setStatus(setStatusType(false, - DSTConstants.NOT_AUTHORIZED, - IDPPUtils.bundle.getString("interactionFailed"), ref)); + StatusType status = setStatusType(false, + DSTConstants.NOT_AUTHORIZED, + IDPPUtils.bundle.getString("interactionFailed"), ref); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); return response; } else { interactedData.putAll(intrData); @@ -609,7 +616,7 @@ public ModifyResponseElement processModifyRequest( } boolean override = modificationType.isOverrideAllowed(); - ModifyType.ModificationType.NewDataType newData = + ModifyType.Modification.NewData newData = modificationType.getNewData(); DSTModification dstModification = new DSTModification(); dstModification.setSelect(select); @@ -635,9 +642,10 @@ public ModifyResponseElement processModifyRequest( } return response; } else { - response.setStatus(setStatusType(false, - DSTConstants.UNEXPECTED_ERROR, - IDPPUtils.bundle.getString("modifyFailed"), null)); + StatusType status = setStatusType(false, + DSTConstants.UNEXPECTED_ERROR, + IDPPUtils.bundle.getString("modifyFailed"), null); + response.getValue().setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); if(LogUtil.isLogEnabled()) { String[] data = { logMsg }; @@ -675,18 +683,13 @@ public QueryResponseElement getQueryResponse(QueryElement query) throw new IDPPException( IDPPUtils.bundle.getString("nullInputParams")); } - try { - QueryResponseElement response = - IDPPUtils.getIDPPFactory().createQueryResponseElement(); - response.setStatus(setStatusType(true, DSTConstants.OK, null,null)); - response.setId(SAMLUtils.generateID()); - response.setItemIDRef(query.getItemID()); - return response; - } catch (JAXBException je) { - IDPPUtils.debug.error("PPRequestHandler:getQueryResponse:" + - "JAXB failure.", je); - throw new IDPPException(IDPPUtils.bundle.getString("jaxbFailure")); - } + QueryResponseType response = + IDPPUtils.getIDPPFactory().createQueryResponseType(); + StatusType status = setStatusType(true, DSTConstants.OK, null, null); + response.setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); + response.setId(SAMLUtils.generateID()); + response.setItemIDRef(query.getValue().getItemID()); + return IDPPUtils.getIDPPFactory().createQueryResponseElement(response); } @@ -704,18 +707,13 @@ public ModifyResponseElement getModifyResponse(ModifyElement modify) throw new IDPPException( IDPPUtils.bundle.getString("nullInputParams")); } - try { - ModifyResponseElement response = - IDPPUtils.getIDPPFactory().createModifyResponseElement(); - response.setStatus(setStatusType(true, DSTConstants.OK, null,null)); - response.setId(SAMLUtils.generateID()); - response.setItemIDRef(modify.getItemID()); - return response; - } catch (JAXBException je) { - IDPPUtils.debug.error("PPRequestHandler:getModifyResponse:" + - "JAXB failure.", je); - throw new IDPPException(IDPPUtils.bundle.getString("jaxbFailure")); - } + ResponseType response = + IDPPUtils.getIDPPFactory().createResponseType(); + StatusType status = setStatusType(true, DSTConstants.OK, null, null); + response.setStatus(IDPPUtils.getIDPPFactory().createStatusElement(status)); + response.setId(SAMLUtils.generateID()); + response.setItemIDRef(modify.getValue().getItemID()); + return IDPPUtils.getIDPPFactory().createModifyResponseElement(response); } @@ -762,11 +760,11 @@ private void initInteraction(boolean isQuery, Map interactResourceMap, try { //Create Interaction inquiry element InquiryElement inquiry = - JAXBObjectFactory.getObjectFactory().createInquiryElement(); - inquiry.setTitle(IDPPUtils.bundle.getString( + JAXBObjectFactory.getObjectFactory().createInquiryElement(JAXBObjectFactory.getObjectFactory().createInquiryType()); + inquiry.getValue().setTitle(IDPPUtils.bundle.getString( IDPPConstants.INTERACTION_TITLE)); - List selectElements = inquiry.getSelectOrConfirmOrText(); + List selectElements = inquiry.getValue().getSelectOrConfirmOrText(); Set inquirySelects = interactResourceMap.keySet(); Iterator iter = inquirySelects.iterator(); while(iter.hasNext()) { @@ -829,13 +827,13 @@ private Confirm getInteractConfirmElement( try { Confirm confirmElement = - JAXBObjectFactory.getObjectFactory().createInquiryTypeConfirm(); - PPInteractionHelper helper = + JAXBObjectFactory.getObjectFactory().createInquiryTypeConfirm(new InquiryElementType() {}); + PPInteractionHelper helper = new PPInteractionHelper(getLanguage(msg)); - confirmElement.setName(resource); - confirmElement.setLabel( + confirmElement.getValue().setName(resource); + confirmElement.getValue().setLabel( helper.getInteractForConsentQuestion(isQuery, resource)); - confirmElement.setHint( + confirmElement.getValue().setHint( helper.getInteractForConsentQuestion(isQuery, resource)); return confirmElement; @@ -882,11 +880,12 @@ private List getInteractTextElements( while(iter.hasNext()) { String resourceKey = (String)iter.next(); TextElement textElement = - JAXBObjectFactory.getObjectFactory().createTextElement(); - textElement.setName(resourceKey); - textElement.setLabel((String)interactQueries.get(resourceKey)); - textElement.setMinChars(helper.getTextMinChars(resourceKey)); - textElement.setMaxChars(helper.getTextMaxChars(resourceKey)); + JAXBObjectFactory.getObjectFactory().createTextElement( + JAXBObjectFactory.getObjectFactory().createTextType()); + textElement.getValue().setName(resourceKey); + textElement.getValue().setLabel((String)interactQueries.get(resourceKey)); + textElement.getValue().setMinChars(helper.getTextMinChars(resourceKey)); + textElement.getValue().setMaxChars(helper.getTextMaxChars(resourceKey)); textElements.add(textElement); } return textElements; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PersonalProfile.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PersonalProfile.java index 8429f0116a..155b968076 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PersonalProfile.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PersonalProfile.java @@ -25,6 +25,7 @@ * $Id: PersonalProfile.java,v 1.2 2008/06/25 05:47:14 qcheng Exp $ * * Portions Copyrighted 2014-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ @@ -39,7 +40,7 @@ import java.util.StringTokenizer; import java.util.Iterator; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.w3c.dom.Node; import org.w3c.dom.Document; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/common/IDPPUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/common/IDPPUtils.java index dab1164e2a..13ea242e7e 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/common/IDPPUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/common/IDPPUtils.java @@ -28,6 +28,7 @@ /** * Portions Copyrighted 2012 ForgeRock Inc + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.liberty.ws.idpp.common; @@ -40,6 +41,8 @@ import java.util.HashMap; import java.util.Iterator; import java.security.SecureRandom; + +import com.sun.identity.liberty.ws.disco.jaxb.ResourceIDType; import com.sun.identity.shared.debug.Debug; import com.sun.identity.shared.locale.Locale; import com.sun.identity.shared.encode.Base64; @@ -57,11 +60,11 @@ import com.sun.identity.plugin.datastore.DataStoreProviderManager; import com.sun.identity.saml.common.SAMLUtils; import com.sun.identity.shared.xml.XMLUtils; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.parsers.DocumentBuilder; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; import javax.xml.parsers.ParserConfigurationException; /** @@ -187,23 +190,23 @@ public static QueryElement createQueryElement(List queryExpressions, String resourceID, boolean includeCommonAttr) throws JAXBException, IDPPException { - QueryElement query = idppFactory.createQueryElement(); + QueryElement query = idppFactory.createQueryElement(idppFactory.createQueryType()); if(queryExpressions == null || resourceID == null || queryExpressions.size() == 0) { debug.error("IDPPUtils:createQueryElement: Either query" + " expressions or resource id is null."); throw new IDPPException("ResourceID or query expressions are null"); } - query.setResourceID(createResourceIDElement(resourceID)); - query.setId(SAMLUtils.generateID()); + query.getValue().setResourceID(createResourceIDElement(resourceID)); + query.getValue().setId(SAMLUtils.generateID()); for (int i =0; i < queryExpressions.size(); i++) { - QueryType.QueryItemType item = - idppFactory.createQueryTypeQueryItemType(); + QueryType.QueryItem item = + idppFactory.createQueryTypeQueryItem(); item.setId(SAMLUtils.generateID()); item.setIncludeCommonAttributes(includeCommonAttr); item.setItemID(SAMLUtils.generateID()); item.setSelect(addIDPPPrefix((String)queryExpressions.get(i))); - query.getQueryItem().add(item); + query.getValue().getQueryItem().add(item); } return query; } @@ -219,7 +222,7 @@ public static List getQueryDataElements(QueryResponseElement response) debug.error("IDPPUtils:getQueryDataElements:response is null"); throw new IDPPException("response is null"); } - return response.getData(); + return response.getValue().getData(); } /** @@ -234,8 +237,8 @@ public static ResourceIDElement createResourceIDElement (String resourceID) throw new IDPPException("ResourceID is null"); } ResourceIDElement resourceIDElement = - idppFactory.createResourceIDElement(); - resourceIDElement.setValue(resourceID); + idppFactory.createResourceIDElement(new ResourceIDType()); + resourceIDElement.getValue().setValue(resourceID); return resourceIDElement; } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java index 22517105fc..eb23d28696 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPAddressCard.java,v 1.2 2008/06/25 05:47:15 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Iterator; @@ -70,7 +72,7 @@ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPAddressCard:getContainerObject:Init"); try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); Set addressCards = (Set)userMap.get( getAttributeMapper().getDSAttribute( @@ -116,7 +118,8 @@ private AddressCardElement parseEntry(String entry, Map userMap) } AddressCardElement ace = - IDPPUtils.getIDPPFactory().createAddressCardElement(); + IDPPUtils.getIDPPFactory().createAddressCardElement( + IDPPUtils.getIDPPFactory().createAddressCardType()); StringTokenizer st = new StringTokenizer(entry, IDPPConstants.ATTRIBUTE_SEPARATOR); @@ -182,18 +185,18 @@ private AddressCardElement parseEntry(String entry, Map userMap) return null; } - AddressType ae = IDPPUtils.getIDPPFactory().createAddressElement(); + AddressType ae = IDPPUtils.getIDPPFactory().createAddressType(); ae.setC(getDSTString(country)); ae.setSt(getDSTString(state)); ae.setL(getDSTString(city)); ae.setPostalAddress(getDSTString(postalAddress)); ae.setPostalCode(getDSTString(postalCode)); - ace.setNick(getDSTString(nick)); - ace.getAddrType().add(getDSTURI(addrType)); - ace.setAddress(ae); - ace.setLComment(getDSTString(lComment)); - ace.setId(id); + ace.getValue().setNick(getDSTString(nick)); + ace.getValue().getAddrType().add(getDSTURI(addrType)); + ace.getValue().setAddress(IDPPUtils.getIDPPFactory().createAddressElement(ae)); + ace.getValue().setLComment(getDSTString(lComment)); + ace.getValue().setId(id); return ace; } @@ -305,7 +308,7 @@ private Map getDataMap(String expContext, Object dataElement) } else if(dataElement instanceof AddressCardElement) { AddressCardElement addr = (AddressCardElement)dataElement; if(addressType == null || addressType.length() == 0) { - List list = addr.getAddrType(); + List list = addr.getValue().getAddrType(); if(list != null && list.size() != 0) { DSTURI addressURI = (DSTURI)list.get(0); addressType = addressURI.getValue(); @@ -419,7 +422,7 @@ private String createAddressCard(AddressCardElement ace, StringBuffer sb = new StringBuffer(); sb.append("AddrType").append("=").append(addressType).append("|"); - AddressType ae = ace.getAddress(); + AddressType ae = ace.getValue().getAddress().getValue(); if(ae == null) { IDPPUtils.debug.error("IDPPAddressContainer.createAddressCard:" + "Address Element is null"); @@ -431,12 +434,12 @@ private String createAddressCard(AddressCardElement ace, sb.append(address); } - DSTString nickName = ace.getNick(); + DSTString nickName = ace.getValue().getNick(); if(nickName != null) { sb.append("Nick=").append(nickName.getValue()).append("|"); } - DSTString comment = ace.getLComment(); + DSTString comment = ace.getValue().getLComment(); if(comment != null) { sb.append("LComment=").append(comment.getValue()); } @@ -494,7 +497,7 @@ private String modifyAddress(String entry, AddressElement ae) { if(ae == null) { continue; } - DSTString postalAddress = ae.getPostalAddress(); + DSTString postalAddress = ae.getValue().getPostalAddress(); if(postalAddress != null) { sb.append("PostalAddress") .append("=").append(postalAddress.getValue()).append("|"); @@ -505,7 +508,7 @@ private String modifyAddress(String entry, AddressElement ae) { if(ae == null) { continue; } - DSTString postalCode = ae.getPostalCode(); + DSTString postalCode = ae.getValue().getPostalCode(); if(postalCode != null) { sb.append("PostalCode") .append("=").append(postalCode.getValue()).append("|"); @@ -516,7 +519,7 @@ private String modifyAddress(String entry, AddressElement ae) { if(ae == null) { continue; } - DSTString city = ae.getL(); + DSTString city = ae.getValue().getL(); if(city != null) { sb.append("L") .append("=").append(city.getValue()).append("|"); @@ -527,7 +530,7 @@ private String modifyAddress(String entry, AddressElement ae) { if(ae == null) { continue; } - DSTString state = ae.getSt(); + DSTString state = ae.getValue().getSt(); if(state != null) { sb.append("St") .append("=").append(state.getValue()).append("|"); @@ -539,7 +542,7 @@ private String modifyAddress(String entry, AddressElement ae) { if(ae == null) { continue; } - DSTString country = ae.getC(); + DSTString country = ae.getValue().getC(); if(country != null) { sb.append("C") .append("=").append(country.getValue()).append("|"); @@ -561,7 +564,7 @@ private String modifyAddressCard(String entry, AddressCardElement ace) { StringBuffer sb = new StringBuffer(100); - AddressElement ae = (AddressElement)ace.getAddress(); + AddressElement ae = ace.getValue().getAddress(); String address = modifyAddress(entry, ae); StringTokenizer st = new StringTokenizer(address, "|"); @@ -569,7 +572,7 @@ private String modifyAddressCard(String entry, AddressCardElement ace) { String token = st.nextToken(); if(token.startsWith("Nick")) { - DSTString nick = ace.getNick(); + DSTString nick = ace.getValue().getNick(); if(nick != null) { sb.append("Nick") .append("=").append(nick.getValue()).append("|"); @@ -577,7 +580,7 @@ private String modifyAddressCard(String entry, AddressCardElement ace) { sb.append(token).append("|"); } } else if(token.startsWith("LComment")) { - DSTString lComment = ace.getLComment(); + DSTString lComment = ace.getValue().getLComment(); if(lComment != null) { sb.append("LComment") .append("=").append(lComment.getValue()).append("|"); @@ -585,7 +588,7 @@ private String modifyAddressCard(String entry, AddressCardElement ace) { sb.append(token).append("|"); } } else if(token.startsWith("id")) { - String id = ace.getId(); + String id = ace.getValue().getId(); if(id != null) { sb.append("id").append("=").append(id).append("|"); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java index 1152d54029..fd2c9ca20d 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java @@ -25,6 +25,7 @@ * $Id: IDPPBaseContainer.java,v 1.2 2008/06/25 05:47:15 qcheng Exp $ * * Portions Copyrighted 2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.liberty.ws.idpp.container; @@ -32,7 +33,9 @@ import static org.forgerock.openam.utils.Time.*; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import java.util.Set; import java.util.HashSet; import java.util.Map; @@ -43,6 +46,8 @@ import java.util.Iterator; import java.lang.NumberFormatException; import java.math.BigInteger; + +import org.w3._2001.xmlschema.Adapter1; import org.w3c.dom.Document; import com.sun.identity.liberty.ws.idpp.common.*; import com.sun.identity.liberty.ws.idpp.jaxb.*; @@ -142,7 +147,7 @@ protected Map getAttributeMap(String attr, Object obj, Map map) { value = uri.getValue(); } else if (obj instanceof DSTDate) { DSTDate date = (DSTDate)obj; - Calendar cal = date.getValue(); + Calendar cal = date.getValue().toGregorianCalendar(); if(cal != null) { value = DateFormat.getDateInstance().format(cal.getTime()); } @@ -153,7 +158,7 @@ protected Map getAttributeMap(String attr, Object obj, Map map) { } else if (obj instanceof DSTMonthDay) { DSTMonthDay dstMon = (DSTMonthDay)obj; - value = dstMon.getValue(); + value = dstMon.getValue().toXMLFormat(); } if(value != null) { @@ -202,14 +207,9 @@ protected DSTString getDSTString(String value) { IDPPUtils.debug.message("IDPPBaseContainer:getDSTString:null vals"); return null; } - try { - DSTString dstString = IDPPUtils.getIDPPFactory().createDSTString(); - dstString.setValue(value); - return dstString; - } catch (JAXBException je) { - IDPPUtils.debug.error("IDPPBaseContainer:getDSTString:jaxbFail",je); - return null; - } + DSTString dstString = IDPPUtils.getIDPPFactory().createDSTString(); + dstString.setValue(value); + return dstString; } /** @@ -226,8 +226,7 @@ protected DSTDate getDSTDate(String value) { DSTDate dstDate = IDPPUtils.getIDPPFactory().createDSTDate(); Date date = DateFormat.getDateInstance(DateFormat.MEDIUM).parse(value); - Calendar cal = getCalendarInstance(); - cal.setTime(date); + XMLGregorianCalendar cal = getXMLGregorianCalendarInstance(date); dstDate.setValue(cal); return dstDate; } catch(Exception e) { @@ -247,9 +246,10 @@ protected DSTMonthDay getDSTMonthDay(String value) { return null; } try { - DSTMonthDay dstMonthDay = + DSTMonthDay dstMonthDay = IDPPUtils.getIDPPFactory().createDSTMonthDay(); - dstMonthDay.setValue(value); + XMLGregorianCalendar cal = DatatypeFactory.newInstance().newXMLGregorianCalendar(value); + dstMonthDay.setValue(cal); return dstMonthDay; } catch(Exception e) { IDPPUtils.debug.error("IDPPBaseContainer:getDSTMonthDay: " + @@ -269,15 +269,25 @@ protected DSTURI getDSTURI(String value) { IDPPUtils.debug.message("IDPPBaseContainer:getDSTURI:null vals"); return null; } - try { - DSTURI dstURI = IDPPUtils.getIDPPFactory().createDSTURI(); - dstURI.setValue(value); - return dstURI; - } catch(JAXBException je) { - IDPPUtils.debug.error("IDPPBaseContainer:getDSTURI: Exception", je); + DSTURI dstURI = IDPPUtils.getIDPPFactory().createDSTURI(); + dstURI.setValue(value); + return dstURI; + } + + /** + * Gets a JAXB DSTURI object. + * @param value a String representing the value. + * @return DSTURI JAXB object. + */ + protected MsgTechnologyElement getMsgTechnology(String value) { + if(value == null) { + IDPPUtils.debug.message("IDPPBaseContainer:getDSTURI:null vals"); return null; } - } + MsgTechnologyElement dstURI = IDPPUtils.getIDPPFactory().createMsgTechnologyElement(); + dstURI.setValue(value); + return dstURI; + } /** * Gets a JAXB DSTInteger object. @@ -294,9 +304,6 @@ protected DSTInteger getDSTInteger(String value) { IDPPUtils.getIDPPFactory().createDSTInteger(); dstInteger.setValue(new BigInteger(value)); return dstInteger; - } catch(JAXBException je) { - IDPPUtils.debug.error("IDPPBaseContainer:getDSTInteger:Error", je); - return null; } catch(NumberFormatException nfe) { IDPPUtils.debug.error("IDPPBaseContainer:getDSTInteger: " + "Invalid number", nfe); @@ -315,50 +322,43 @@ protected AnalyzedNameType getAnalyzedName(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPContainers:getAnalyzedName:Init"); AnalyzedNameType analyzedName = null; - try { - analyzedName = IDPPUtils.getIDPPFactory().createAnalyzedNameType(); - - String value = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.SN_ELEMENT).toLowerCase()); - if(value != null) { - analyzedName.setSN(getDSTString(value)); - } - - value = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.FN_ELEMENT).toLowerCase()); - if(value != null) { - analyzedName.setFN(getDSTString(value)); - } - - value = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.PT_ELEMENT).toLowerCase()); - if(value != null) { - analyzedName.setPersonalTitle(getDSTString(value)); - } - - value = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.MN_ELEMENT).toLowerCase()); - - String nameScheme = - IDPPServiceManager.getInstance().getNameScheme(); - if(nameScheme != null) { - analyzedName.setNameScheme(nameScheme); - } - if(nameScheme != null && nameScheme.equals( - IDPPConstants.NAME_SCHEME_MIDDLE) && value != null) { - analyzedName.setMN(getDSTString(value)); - } - return analyzedName; - } catch (JAXBException je) { - IDPPUtils.debug.error("IDPPContainers:getAnalyzedName: " + - "JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + analyzedName = IDPPUtils.getIDPPFactory().createAnalyzedNameType(); + + String value = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.SN_ELEMENT).toLowerCase()); + if(value != null) { + analyzedName.setSN(IDPPUtils.getIDPPFactory().createSNElement(getDSTString(value))); + } + + value = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.FN_ELEMENT).toLowerCase()); + if(value != null) { + analyzedName.setFN(IDPPUtils.getIDPPFactory().createFNElement(getDSTString(value))); + } + + value = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.PT_ELEMENT).toLowerCase()); + if(value != null) { + analyzedName.setPersonalTitle(IDPPUtils.getIDPPFactory().createPersonalTitleElement(getDSTString(value))); + } + + value = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.MN_ELEMENT).toLowerCase()); + + String nameScheme = + IDPPServiceManager.getInstance().getNameScheme(); + if(nameScheme != null) { + analyzedName.setNameScheme(nameScheme); + } + if(nameScheme != null && nameScheme.equals( + IDPPConstants.NAME_SCHEME_MIDDLE) && value != null) { + analyzedName.setMN(IDPPUtils.getIDPPFactory().createMNElement(getDSTString(value))); + } + return analyzedName; } /** @@ -421,10 +421,10 @@ protected Map getAnalyzedNameMap(Object obj, Map map) throws IDPPException{ if(obj != null) { if(obj instanceof AnalyzedNameType) { AnalyzedNameType analyzedName = (AnalyzedNameType)obj; - fn = analyzedName.getFN(); - sn = analyzedName.getSN(); - mn = analyzedName.getMN(); - pt = analyzedName.getPersonalTitle(); + fn = analyzedName.getFN().getValue(); + sn = analyzedName.getSN().getValue(); + mn = analyzedName.getMN().getValue(); + pt = analyzedName.getPersonalTitle().getValue(); } else { throw new IDPPException( IDPPUtils.bundle.getString("invalid Element")); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java index d48fdffb7f..b0d4026bb2 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPCommonName.java,v 1.2 2008/06/25 05:47:15 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Iterator; @@ -67,9 +69,10 @@ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPContainers:getContainerObject:Init"); try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); CommonNameElement ce = - IDPPUtils.getIDPPFactory().createCommonNameElement(); + IDPPUtils.getIDPPFactory().createCommonNameElement( + IDPPUtils.getIDPPFactory().createCommonNameType()); String cn = CollectionHelper.getMapAttr( userMap, getAttributeMapper().getDSAttribute( @@ -77,7 +80,7 @@ userMap, getAttributeMapper().getDSAttribute( if(cn != null) { DSTString dstString = getDSTString(cn); - ce.setCN(dstString); + ce.getValue().setCN(IDPPUtils.getIDPPFactory().createCNElement(dstString)); } Set altCNs = (Set)userMap.get(getAttributeMapper().getDSAttribute( @@ -86,20 +89,15 @@ userMap, getAttributeMapper().getDSAttribute( Iterator iter = altCNs.iterator(); while(iter.hasNext()) { DSTString dstString = getDSTString((String)iter.next()); - ce.getAltCN().add(dstString); + ce.getValue().getAltCN().add(dstString); } } AnalyzedNameType analyzedName = getAnalyzedName(userMap); - ce.setAnalyzedName(analyzedName); + ce.getValue().setAnalyzedName(analyzedName); ppType.setCommonName(ce); return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPContainers:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); } catch (IDPPException ie) { IDPPUtils.debug.error("IDPPContainers:getContainerObject:" + "Error while creating common name.", ie); @@ -266,7 +264,7 @@ private Map getCommonNameMap(Object obj, Map map) if(obj instanceof CommonNameType) { CommonNameType cnType = (CommonNameType)obj; analyzedName = cnType.getAnalyzedName(); - cn = cnType.getCN(); + cn = cnType.getCN().getValue(); altCNs = cnType.getAltCN(); } else { throw new IDPPException( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java index 66b776fd64..6641b155fb 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPDemographics.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Iterator; @@ -67,57 +69,54 @@ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPDemographics:getContainerObject:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - DemographicsElement de = - IDPPUtils.getIDPPFactory().createDemographicsElement(); - - String displayLang = CollectionHelper.getMapAttr(userMap, - getAttributeMapper().getDSAttribute( - IDPPConstants.DEMO_GRAPHICS_DISPLAY_LANG_ELEMENT).toLowerCase()); - - if(displayLang != null) { - de.setDisplayLanguage(getDSTString(displayLang)); - } - - Set languages = (Set)userMap.get( - getAttributeMapper().getDSAttribute( - IDPPConstants.DEMO_GRAPHICS_LANGUAGE_ELEMENT).toLowerCase()); - Iterator iter = languages.iterator(); - while(iter.hasNext()) { - de.getLanguage().add(getDSTString((String)iter.next())); - } - - String birthDay = CollectionHelper.getMapAttr(userMap, - getAttributeMapper().getDSAttribute( - IDPPConstants.DEMO_GRAPHICS_BIRTH_DAY_ELEMENT).toLowerCase()); - if(birthDay != null) { - de.setBirthday(getDSTMonthDay(birthDay)); - } - - String age = CollectionHelper.getMapAttr(userMap, - getAttributeMapper().getDSAttribute( - IDPPConstants.DEMO_GRAPHICS_AGE_ELEMENT).toLowerCase()); - if(age != null) { - de.setAge(getDSTInteger(age)); - } - - String timeZone = CollectionHelper.getMapAttr(userMap, - getAttributeMapper().getDSAttribute( - IDPPConstants.DEMO_GRAPHICS_TIME_ZONE_ELEMENT).toLowerCase()); - if(timeZone != null) { - de.setTimeZone(getDSTString(timeZone)); - } - - ppType.setDemographics(de); - - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPDemographics:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + DemographicsElement de = + IDPPUtils.getIDPPFactory().createDemographicsElement( + IDPPUtils.getIDPPFactory().createDemographicsType()); + + String displayLang = CollectionHelper.getMapAttr(userMap, + getAttributeMapper().getDSAttribute( + IDPPConstants.DEMO_GRAPHICS_DISPLAY_LANG_ELEMENT).toLowerCase()); + + if(displayLang != null) { + de.getValue().setDisplayLanguage( + IDPPUtils.getIDPPFactory().createDisplayLanguageElement(getDSTString(displayLang))); + } + + Set languages = (Set)userMap.get( + getAttributeMapper().getDSAttribute( + IDPPConstants.DEMO_GRAPHICS_LANGUAGE_ELEMENT).toLowerCase()); + Iterator iter = languages.iterator(); + while(iter.hasNext()) { + de.getValue().getLanguage().add( + IDPPUtils.getIDPPFactory().createLanguageElement(getDSTString((String)iter.next()))); + } + + String birthDay = CollectionHelper.getMapAttr(userMap, + getAttributeMapper().getDSAttribute( + IDPPConstants.DEMO_GRAPHICS_BIRTH_DAY_ELEMENT).toLowerCase()); + if(birthDay != null) { + de.getValue().setBirthday( + IDPPUtils.getIDPPFactory().createBirthdayElement(getDSTMonthDay(birthDay))); } + + String age = CollectionHelper.getMapAttr(userMap, + getAttributeMapper().getDSAttribute( + IDPPConstants.DEMO_GRAPHICS_AGE_ELEMENT).toLowerCase()); + if(age != null) { + de.getValue().setAge(IDPPUtils.getIDPPFactory().createAgeElement(getDSTInteger(age))); + } + + String timeZone = CollectionHelper.getMapAttr(userMap, + getAttributeMapper().getDSAttribute( + IDPPConstants.DEMO_GRAPHICS_TIME_ZONE_ELEMENT).toLowerCase()); + if(timeZone != null) { + de.getValue().setTimeZone(getDSTString(timeZone)); + } + + ppType.setDemographics(de); + + return ppType; } /** @@ -271,15 +270,15 @@ private Map getDemographicsMap(Object obj, Map map) DSTString displayLang = null; DSTInteger age = null; DSTMonthDay birthDay = null; - List languages = null; + List languages = null; DSTString timeZone = null; if(obj != null) { if(obj instanceof DemographicsType) { DemographicsType demoGraphs = (DemographicsType)obj; - displayLang = demoGraphs.getDisplayLanguage(); - age = demoGraphs.getAge(); - birthDay = demoGraphs.getBirthday(); + displayLang = demoGraphs.getDisplayLanguage().getValue(); + age = demoGraphs.getAge().getValue(); + birthDay = demoGraphs.getBirthday().getValue(); languages = demoGraphs.getLanguage(); timeZone = demoGraphs.getTimeZone(); } else { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmergencyContact.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmergencyContact.java index 8b0ef8ebdf..e034e1db53 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmergencyContact.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmergencyContact.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPEmergencyContact.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Map; @@ -63,22 +65,20 @@ public IDPPEmergencyContact() { */ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPEmergencyContact:getContainerObject:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - EmergencyContactElement ec = - IDPPUtils.getIDPPFactory().createEmergencyContactElement(); - String emergencyContact = CollectionHelper.getMapAttr(userMap, - getAttributeMapper().getDSAttribute( - IDPPConstants.EMERGENCY_CONTACT_ELEMENT).toLowerCase()); - ec.setValue(emergencyContact); - ppType.setEmergencyContact(ec); - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPEmergencyContact:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + EmergencyContactElement ec = + IDPPUtils.getIDPPFactory().createEmergencyContactElement( + IDPPUtils.getIDPPFactory().createDSTString() + ); + String emergencyContact = CollectionHelper.getMapAttr(userMap, + getAttributeMapper().getDSAttribute( + IDPPConstants.EMERGENCY_CONTACT_ELEMENT).toLowerCase()); + DSTString emergencyContactDstString = IDPPUtils.getIDPPFactory().createDSTString(); + emergencyContactDstString.setValue(emergencyContact); + + ec.setValue(emergencyContactDstString); + ppType.setEmergencyContact(ec); + return ppType; } /** diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java index f9cb926c79..2e7358011b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPEmploymentIdentity.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Iterator; @@ -63,42 +65,37 @@ public IDPPEmploymentIdentity() { */ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPEmploymentIdentity:getContainerObj:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - EmploymentIdentityElement ei = - IDPPUtils.getIDPPFactory().createEmploymentIdentityElement(); - String jobTitle = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.JOB_TITLE_ELEMENT).toLowerCase()); - if(jobTitle != null) { - DSTString dstString = getDSTString(jobTitle); - ei.setJobTitle(dstString); - } - - String org = CollectionHelper.getMapAttr(userMap, - getAttributeMapper().getDSAttribute( - IDPPConstants.O_ELEMENT).toLowerCase()); - if(org != null) { - DSTString dstString = getDSTString(org); - ei.setO(dstString); - } - - Set altOs = (Set)userMap.get( - getAttributeMapper().getDSAttribute( - IDPPConstants.ALT_O_ELEMENT).toLowerCase()); - Iterator iter = altOs.iterator(); - while(iter.hasNext()) { - DSTString dstString = getDSTString((String)iter.next()); - ei.getAltO().add(dstString); - } - ppType.setEmploymentIdentity(ei); - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPContainers:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + EmploymentIdentityElement ei = + IDPPUtils.getIDPPFactory().createEmploymentIdentityElement( + IDPPUtils.getIDPPFactory().createEmploymentIdentityType() + ); + String jobTitle = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.JOB_TITLE_ELEMENT).toLowerCase()); + if(jobTitle != null) { + DSTString dstString = getDSTString(jobTitle); + ei.getValue().setJobTitle(IDPPUtils.getIDPPFactory().createJobTitleElement(dstString)); + } + + String org = CollectionHelper.getMapAttr(userMap, + getAttributeMapper().getDSAttribute( + IDPPConstants.O_ELEMENT).toLowerCase()); + if(org != null) { + DSTString dstString = getDSTString(org); + ei.getValue().setO(IDPPUtils.getIDPPFactory().createOElement(dstString)); + } + + Set altOs = (Set)userMap.get( + getAttributeMapper().getDSAttribute( + IDPPConstants.ALT_O_ELEMENT).toLowerCase()); + Iterator iter = altOs.iterator(); + while(iter.hasNext()) { + DSTString dstString = getDSTString((String)iter.next()); + ei.getValue().getAltO().add(dstString); } + ppType.setEmploymentIdentity(ei); + return ppType; } /** @@ -211,8 +208,8 @@ private Map getEmploymentIdentityMap(Object obj, Map map) if(obj != null) { if(obj instanceof EmploymentIdentityType) { EmploymentIdentityType eiType = (EmploymentIdentityType)obj; - jobTitle = eiType.getJobTitle(); - org = eiType.getO(); + jobTitle = eiType.getJobTitle().getValue(); + org = eiType.getO().getValue(); altO = eiType.getAltO(); } else { throw new IDPPException( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEncryptKey.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEncryptKey.java index d53d7208c2..89107f6349 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEncryptKey.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEncryptKey.java @@ -23,22 +23,22 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPEncryptKey.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; -import javax.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Map; import java.util.HashMap; import java.util.List; import java.util.Iterator; -import org.w3c.dom.Document; + import com.sun.identity.liberty.ws.idpp.common.*; import com.sun.identity.liberty.ws.idpp.jaxb.*; -import com.sun.identity.liberty.ws.idpp.plugin.*; /** @@ -63,39 +63,34 @@ public IDPPEncryptKey() { */ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPEncryptKey:getContainerObject:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - EncryptKeyElement encryptKey = - IDPPUtils.getIDPPFactory().createEncryptKeyElement(); - byte[][] certBytes = (byte[][]) userMap.get( - getAttributeMapper().getDSAttribute( - IDPPConstants.ENCRYPT_KEY_ELEMENT).toLowerCase()); - - if(certBytes != null) { - com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectFactory of = - new com.sun.identity.liberty.ws.common.jaxb.xmlsig. - ObjectFactory(); - - com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType - x509DataType = of.createX509DataElement(); - - com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType. - X509Certificate cert = of.createX509DataTypeX509Certificate( - certBytes[0]); - - x509DataType. - getX509IssuerSerialOrX509SKIOrX509SubjectName().add(cert); - encryptKey.getContent().add(x509DataType); - } - - ppType.setEncryptKey(encryptKey); - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPEncryptKey:getEncryptKey: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + EncryptKeyElement encryptKey = + IDPPUtils.getIDPPFactory().createEncryptKeyElement( + IDPPUtils.getIDPPFactory().createKeyInfoType() + ); + byte[][] certBytes = (byte[][]) userMap.get( + getAttributeMapper().getDSAttribute( + IDPPConstants.ENCRYPT_KEY_ELEMENT).toLowerCase()); + + if(certBytes != null) { + com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectFactory of = + new com.sun.identity.liberty.ws.common.jaxb.xmlsig. + ObjectFactory(); + + com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType + x509DataType = of.createX509DataType(); + + com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType. + X509Certificate cert = of.createX509DataTypeX509Certificate( + certBytes[0]); + + x509DataType. + getX509IssuerSerialOrX509SKIOrX509SubjectName().add(cert); + encryptKey.getValue().getContent().add(x509DataType); + } + + ppType.setEncryptKey(encryptKey); + return ppType; } /** @@ -145,7 +140,7 @@ public Map getDataMapForSelect(String select, List data) if(dataElement instanceof EncryptKeyElement) { byte[] certBytes = null; EncryptKeyElement encryptKey = (EncryptKeyElement)dataElement; - List contents = encryptKey.getContent(); + List contents = encryptKey.getValue().getContent(); if(contents == null || contents.size() == 0) { map.put(getAttributeMapper().getDSAttribute( @@ -162,8 +157,8 @@ public Map getDataMapForSelect(String select, List data) com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataElement x509Data = (com.sun.identity.liberty.ws.common.jaxb. xmlsig.X509DataElement)obj; - List certs = - x509Data.getX509IssuerSerialOrX509SKIOrX509SubjectName(); + List certs = + x509Data.getValue().getX509IssuerSerialOrX509SKIOrX509SubjectName(); if(certs == null || certs.size() == 0) { IDPPUtils.debug.error("IDPPEncryptKey.getDataMapForSelect:" + diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPExtensionContainer.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPExtensionContainer.java index 9767a3f74f..3ae2b9846d 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPExtensionContainer.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPExtensionContainer.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPExtensionContainer.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Map; @@ -68,42 +70,37 @@ public IDPPExtensionContainer() { */ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPContainers:getContainerObject:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - ExtensionElement ee = - IDPPUtils.getIDPPFactory().createExtensionElement(); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + ExtensionElement ee = + IDPPUtils.getIDPPFactory().createExtensionElement( + IDPPUtils.getIDPPFactory().createExtensionType() + ); + + IDPPExtension extension = getExtensionContainerClass(); + if(extension != null) { + ee.getValue().getAny().addAll(extension.getExtAttributes()); + ppType.setExtension(ee); + return ppType; + } - IDPPExtension extension = getExtensionContainerClass(); - if(extension != null) { - ee.getAny().addAll(extension.getExtAttributes()); - ppType.setExtension(ee); - return ppType; - } + Set extensionAttributes = getExtensionContainerAttributes(); + if(extensionAttributes == null || extensionAttributes.isEmpty()) { + ppType.setExtension(ee); + return ppType; + } - Set extensionAttributes = getExtensionContainerAttributes(); - if(extensionAttributes == null || extensionAttributes.isEmpty()) { - ppType.setExtension(ee); - return ppType; - } - - Iterator iter = extensionAttributes.iterator(); - while(iter.hasNext()) { - String extName = (String)iter.next(); - String extValue = CollectionHelper.getMapAttr(userMap, - getAttributeMapper().getDSAttribute(extName).toLowerCase()); - if(extValue != null) { - ee.getAny().add(getISExtension(extName, extValue)); - } + Iterator iter = extensionAttributes.iterator(); + while(iter.hasNext()) { + String extName = (String)iter.next(); + String extValue = CollectionHelper.getMapAttr(userMap, + getAttributeMapper().getDSAttribute(extName).toLowerCase()); + if(extValue != null) { + ee.getValue().getAny().add(getISExtension(extName, extValue)); } + } - ppType.setExtension(ee); - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPExtensionContainer:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + ppType.setExtension(ee); + return ppType; } /** @@ -236,18 +233,12 @@ public Map getDataMapForSelect(String select, List data) private PPISExtensionElement getISExtension( String attrName, String attrValue) throws IDPPException { IDPPUtils.debug.message("IDPPExtensionContainer.getISExtension:Init"); - try { - com.sun.identity.liberty.ws.idpp.plugin.jaxb.ObjectFactory fac = - new com.sun.identity.liberty.ws.idpp.plugin.jaxb.ObjectFactory(); - PPISExtensionElement ext = fac.createPPISExtensionElement(); - ext.setName(attrName); - ext.setValue(attrValue); - return ext; - } catch (JAXBException je) { - IDPPUtils.debug.error("IDPPExtensionContainer.getISExtension:" + - "Fails in creating PP Extension element.", je); - throw new IDPPException(IDPPUtils.bundle.getString("jaxbFailure")); - } + com.sun.identity.liberty.ws.idpp.plugin.jaxb.ObjectFactory fac = + new com.sun.identity.liberty.ws.idpp.plugin.jaxb.ObjectFactory(); + PPISExtensionElement ext = fac.createPPISExtensionElement(); + ext.setName(attrName); + ext.setValue(attrValue); + return ext; } /** diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java index 3e2c2c3d16..8778811418 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPFacade.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Iterator; @@ -66,55 +68,54 @@ public IDPPFacade() { public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPFacade:getContainerObject:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - FacadeElement fe = - IDPPUtils.getIDPPFactory().createFacadeElement(); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + FacadeElement fe = + IDPPUtils.getIDPPFactory().createFacadeElement( + IDPPUtils.getIDPPFactory().createFacadeType() + ); - String mugShot = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.MUGSHOT_ELEMENT).toLowerCase()); + String mugShot = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.MUGSHOT_ELEMENT).toLowerCase()); - if(mugShot != null) { - fe.setMugShot(getDSTURI(mugShot)); - } - - String webSite = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.WEBSITE_ELEMENT).toLowerCase()); - if(webSite != null) { - fe.setWebSite(getDSTURI(webSite)); - } + if(mugShot != null) { + fe.getValue().setMugShot( + IDPPUtils.getIDPPFactory().createMugShotElement(getDSTURI(mugShot))); + } - String namePronounced = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.NAME_PRONOUNCED_ELEMENT).toLowerCase()); - if(namePronounced != null) { - fe.setNamePronounced(getDSTURI(namePronounced)); - } + String webSite = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.WEBSITE_ELEMENT).toLowerCase()); + if(webSite != null) { + fe.getValue().setWebSite( + IDPPUtils.getIDPPFactory().createWebSiteElement(getDSTURI(webSite))); + } - String greetSound = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.GREET_SOUND_ELEMENT).toLowerCase()); - if(greetSound != null) { - fe.setGreetSound(getDSTURI(greetSound)); - } + String namePronounced = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.NAME_PRONOUNCED_ELEMENT).toLowerCase()); + if(namePronounced != null) { + fe.getValue().setNamePronounced(IDPPUtils.getIDPPFactory().createNamePronouncedElement(getDSTURI(namePronounced))); + } - String greetMeSound = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.GREET_ME_SOUND_ELEMENT).toLowerCase()); - if(greetMeSound != null) { - fe.setGreetMeSound(getDSTURI(greetMeSound)); - } - ppType.setFacade(fe); + String greetSound = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.GREET_SOUND_ELEMENT).toLowerCase()); + if(greetSound != null) { + fe.getValue().setGreetSound(IDPPUtils.getIDPPFactory().createGreetSoundElement(getDSTURI(greetSound))); + } - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPFacade:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); + String greetMeSound = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.GREET_ME_SOUND_ELEMENT).toLowerCase()); + if(greetMeSound != null) { + fe.getValue().setGreetMeSound( + IDPPUtils.getIDPPFactory().createGreetMeSoundElement(getDSTURI(greetMeSound)) + ); } + ppType.setFacade(fe); + + return ppType; } /** @@ -255,11 +256,11 @@ private Map getFacadeMap(Object obj, Map map) { DSTURI greetMeSound = null; if(obj != null) { FacadeElement fe = (FacadeElement)obj; - mugShot = fe.getMugShot(); - webSite = fe.getWebSite(); - namePronounced = fe.getNamePronounced(); - greetSound = fe.getGreetSound(); - greetMeSound = fe.getGreetMeSound(); + mugShot = fe.getValue().getMugShot().getValue(); + webSite = fe.getValue().getWebSite().getValue(); + namePronounced = fe.getValue().getNamePronounced().getValue(); + greetSound = fe.getValue().getGreetSound().getValue(); + greetMeSound = fe.getValue().getGreetMeSound().getValue(); } getAttributeMap(IDPPConstants.MUGSHOT_ELEMENT, mugShot, map); getAttributeMap(IDPPConstants.WEBSITE_ELEMENT, webSite, map); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPInformalName.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPInformalName.java index cd7dcbf069..90ea7ddb8d 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPInformalName.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPInformalName.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPInformalName.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Map; @@ -61,24 +63,21 @@ public IDPPInformalName() { */ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPInformalName:getInformalName:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - InformalNameElement in = - IDPPUtils.getIDPPFactory().createInformalNameElement(); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + InformalNameElement in = + IDPPUtils.getIDPPFactory().createInformalNameElement( + IDPPUtils.getIDPPFactory().createDSTString() + ); - String informalName = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.INFORMAL_NAME_ELEMENT).toLowerCase()); - in.setValue(informalName); + String informalName = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.INFORMAL_NAME_ELEMENT).toLowerCase()); + DSTString dstStringInformalName = IDPPUtils.getIDPPFactory().createDSTString(); + dstStringInformalName.setValue(informalName); + in.setValue(dstStringInformalName); - ppType.setInformalName(in); - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPInformalName:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + ppType.setInformalName(in); + return ppType; } /** diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java index 77e30ef545..dadcd1b7f5 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPLegalIdentity.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Iterator; @@ -66,23 +68,23 @@ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPLegalIdentity:getContainerObject:Init"); try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - LegalIdentityElement lIdentity = - IDPPUtils.getIDPPFactory().createLegalIdentityElement(); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + LegalIdentityType lIdentity = IDPPUtils.getIDPPFactory().createLegalIdentityType(); + String value = CollectionHelper.getMapAttr(userMap, getAttributeMapper().getDSAttribute( IDPPConstants.LEGAL_NAME_ELEMENT).toLowerCase()); if(value != null) { DSTString dstString = getDSTString(value); - lIdentity.setLegalName(dstString); + lIdentity.setLegalName(IDPPUtils.getIDPPFactory().createLegalNameElement(dstString)); } value = CollectionHelper.getMapAttr( userMap, getAttributeMapper().getDSAttribute( IDPPConstants.DOB_ELEMENT).toLowerCase()); if(value != null) { DSTDate date = getDSTDate(value); - lIdentity.setDOB(date); + lIdentity.setDOB(IDPPUtils.getIDPPFactory().createDOBElement(date)); } value = CollectionHelper.getMapAttr( @@ -90,19 +92,19 @@ userMap, getAttributeMapper().getDSAttribute( IDPPConstants.GENDER_ELEMENT).toLowerCase()); if(value != null) { DSTURI gender = getDSTURI(value); - lIdentity.setGender(gender); + lIdentity.setGender(IDPPUtils.getIDPPFactory().createGenderElement(gender)); } value = CollectionHelper.getMapAttr( userMap, getAttributeMapper().getDSAttribute( IDPPConstants.MARITAL_STATUS_ELEMENT).toLowerCase()); if(value != null) { DSTURI mStatus = getDSTURI(value); - lIdentity.setMaritalStatus(mStatus); + lIdentity.setMaritalStatus(IDPPUtils.getIDPPFactory().createMaritalStatusElement(mStatus)); } - AltIDType altID = getAltID(userMap); + AltIDElement altID = IDPPUtils.getIDPPFactory().createAltIDElement(getAltID(userMap)); if(altID != null) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(altID); lIdentity.getAltID().addAll(list); } @@ -115,14 +117,10 @@ userMap, getAttributeMapper().getDSAttribute( AnalyzedNameType analyzedName = getAnalyzedName(userMap); if(analyzedName != null) { lIdentity.setAnalyzedName(analyzedName); - } - ppType.setLegalIdentity(lIdentity); + } + LegalIdentityElement lIdentityElement = IDPPUtils.getIDPPFactory().createLegalIdentityElement(lIdentity); + ppType.setLegalIdentity(lIdentityElement); return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPContainers:getContainerObject: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); } catch (IDPPException ie) { IDPPUtils.debug.error("IDPPContainers:getContainerObject:" + "Error while creating legal identity.", ie); @@ -139,36 +137,30 @@ userMap, getAttributeMapper().getDSAttribute( private AltIDType getAltID(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPLegalIdentity:getAltID:Init"); AltIDType altID = null; - try { - altID = IDPPUtils.getIDPPFactory().createAltIDType(); - String altIDType = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.ALT_ID_TYPE_ELEMENT).toLowerCase()); - - if(altIDType != null) { - DSTURI uri = getDSTURI(altIDType); - altID.setIDType(uri); - } + altID = IDPPUtils.getIDPPFactory().createAltIDType(); + String altIDType = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.ALT_ID_TYPE_ELEMENT).toLowerCase()); + + if(altIDType != null) { + DSTURI uri = getDSTURI(altIDType); + altID.setIDType(uri); + } - String altIDValue = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.ALT_ID_VALUE_ELEMENT).toLowerCase()); + String altIDValue = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.ALT_ID_VALUE_ELEMENT).toLowerCase()); - if(altIDValue != null) { - DSTString str = getDSTString(altIDValue); - altID.setIDValue(str); - } + if(altIDValue != null) { + DSTString str = getDSTString(altIDValue); + altID.setIDValue(IDPPUtils.getIDPPFactory().createIDValueElement(str)); + } - if(altIDType != null && altIDValue != null) { - return altID; - } + if(altIDType != null && altIDValue != null) { + return altID; + } - return null; - } catch (JAXBException je) { - IDPPUtils.debug.error("IDPPContainers:getAltID: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + return null; } /** @@ -180,32 +172,26 @@ userMap, getAttributeMapper().getDSAttribute( private VATType getVAT(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPLegalIdentity:getVATType:Init"); VATType vType = null; - try { - vType = IDPPUtils.getIDPPFactory().createVATType(); - String value = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.ID_TYPE_ELEMENT).toLowerCase()); - if(value != null) { - DSTURI uri = getDSTURI(value); - vType.setIDType(uri); - } - value = CollectionHelper.getMapAttr( - userMap, getAttributeMapper().getDSAttribute( - IDPPConstants.ID_VALUE_ELEMENT).toLowerCase()); - if(value != null) { - DSTString str = getDSTString(value); - vType.setIDValue(str); - } else { - IDPPUtils.debug.message("IDPPContainers:getVAT: VAT value" + - "is not configured in legal dentity"); - return null; - } - return vType; - } catch (JAXBException je) { - IDPPUtils.debug.error("IDPPContainers:getVAT: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + vType = IDPPUtils.getIDPPFactory().createVATType(); + String value = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.ID_TYPE_ELEMENT).toLowerCase()); + if(value != null) { + DSTURI uri = getDSTURI(value); + vType.setIDType(uri); + } + value = CollectionHelper.getMapAttr( + userMap, getAttributeMapper().getDSAttribute( + IDPPConstants.ID_VALUE_ELEMENT).toLowerCase()); + if(value != null) { + DSTString str = getDSTString(value); + vType.setIDValue(IDPPUtils.getIDPPFactory().createIDValueElement(str)); + } else { + IDPPUtils.debug.message("IDPPContainers:getVAT: VAT value" + + "is not configured in legal dentity"); + return null; + } + return vType; } /** @@ -466,10 +452,10 @@ private Map getLegalIdentityMap(Object obj, Map map) analyzedName = lType.getAnalyzedName(); vat = lType.getVAT(); altIDs = lType.getAltID(); - dob = lType.getDOB(); - mStatus = lType.getMaritalStatus(); - gender = lType.getGender(); - lName = lType.getLegalName(); + dob = lType.getDOB().getValue(); + mStatus = lType.getMaritalStatus().getValue(); + gender = lType.getGender().getValue(); + lName = lType.getLegalName().getValue(); } else { throw new IDPPException( IDPPUtils.bundle.getString("invalid Element")); @@ -503,7 +489,7 @@ private Map getAltIDMap(List dataObject, Map map) throws IDPPException { if(dataElement instanceof AltIDElement) { AltIDType altID = (AltIDType)dataElement; altIDType = altID.getIDType(); - altIDValue = altID.getIDValue(); + altIDValue = altID.getIDValue().getValue(); } else { throw new IDPPException( IDPPUtils.bundle.getString("invalid Element")); @@ -529,7 +515,7 @@ private Map getVATMap(Object obj, Map map) throws IDPPException { if(obj instanceof VATType) { VATType vType = (VATType)obj; idType = vType.getIDType(); - idValue = vType.getIDValue(); + idValue = vType.getIDValue().getValue(); } else { throw new IDPPException( IDPPUtils.bundle.getString("invalid Element")); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPMsgContact.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPMsgContact.java index a5d7e42c0a..ff31c692fd 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPMsgContact.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPMsgContact.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPMsgContact.java,v 1.3 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; import com.sun.identity.shared.datastruct.CollectionHelper; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Map; @@ -65,7 +67,7 @@ public IDPPMsgContact() { public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPMsgContact:getContainerObject:Init"); try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); Set msgContacts = (Set)userMap.get( getAttributeMapper().getDSAttribute( IDPPConstants.MSG_CONTACT_ELEMENT).toLowerCase()); @@ -116,7 +118,8 @@ private MsgContactElement parseEntry(String entry, Map userMap) } MsgContactElement mse = - IDPPUtils.getIDPPFactory().createMsgContactElement(); + IDPPUtils.getIDPPFactory().createMsgContactElement( + IDPPUtils.getIDPPFactory().createMsgContactType()); StringTokenizer st = new StringTokenizer(entry, IDPPConstants.ATTRIBUTE_SEPARATOR); @@ -149,23 +152,23 @@ private MsgContactElement parseEntry(String entry, Map userMap) } if(attribute.equals("MsgType")) { - mse.getMsgType().add(getDSTURI(value)); + mse.getValue().getMsgType().add(getDSTURI(value)); } else if(attribute.equals("Nick")) { - mse.setNick(getDSTString(value)); + mse.getValue().setNick(getDSTString(value)); } else if(attribute.equals("LComment")) { - mse.setLComment(getDSTString(value)); + mse.getValue().setLComment(getDSTString(value)); } else if(attribute.equals("MsgMethod")) { - mse.getMsgMethod().add(getDSTURI(value)); + mse.getValue().getMsgMethod().add(getDSTURI(value)); } else if(attribute.equals("MsgTechnology")) { - mse.getMsgTechnology().add(getDSTURI(value)); + mse.getValue().getMsgTechnology().add(getMsgTechnology(value)); } else if(attribute.equals("MsgAccount")) { - mse.setMsgAccount(getDSTString(value)); + mse.getValue().setMsgAccount(getDSTString(value)); } else if(attribute.equals("MsgSubAccount")) { - mse.setMsgSubaccount(getDSTString(value)); + mse.getValue().setMsgSubaccount(getDSTString(value)); } else if(attribute.equals("MsgProvider")) { - mse.setMsgProvider(getDSTString(value)); + mse.getValue().setMsgProvider(getDSTString(value)); } else if(attribute.equals("id")) { - mse.setId(value); + mse.getValue().setId(value); } } return mse; @@ -300,55 +303,55 @@ private String modifyEntry(String entry, MsgContactElement mse) { StringBuffer sb = new StringBuffer(200); - DSTString dstString = mse.getNick(); + DSTString dstString = mse.getValue().getNick(); if(dstString != null) { sb.append("Nick").append("=") .append(dstString.getValue()).append("|"); } - dstString = mse.getLComment(); + dstString = mse.getValue().getLComment(); if(dstString != null) { sb.append("LComment").append("=") .append(dstString.getValue()).append("|"); } - dstString = mse.getMsgProvider(); + dstString = mse.getValue().getMsgProvider(); if(dstString != null) { sb.append("MsgProvider").append("=") .append(dstString.getValue()).append("|"); } - dstString = mse.getMsgAccount(); + dstString = mse.getValue().getMsgAccount(); if(dstString != null) { sb.append("MsgAccount").append("=") .append(dstString.getValue()).append("|"); } - dstString = mse.getMsgSubaccount(); + dstString = mse.getValue().getMsgSubaccount(); if(dstString != null) { sb.append("MsgSubAccount").append("=") .append(dstString.getValue()).append("|"); } - DSTURI dstURI = (DSTURI)mse.getMsgType().get(0); + DSTURI dstURI = (DSTURI)mse.getValue().getMsgType().get(0); if(dstURI != null) { sb.append("MsgType").append("=") .append(dstURI.getValue()).append("|"); } - dstURI = (DSTURI)mse.getMsgMethod().get(0); + dstURI = (DSTURI)mse.getValue().getMsgMethod().get(0); if(dstURI != null) { sb.append("MsgMethod").append("=") .append(dstURI.getValue()).append("|"); } - dstURI = (DSTURI)mse.getMsgTechnology().get(0); + dstURI = mse.getValue().getMsgTechnology().get(0); if(dstURI != null) { sb.append("MsgTechnology").append("=") .append(dstURI.getValue()); } - String id = mse.getId(); + String id = mse.getValue().getId(); if(id != null) { sb.append("id").append("=").append(id); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPSignKey.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPSignKey.java index 2edc24483f..d842a790cb 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPSignKey.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPSignKey.java @@ -23,22 +23,22 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDPPSignKey.java,v 1.2 2008/06/25 05:47:16 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.idpp.container; -import javax.xml.bind.JAXBException; import java.util.Set; import java.util.HashSet; import java.util.Map; import java.util.HashMap; import java.util.List; import java.util.Iterator; -import org.w3c.dom.Document; + import com.sun.identity.liberty.ws.idpp.common.*; import com.sun.identity.liberty.ws.idpp.jaxb.*; -import com.sun.identity.liberty.ws.idpp.plugin.*; /** @@ -63,41 +63,34 @@ public IDPPSignKey() { */ public Object getContainerObject(Map userMap) throws IDPPException { IDPPUtils.debug.message("IDPPSignKey:getContainerObject:Init"); - try { - PPType ppType = IDPPUtils.getIDPPFactory().createPPElement(); - SignKeyElement signKey = - IDPPUtils.getIDPPFactory().createSignKeyElement(); - byte[][] certBytes = (byte[][]) userMap.get( - getAttributeMapper().getDSAttribute( - IDPPConstants.SIGN_KEY_ELEMENT).toLowerCase()); - - if(IDPPUtils.debug.messageEnabled()) { - IDPPUtils.debug.message("IDPPSignKey.getContainerObject: " + - "SignKey Value" + certBytes); - } - com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectFactory of = - new com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectFactory(); - - com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType - x509DataType = of.createX509DataElement(); - - com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType. - X509Certificate cert = of.createX509DataTypeX509Certificate( - certBytes[0]); - - x509DataType. - getX509IssuerSerialOrX509SKIOrX509SubjectName().add(cert); - - signKey.getContent().add(x509DataType); - - ppType.setSignKey(signKey); - return ppType; - } catch (JAXBException je) { - IDPPUtils.debug.error( - "IDPPContainers:getInformalName: JAXB failure", je); - throw new IDPPException( - IDPPUtils.bundle.getString("jaxbFailure")); - } + PPType ppType = IDPPUtils.getIDPPFactory().createPPType(); + KeyInfoType signKey = IDPPUtils.getIDPPFactory().createKeyInfoType(); + + byte[][] certBytes = (byte[][]) userMap.get( + getAttributeMapper().getDSAttribute( + IDPPConstants.SIGN_KEY_ELEMENT).toLowerCase()); + + if(IDPPUtils.debug.messageEnabled()) { + IDPPUtils.debug.message("IDPPSignKey.getContainerObject: " + + "SignKey Value" + certBytes); + } + com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectFactory of = + new com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectFactory(); + + com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType + x509DataType = of.createX509DataType(); + + com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType. + X509Certificate cert = of.createX509DataTypeX509Certificate( + certBytes[0]); + + x509DataType. + getX509IssuerSerialOrX509SKIOrX509SubjectName().add(cert); + + signKey.getContent().add(x509DataType); + SignKeyElement signKeyElement = IDPPUtils.getIDPPFactory().createSignKeyElement(signKey); + ppType.setSignKey(signKeyElement); + return ppType; } /** @@ -148,7 +141,7 @@ public Map getDataMapForSelect(String select, List data) if(dataElement instanceof SignKeyElement) { byte[] certBytes = null; SignKeyElement signKey = (SignKeyElement)dataElement; - List contents = signKey.getContent(); + List contents = signKey.getValue().getContent(); if(contents == null || contents.size() == 0) { return getAttributeMap( @@ -165,8 +158,8 @@ public Map getDataMapForSelect(String select, List data) com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataElement x509Data = (com.sun.identity.liberty.ws.common.jaxb. xmlsig.X509DataElement)obj; - List certs = - x509Data.getX509IssuerSerialOrX509SKIOrX509SubjectName(); + List certs = + x509Data.getValue().getX509IssuerSerialOrX509SKIOrX509SubjectName(); if(certs == null || certs.size() == 0) { IDPPUtils.debug.error("IDPPSignKey.getDataMapForSelect:" + diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionManager.java index a12fbaec09..e6787a5899 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionManager.java @@ -25,7 +25,7 @@ * $Id: InteractionManager.java,v 1.5 2008/08/06 17:28:10 exu Exp $ * * Portions Copyrighted 2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.liberty.ws.interaction; @@ -72,7 +72,7 @@ import java.util.Map; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; import org.w3c.dom.Element; @@ -292,19 +292,17 @@ public Message sendRequest(Message requestMessage, UserInteractionElement ue = createUserInteractionElement( acceptLanguages); String id = SAMLUtils.generateID(); - ue.setId(id); - if (ue != null) { - try { - Element element = Utils.convertJAXBToElement(ue); - requestMessage.setOtherSOAPHeader( - element, - id); - - } catch (JAXBException je) { - debug.error("InteractionManager.sendRequest():" - + "not setting userInteractionHeader:" - + "can not convert JAXBObject to Element", je); - } + ue.getValue().setId(id); + try { + Element element = Utils.convertJAXBToElement(ue); + requestMessage.setOtherSOAPHeader( + element, + id); + + } catch (JAXBException je) { + debug.error("InteractionManager.sendRequest():" + + "not setting userInteractionHeader:" + + "can not convert JAXBObject to Element", je); } } @@ -693,7 +691,7 @@ public Message handleInteraction(Message requestMessage, } //Check WSC is willing to redirect - if (ue.isRedirect() == false) { + if (ue.getValue().isRedirect() == false) { SOAPFaultException sfe = newRedirectFaultError( QNAME_INTERACTION_REQUIRED); if (debug.warningEnabled()) { @@ -708,7 +706,7 @@ public Message handleInteraction(Message requestMessage, } //Check WSC allowed interaction - if (ue.getInteract().equals(QNAME_DO_NOT_INTERACT)) { + if (ue.getValue().getInteract().equals(QNAME_DO_NOT_INTERACT)) { SOAPFaultException sfe = newRedirectFaultError( QNAME_INTERACTION_REQUIRED); if (debug.warningEnabled()) { @@ -724,7 +722,7 @@ public Message handleInteraction(Message requestMessage, //Check WSC allowed interaction for data if (interactionConfig.wspRedirectsForData() - && ue.getInteract().equals( + && ue.getValue().getInteract().equals( QNAME_DO_NOT_INTERACT_FOR_DATA)) { SOAPFaultException sfe = newRedirectFaultError( QNAME_INTERACTION_REQUIRED_FOR_DATA); @@ -740,7 +738,7 @@ public Message handleInteraction(Message requestMessage, } //Check WSP will not exceed maxInteractionTime specified by WSC - BigInteger uemi = ue.getMaxInteractTime(); + BigInteger uemi = ue.getValue().getMaxInteractTime(); if ( (uemi != null) && (interactionConfig.getWSPRedirectTime() > uemi.intValue()) ) { SOAPFaultException sfe = newRedirectFaultError( @@ -750,7 +748,7 @@ public Message handleInteraction(Message requestMessage, + "WSP inteaction time =" + interactionConfig.getWSPRedirectTime() + " exceeds WSC maxInteractTime= " - + ue.getMaxInteractTime()); + + ue.getValue().getMaxInteractTime()); debug.warning("InteractionManager.handleInteraction():" + "throwing InteractionSOAPFaultException=" + sfe); @@ -1039,21 +1037,16 @@ String getLanguage(String messageID) { private UserInteractionElement createUserInteractionElement( List acceptLanguages) { - UserInteractionElement ue = null; - try { - ue =objectFactory.createUserInteractionElement(); - - ue.setInteract(interactionConfig - .getWSCSpecifiedInteractionChoice()); - ue.setRedirect(interactionConfig.wscSupportsRedirect()); - ue.setMaxInteractTime( - java.math.BigInteger.valueOf(interactionConfig - .getWSCSpecifiedMaxInteractionTime())); - ue.getLanguage().addAll(acceptLanguages); - } catch (JAXBException je) { - debug.error("InteractionManager.createUserInteractionElement():" - + " can not create UserInteractionElement", je); - } + UserInteractionElement ue = null; + ue =objectFactory.createUserInteractionElement(objectFactory.createUserInteractionHeaderType()); + + ue.getValue().setInteract(interactionConfig + .getWSCSpecifiedInteractionChoice()); + ue.getValue().setRedirect(interactionConfig.wscSupportsRedirect()); + ue.getValue().setMaxInteractTime( + BigInteger.valueOf(interactionConfig + .getWSCSpecifiedMaxInteractionTime())); + ue.getValue().getLanguage().addAll(acceptLanguages); return ue; } @@ -1082,13 +1075,7 @@ static UserInteractionElement getUserInteractionElement( private SOAPFaultException newRedirectFault(String messageID) { RedirectRequestElement re = null; - try{ - re = objectFactory.createRedirectRequestElement(); - - } catch (JAXBException je) { - debug.error("InteractionManager.newRedirectFault():" - + " can not create RedirectRequestElement", je); - } + re = objectFactory.createRedirectRequestElement(objectFactory.createRedirectRequestType()); CorrelationHeader ch = new CorrelationHeader(); String responseID = ch.getMessageID(); @@ -1119,7 +1106,7 @@ private SOAPFaultException newRedirectFault(String messageID) { + redirectUrl); } } - re.setRedirectURL(redirectUrl); + re.getValue().setRedirectURL(redirectUrl); List details = new ArrayList(); try { details.add(Utils.convertJAXBToElement(re)); @@ -1141,15 +1128,9 @@ private SOAPFaultException newRedirectFault(String messageID) { private SOAPFaultException newRedirectFaultError(QName errorCode) { StatusElement se = null; - try{ - se = objectFactory.createStatusElement(); - - } catch (JAXBException je) { - debug.error("InteractionManager.newRedirectFaultError():" - + " can not create StatusElement", je); - } + se = objectFactory.createStatusElement(objectFactory.createStatusType()); - se.setCode(errorCode); + se.getValue().setCode(errorCode); List details = new ArrayList(); try { details.add(Utils.convertJAXBToElement(se)); @@ -1186,7 +1167,7 @@ String getRedirectURL(SOAPFaultException sfe) throws SOAPFaultException { RedirectRequestElement rre = (RedirectRequestElement)details.get(0); if (rre != null) { - redirectURL = rre.getRedirectURL(); + redirectURL = rre.getValue().getRedirectURL(); } } if (redirectURL == null) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionUtils.java index 0df5e7665d..5d49cdcbd8 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/InteractionUtils.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: InteractionUtils.java,v 1.2 2008/06/25 05:47:18 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -58,13 +60,13 @@ private InteractionUtils() {} * name String objects. Values in the map are parameter value * String objects */ - public static Map getParameters( + public static Map getParameters( InteractionResponseElement interactionResponseElement) { - List parameters = interactionResponseElement.getParameter(); - Map pm = new HashMap(); - Iterator iter = parameters.iterator(); + List parameters = interactionResponseElement.getValue().getParameter(); + Map pm = new HashMap<>(); + Iterator iter = parameters.iterator(); while (iter.hasNext()) { - ParameterType pt = (ParameterType) iter.next(); + ParameterType pt = iter.next(); pm.put(pt.getName(), pt.getValue()); } return pm; @@ -89,7 +91,7 @@ public static List getInteractionLangauge(Message message) { UserInteractionElement ue = InteractionManager.getUserInteractionElement(message); if (ue != null) { - languages = ue.getLanguage(); + languages = ue.getValue().getLanguage(); } if (languages == null) { languages = Collections.EMPTY_LIST; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/WSPRedirectHandlerServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/WSPRedirectHandlerServlet.java index b393254249..8a5bd84cd6 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/WSPRedirectHandlerServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interaction/WSPRedirectHandlerServlet.java @@ -27,7 +27,7 @@ */ /** * Portions Copyrighted 2012-2014 ForgeRock AS - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.liberty.ws.interaction; @@ -46,7 +46,6 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.net.URL; -import java.net.URLConnection; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.util.Enumeration; @@ -62,9 +61,9 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletException; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Transformer; @@ -515,12 +514,14 @@ private void sendInteractionResponsePage(String messageID, //read and save query parameters; InteractionResponseElement interactionResponseElement = JAXBObjectFactory.getObjectFactory() - .createInteractionResponseElement(); - List list = interactionResponseElement.getParameter(); - Enumeration parameterNames = httpRequest.getParameterNames(); + .createInteractionResponseElement( + JAXBObjectFactory.getObjectFactory().createInteractionResponseType() + ); + List list = interactionResponseElement.getValue().getParameter(); + Enumeration parameterNames = httpRequest.getParameterNames(); while ( parameterNames.hasMoreElements()) { String parameterName - = (String)parameterNames.nextElement(); + = parameterNames.nextElement(); /* ParameterType parameterType = JAXBObjectFactory.getObjectFactory() @@ -582,13 +583,6 @@ private void sendInteractionResponsePage(String messageID, LogUtil.access(Level.INFO,LogUtil.IS_REDIRECTED_USER_AGENT_BACK, objs); } - } catch (JAXBException je) { - debug.error( - "WSPRedirectHandlerServlet.sendInteractionResponsePage():" - + "catching JAXBException =", je); - showErrorPage(httpRequest, httpResponse, - "Error createing JAXBObject:" - + je.getMessage()); } catch (Exception e) { debug.error( "WSPRedirectHandlerServlet.sendInteractionResponsePage():" diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Message.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Message.java index 1586b85eff..05e6b4e345 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Message.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Message.java @@ -24,7 +24,7 @@ * * $Id: Message.java,v 1.3 2008/06/25 05:47:22 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -47,10 +47,10 @@ import java.util.List; import jakarta.xml.soap.SOAPMessage; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import com.sun.identity.liberty.ws.common.wsse.BinarySecurityToken; import com.sun.identity.liberty.ws.common.wsse.WSSEConstants; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/NamespacePrefixMapperImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/NamespacePrefixMapperImpl.java index 6e8f1288df..df2b142aed 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/NamespacePrefixMapperImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/NamespacePrefixMapperImpl.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: NamespacePrefixMapperImpl.java,v 1.2 2008/06/25 05:47:22 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.liberty.ws.soapbinding; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; /** * This class is the implementation of the NamespacePrefixMapper. diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFault.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFault.java index 0d1790b2f8..6ed2fa6013 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFault.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFault.java @@ -24,7 +24,7 @@ * * $Id: SOAPFault.java,v 1.2 2008/06/25 05:47:23 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -36,7 +36,7 @@ import java.util.Iterator; import java.util.List; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFaultDetail.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFaultDetail.java index 657404639e..141be1ce5e 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFaultDetail.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPFaultDetail.java @@ -24,7 +24,7 @@ * * $Id: SOAPFaultDetail.java,v 1.2 2008/06/25 05:47:23 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -48,10 +48,10 @@ import org.w3c.dom.NodeList; import jakarta.xml.soap.SOAPMessage; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import javax.xml.transform.stream.StreamSource; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java index 813f54ebc9..f6511c26c4 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java @@ -25,7 +25,7 @@ * $Id: Utils.java,v 1.9 2008/11/10 22:56:59 veiming Exp $ * * Portions Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.liberty.ws.soapbinding; @@ -47,14 +47,14 @@ import java.util.Set; import java.util.StringTokenizer; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.NotIdentifiableEvent; -import javax.xml.bind.PropertyException; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.helpers.DefaultValidationEventHandler; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.NotIdentifiableEvent; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.helpers.DefaultValidationEventHandler; import javax.xml.namespace.QName; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPMessage; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/IDFFProviderManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/IDFFProviderManager.java index 4ef3bc3a90..f353072c9f 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/IDFFProviderManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/IDFFProviderManager.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: IDFFProviderManager.java,v 1.3 2008/06/25 05:47:24 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -124,9 +126,9 @@ public boolean isNameIDEncryptionEnabled(String providerID) { } BaseConfigType baseConfig = - IDFFMetaUtils.getSPDescriptorConfig(entityConfig); + IDFFMetaUtils.getSPDescriptorConfig(entityConfig).getValue(); if (baseConfig == null) { - baseConfig = IDFFMetaUtils.getIDPDescriptorConfig(entityConfig); + baseConfig = IDFFMetaUtils.getIDPDescriptorConfig(entityConfig).getValue(); if (baseConfig == null) { return false; } @@ -184,10 +186,10 @@ public PrivateKey getDecryptionKey(String providerID) { BaseConfigType providerConfig = null; try { providerConfig = idffMetaManager.getSPDescriptorConfig( - ROOT_REALM, providerID); + ROOT_REALM, providerID).getValue(); if (providerConfig == null) { providerConfig = idffMetaManager. - getIDPDescriptorConfig(ROOT_REALM, providerID); + getIDPDescriptorConfig(ROOT_REALM, providerID).getValue(); } } catch (IDFFMetaException imex) { ProviderUtil.debug.error("IDFFProviderManager.getDecryptionKey", @@ -210,10 +212,10 @@ public String getSigningKeyAlias(String providerID) { BaseConfigType config = null; try { config = idffMetaManager.getSPDescriptorConfig( - ROOT_REALM, providerID); + ROOT_REALM, providerID).getValue(); if (config == null) { config = idffMetaManager.getIDPDescriptorConfig( - ROOT_REALM, providerID); + ROOT_REALM, providerID).getValue(); } } catch(IDFFMetaException imex) { ProviderUtil.debug.error( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/IDFFSingleLogoutHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/IDFFSingleLogoutHandler.java index 8fe3ee552a..6974484862 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/IDFFSingleLogoutHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/IDFFSingleLogoutHandler.java @@ -24,7 +24,7 @@ * * $Id: IDFFSingleLogoutHandler.java,v 1.6 2008/11/10 22:56:59 veiming Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.multiprotocol; @@ -223,7 +223,7 @@ private int handleSOAPInitiatedSingleLogout(Set userSession, String userID, ProviderDescriptorType hostedProviderDesc = metaManager.getIDPDescriptor(realm, idpEntityId); BaseConfigType hostedConfig = - metaManager.getIDPDescriptorConfig(realm, idpEntityId); + metaManager.getIDPDescriptorConfig(realm, idpEntityId).getValue(); FSSingleLogoutHandler handlerObj = new FSSingleLogoutHandler(); handlerObj.setHostedDescriptor(hostedProviderDesc); handlerObj.setHostedDescriptorConfig(hostedConfig); @@ -301,7 +301,7 @@ private String findIDPMetaAlias(String idpEntityID, String spEntityID, } IDPDescriptorConfigElement config = idffManager.getIDPDescriptorConfig(realm, idpId); - return config.getMetaAlias(); + return config.getValue().getMetaAlias(); } } } catch (Exception e) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java index c7ec30f2cb..aaf763e30b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java @@ -24,7 +24,7 @@ * * $Id: SAML2SingleLogoutHandler.java,v 1.6 2008/11/10 22:57:00 veiming Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.multiprotocol; @@ -245,7 +245,7 @@ private String findIDPMetaAlias(String idpEntityID, String spEntityID, } IDPSSOConfigElement config = saml2Manager.getIDPSSOConfig(realm, idpId); - return config.getMetaAlias(); + return config.getValue().getMetaAlias(); } } } catch (Exception e) { @@ -342,7 +342,7 @@ private int handleSOAPInitiatedSingleLogout(Set userSession, String userID, SPSSODescriptorElement sp = null; sp = SAML2Utils.getSAML2MetaManager(). getSPSSODescriptor(realm, spEntityID); - List slosList = sp.getSingleLogoutService(); + List slosList = sp.getValue().getSingleLogoutService(); // get IDP entity config for basic auth info SPSSOConfigElement spConfig = SAML2Utils. @@ -353,7 +353,7 @@ private int handleSOAPInitiatedSingleLogout(Set userSession, String userID, LogoutUtil.doLogout(idpMetaAlias, spEntityID, slosList, null, SAML2Constants.SOAP, relayState, sessIndex[0], pair.getNameID(), request, - response, paramsMap, spConfig); + response, paramsMap, spConfig.getValue()); } catch (SAML2Exception ex) { debug.error("SAML2SLOHandler:handleSOAPSLO.doLogout" , ex); soapFailCount++; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SingleLogoutManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SingleLogoutManager.java index 322775e4ed..eaba4b9cf6 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SingleLogoutManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SingleLogoutManager.java @@ -24,7 +24,7 @@ * * $Id: SingleLogoutManager.java,v 1.8 2008/11/10 22:57:00 veiming Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.multiprotocol; @@ -689,7 +689,7 @@ void sendLogoutResponse(HttpServletRequest request, SingleLogoutManager.debug).getDocumentElement(); FSLogoutResponse responseLogout = new FSLogoutResponse(elem); BaseConfigType hostedConfig = - metaManager.getIDPDescriptorConfig(realm, idpEntityID); + metaManager.getIDPDescriptorConfig(realm, idpEntityID).getValue(); logoutDoneURL = FSServiceUtils.getLogoutDonePageURL(request, hostedConfig, null); Status status = responseLogout.getStatus(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/WSFederationSingleLogoutHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/WSFederationSingleLogoutHandler.java index 02aa72b2bb..06a556d11a 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/WSFederationSingleLogoutHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/WSFederationSingleLogoutHandler.java @@ -24,7 +24,7 @@ * * $Id: WSFederationSingleLogoutHandler.java,v 1.4 2009/10/28 23:58:57 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.multiprotocol; @@ -222,7 +222,7 @@ private String findIDPMetaAlias(String idpEntityID, String spEntityID, } IDPSSOConfigElement config = metaManager.getIDPSSOConfig(realm, idpId); - return config.getMetaAlias(); + return config.getValue().getMetaAlias(); } } } catch (Exception e) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/configuration/impl/FedletConfigurationImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/configuration/impl/FedletConfigurationImpl.java index a7ecccf45e..817ce1283f 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/configuration/impl/FedletConfigurationImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/configuration/impl/FedletConfigurationImpl.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: FedletConfigurationImpl.java,v 1.5 2010/01/26 21:31:59 madan_ranganath Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -54,7 +56,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -278,7 +280,7 @@ private String getEntityID(String metaXML) { try { Object obj = SAML2MetaUtils.convertStringToJAXB(metaXML); if (obj instanceof EntityDescriptorElement) { - return ((EntityDescriptorElement) obj).getEntityID(); + return ((EntityDescriptorElement) obj).getValue().getEntityID(); } } catch (JAXBException jaxbe) { debug.error("FedletConfigImpl.getEntityID: " + metaXML, jaxbe); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SAML2Utils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SAML2Utils.java index 2ca018b396..1f77fab8be 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SAML2Utils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SAML2Utils.java @@ -24,7 +24,7 @@ * * Portions Copyrighted 2010-2016 ForgeRock AS. * Portions Copyrighted 2014 Nomura Research Institute, Ltd - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.common; @@ -139,6 +139,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import jakarta.xml.bind.JAXBElement; import jakarta.xml.soap.MimeHeader; import jakarta.xml.soap.MimeHeaders; import org.forgerock.openam.federation.saml2.SAML2TokenRepositoryException; @@ -433,7 +434,7 @@ public static Map verifyResponse( throw new SAML2Exception(sme); } if (idpSSODescriptor != null) { - Set verificationCerts = KeyUtil.getVerificationCerts(idpSSODescriptor, idpEntityId, + Set verificationCerts = KeyUtil.getVerificationCerts(idpSSODescriptor.getValue(), idpEntityId, SAML2Constants.IDP_ROLE); if (CollectionUtils.isEmpty(verificationCerts) || !response.isSignatureValid(verificationCerts)) { debug.error(method + "Response is not signed or signature is not valid."); @@ -472,7 +473,7 @@ public static Map verifyResponse( Set decryptionKeys; List encAssertions = response.getEncryptedAssertion(); if (encAssertions != null) { - decryptionKeys = KeyUtil.getDecryptionKeys(spConfig); + decryptionKeys = KeyUtil.getDecryptionKeys(spConfig.getValue()); for (EncryptedAssertion encAssertion : encAssertions) { Assertion assertion = encAssertion.decrypt(decryptionKeys); if (assertions == null) { @@ -491,7 +492,7 @@ public static Map verifyResponse( throw new SAML2Exception(SAML2Utils.bundle.getString("missingAssertion")); } - boolean wantAssertionsSigned = spDesc.isWantAssertionsSigned(); + boolean wantAssertionsSigned = spDesc.getValue().isWantAssertionsSigned(); if (debug.messageEnabled()) { debug.message(method + "wantAssertionsSigned is :" + wantAssertionsSigned); } @@ -552,7 +553,7 @@ public static Map verifyResponse( if (verificationCerts == null) { idp = saml2MetaManager.getIDPSSODescriptor( orgName, idpEntityId); - verificationCerts = KeyUtil.getVerificationCerts(idp, idpEntityId, SAML2Constants.IDP_ROLE); + verificationCerts = KeyUtil.getVerificationCerts(idp.getValue(), idpEntityId, SAML2Constants.IDP_ROLE); } if (CollectionUtils.isEmpty(verificationCerts) || !assertion.isSignatureValid(verificationCerts)) { debug.error(method + @@ -568,7 +569,7 @@ public static Map verifyResponse( } else { allAssertionsSigned = false; } - List authnStmts = assertion.getAuthnStatements(); + List authnStmts = assertion.getAuthnStatements(); if (authnStmts != null && !authnStmts.isEmpty()) { Subject subject = assertion.getSubject(); if (subject == null) { @@ -798,9 +799,9 @@ public static void validateRecipient(SPSSODescriptorElement spDesc, String asser throw new SAML2Exception(bundle.getString("missingRecipient")); } boolean foundMatch = false; - for (Object o : spDesc.getAssertionConsumerService()) { + for (Object o : spDesc.getValue().getAssertionConsumerService()) { AssertionConsumerServiceElement acs = (AssertionConsumerServiceElement) o; - if (recipient.equals(acs.getLocation())) { + if (recipient.equals(acs.getValue().getLocation())) { foundMatch = true; break; } @@ -1000,7 +1001,7 @@ public static String getAttributeValueFromSPSSOConfig( if (config == null) { return null; } - Map attrs = SAML2MetaUtils.getAttributes(config); + Map attrs = SAML2MetaUtils.getAttributes(config.getValue()); List value = (List) attrs.get(attrName); if (value != null && value.size() != 0) { result = ((String) value.iterator().next()).trim(); @@ -2190,21 +2191,21 @@ public static List getAllAttributeValueFromSSOConfig(String realm, try { BaseConfigType config = null; if (entityRole.equalsIgnoreCase(SAML2Constants.SP_ROLE)) { - config = saml2MetaManager.getSPSSOConfig(realm, hostEntityId); + config = saml2MetaManager.getSPSSOConfig(realm, hostEntityId).getValue(); } else if (entityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { - config = saml2MetaManager.getIDPSSOConfig(realm, hostEntityId); + config = saml2MetaManager.getIDPSSOConfig(realm, hostEntityId).getValue(); } else if (entityRole.equalsIgnoreCase( SAML2Constants.ATTR_AUTH_ROLE)) { config = saml2MetaManager.getAttributeAuthorityConfig(realm, - hostEntityId); + hostEntityId).getValue(); } else if (entityRole.equalsIgnoreCase( SAML2Constants.AUTHN_AUTH_ROLE)) { config = saml2MetaManager.getAuthnAuthorityConfig(realm, - hostEntityId); + hostEntityId).getValue(); } else if (entityRole.equalsIgnoreCase( SAML2Constants.ATTR_QUERY_ROLE)) { config = saml2MetaManager.getAttributeQueryConfig(realm, - hostEntityId); + hostEntityId).getValue(); } if (config == null) { @@ -2402,11 +2403,11 @@ public static boolean verifyQueryString(String queryString, String realm, if (hostEntityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { SPSSODescriptorElement spSSODesc = saml2MetaManager.getSPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(spSSODesc, remoteEntity, SAML2Constants.SP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(spSSODesc.getValue(), remoteEntity, SAML2Constants.SP_ROLE); } else { IDPSSODescriptorElement idpSSODesc = saml2MetaManager.getIDPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(idpSSODesc, remoteEntity, SAML2Constants.IDP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(idpSSODesc.getValue(), remoteEntity, SAML2Constants.IDP_ROLE); } if (debug.messageEnabled()) { @@ -2638,7 +2639,7 @@ public static String getReaderURL(String spMetaAlias) { saml2MetaManager.getSPSSOConfig(realm, spEntityID); Map spConfigAttrsMap = null; if (spEntityCfg != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg.getValue()); List cotList = (List) spConfigAttrsMap.get("cotlist"); String cotListStr = (String) cotList.iterator().next(); CircleOfTrustDescriptor cotDesc = @@ -3215,7 +3216,7 @@ public static Map getSAEAttrs( if (spConfig == null) { return null; } - attrs = SAML2MetaUtils.getAttributes(spConfig); + attrs = SAML2MetaUtils.getAttributes(spConfig.getValue()); } else { idpConfig = saml2MetaManager.getIDPSSOConfig(realm, entityId); @@ -3223,7 +3224,7 @@ public static Map getSAEAttrs( debug.message("SAML2Utils.getSAEAttrs: idpconfig is null"); return null; } - attrs = SAML2MetaUtils.getAttributes(idpConfig); + attrs = SAML2MetaUtils.getAttributes(idpConfig.getValue()); } if (attrs == null) { @@ -3414,14 +3415,14 @@ public static String getAttributeValueFromXACMLConfig( pepConfig = saml2MetaManager.getPolicyEnforcementPointConfig( realm, entityID); if (pepConfig != null) { - attrs = SAML2MetaUtils.getAttributes(pepConfig); + attrs = SAML2MetaUtils.getAttributes(pepConfig.getValue()); } } else { pdpConfig = saml2MetaManager.getPolicyDecisionPointConfig(realm, entityID); if (pdpConfig != null) { - attrs = SAML2MetaUtils.getAttributes(pdpConfig); + attrs = SAML2MetaUtils.getAttributes(pdpConfig.getValue()); } } @@ -3553,9 +3554,9 @@ public static Map getConfigAttributeMap(String realm, String hostEntityID, try { BaseConfigType config = null; if (role.equals(SAML2Constants.SP_ROLE)) { - config = saml2MetaManager.getSPSSOConfig(realm, hostEntityID); + config = saml2MetaManager.getSPSSOConfig(realm, hostEntityID).getValue(); } else if (role.equals(SAML2Constants.IDP_ROLE)) { - config = saml2MetaManager.getIDPSSOConfig(realm, hostEntityID); + config = saml2MetaManager.getIDPSSOConfig(realm, hostEntityID).getValue(); } @@ -3707,12 +3708,12 @@ public static String verifyNameIDFormat(String nameIDFormat, SPSSODescriptorElement spsso, IDPSSODescriptorElement idpsso) throws SAML2Exception { - List spNameIDFormatList = spsso.getNameIDFormat(); + List spNameIDFormatList = spsso.getValue().getNameIDFormat(); List idpNameIDFormatList = null; // idpsso is null for ECP case if (idpsso != null) { - idpNameIDFormatList = idpsso.getNameIDFormat(); + idpNameIDFormatList = idpsso.getValue().getNameIDFormat(); } if ((nameIDFormat == null) || (nameIDFormat.length() == 0)) { @@ -4085,18 +4086,18 @@ public static boolean isSPProfileBindingSupported( try { SPSSODescriptorElement spDescriptor = saml2MetaManager.getSPSSODescriptor(realm, spEntityID); - List services = null; + List> services = null; if (SAML2Constants.ACS_SERVICE.equals(profile)) { - services = spDescriptor.getAssertionConsumerService(); + services = spDescriptor.getValue().getAssertionConsumerService(); } else if (SAML2Constants.SLO_SERVICE.equals(profile)) { - services = spDescriptor.getSingleLogoutService(); + services = spDescriptor.getValue().getSingleLogoutService(); } else if (SAML2Constants.MNI_SERVICE.equals(profile)) { - services = spDescriptor.getManageNameIDService(); + services = spDescriptor.getValue().getManageNameIDService(); } if ((services != null) && (!services.isEmpty())) { - Iterator iter = services.iterator(); + Iterator> iter = services.iterator(); while (iter.hasNext()) { - EndpointType endpoint = (EndpointType) iter.next(); + EndpointType endpoint = iter.next().getValue(); if (binding.equals(endpoint.getBinding())) { return true; } @@ -4128,30 +4129,30 @@ public static boolean isIDPProfileBindingSupported( try { IDPSSODescriptorElement idpDescriptor = saml2MetaManager.getIDPSSODescriptor(realm, idpEntityID); - List services = null; + List> services = null; if (SAML2Constants.SSO_SERVICE.equals(profile)) { - services = idpDescriptor.getSingleSignOnService(); + services = idpDescriptor.getValue().getSingleSignOnService(); } else if (SAML2Constants.NAMEID_MAPPING_SERVICE.equals(profile)) { - services = idpDescriptor.getNameIDMappingService(); + services = idpDescriptor.getValue().getNameIDMappingService(); } else if ( SAML2Constants.ASSERTION_ID_REQUEST_SERVICE.equals(profile)) { services = saml2MetaManager. - getAuthnAuthorityDescriptor(realm, idpEntityID). + getAuthnAuthorityDescriptor(realm, idpEntityID).getValue(). getAssertionIDRequestService(); } else if ( SAML2Constants.ARTIFACT_RESOLUTION_SERVICE.equals(profile)) { - services = idpDescriptor.getArtifactResolutionService(); + services = idpDescriptor.getValue().getArtifactResolutionService(); } else if ( SAML2Constants.SLO_SERVICE.equals(profile)) { - services = idpDescriptor.getSingleLogoutService(); + services = idpDescriptor.getValue().getSingleLogoutService(); } else if ( SAML2Constants.MNI_SERVICE.equals(profile)) { - services = idpDescriptor.getManageNameIDService(); + services = idpDescriptor.getValue().getManageNameIDService(); } if ((services != null) && (!services.isEmpty())) { - Iterator iter = services.iterator(); + Iterator> iter = services.iterator(); while (iter.hasNext()) { - EndpointType endpoint = (EndpointType) iter.next(); + EndpointType endpoint = iter.next().getValue(); if (binding.equals(endpoint.getBinding())) { return true; } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/key/KeyUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/key/KeyUtil.java index 56c0a7d16d..38b7065e3a 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/key/KeyUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/key/KeyUtil.java @@ -25,6 +25,7 @@ * $Id: KeyUtil.java,v 1.10 2009/08/28 23:42:14 exu Exp $ * * Portions Copyrighted 2013-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.key; @@ -42,6 +43,9 @@ import java.util.Set; import com.sun.identity.saml2.common.SAML2Utils; +import com.sun.identity.saml2.jaxb.metadata.EncryptionMethodElement; +import com.sun.identity.saml2.jaxb.metadata.KeyDescriptorElement; +import com.sun.identity.saml2.jaxb.metadata.KeyTypes; import org.apache.xml.security.encryption.XMLCipher; import com.sun.identity.common.SystemConfigurationUtil; @@ -224,7 +228,7 @@ public static Set getVerificationCerts(RoleDescriptorType roleD ); return null; } - List keyDescriptors = getKeyDescriptors(roleDescriptor, SAML2Constants.SIGNING); + List keyDescriptors = getKeyDescriptors(roleDescriptor, SAML2Constants.SIGNING); if (keyDescriptors.isEmpty()) { SAML2SDKUtils.debug.error( classMethod+ @@ -234,7 +238,7 @@ public static Set getVerificationCerts(RoleDescriptorType roleD return certificates; } - for (KeyDescriptorType keyDescriptor : keyDescriptors) { + for (KeyDescriptorElement keyDescriptor : keyDescriptors) { certificates.add(getCert(keyDescriptor)); } if (certificates.isEmpty()) { @@ -288,7 +292,7 @@ public static EncInfo getEncInfo( ); return null; } - KeyDescriptorType kd = + KeyDescriptorElement kd = getKeyDescriptor(roled, SAML2Constants.ENCRYPTION); if (kd == null) { SAML2SDKUtils.debug.error( @@ -307,12 +311,12 @@ public static EncInfo getEncInfo( ); return null; } - List emList = kd.getEncryptionMethod(); + List emList = kd.getValue().getEncryptionMethod(); EncryptionMethodType em = null; String algorithm = null; int keySize = 0; if (emList != null && !emList.isEmpty()) { - em = (EncryptionMethodType)emList.get(0); + em = emList.get(0).getValue(); if (em != null) { algorithm = em.getAlgorithm(); List cList = em.getContent(); @@ -353,16 +357,16 @@ public static EncInfo getEncInfo( * @param usage Type of the {@link KeyDescriptorType}s to be retrieved. Its value is "encryption" or "signing". * @return {@link KeyDescriptorType}s in {@link RoleDescriptorType} that matched the usage type. */ - public static List getKeyDescriptors(RoleDescriptorType roleDescriptor, String usage) { - List keyDescriptors = roleDescriptor.getKeyDescriptor(); - List matches = new ArrayList<>(keyDescriptors.size()); - List keyDescriptorsWithoutUsage = new ArrayList<>(keyDescriptors.size()); - - for (KeyDescriptorType keyDescriptor : keyDescriptors) { - String use = keyDescriptor.getUse(); - if (StringUtils.isBlank(use)) { + public static List getKeyDescriptors(RoleDescriptorType roleDescriptor, String usage) { + List keyDescriptors = roleDescriptor.getKeyDescriptor(); + List matches = new ArrayList<>(keyDescriptors.size()); + List keyDescriptorsWithoutUsage = new ArrayList<>(keyDescriptors.size()); + + for (KeyDescriptorElement keyDescriptor : keyDescriptors) { + KeyTypes use = keyDescriptor.getValue().getUse(); + if (use == null || StringUtils.isBlank(use.value())) { keyDescriptorsWithoutUsage.add(keyDescriptor); - } else if (use.trim().toLowerCase().equals(usage)) { + } else if (use.value().trim().toLowerCase().equals(usage)) { matches.add(keyDescriptor); } } @@ -381,11 +385,11 @@ public static List getKeyDescriptors(RoleDescriptorType roleD * @return KeyDescriptorType in RoleDescriptorType that matched * the usage type. */ - public static KeyDescriptorType getKeyDescriptor( + public static KeyDescriptorElement getKeyDescriptor( RoleDescriptorType roled, String usage ) { - final List keyDescriptors = getKeyDescriptors(roled, usage); + final List keyDescriptors = getKeyDescriptors(roled, usage); return CollectionUtils.getFirstItem(keyDescriptors, null); } @@ -396,11 +400,11 @@ public static KeyDescriptorType getKeyDescriptor( * null if no certificate is included. */ public static java.security.cert.X509Certificate getCert( - KeyDescriptorType kd + KeyDescriptorElement kd ) { String classMethod = "KeyUtil.getCert: "; - KeyInfoType ki = kd.getKeyInfo(); + KeyInfoType ki = kd.getValue().getKeyInfo(); if (ki == null) { SAML2SDKUtils.debug.error(classMethod + "No KeyInfo."); @@ -421,7 +425,7 @@ public static java.security.cert.X509Certificate getCert( return null; } //iterate and search the X509Certificate node - it = data.getX509IssuerSerialOrX509SKIOrX509SubjectName().iterator(); + it = data.getValue().getX509IssuerSerialOrX509SKIOrX509SubjectName().iterator(); com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509Certificate cert = null; while ((cert == null) && it.hasNext()) { Object content = it.next(); @@ -471,7 +475,7 @@ public static java.security.cert.X509Certificate getCert( */ public static Set getPEPVerificationCerts(XACMLAuthzDecisionQueryDescriptorElement pepDescriptor, String entityID) { - return getVerificationCerts(pepDescriptor, entityID, SAML2Constants.PEP_ROLE); + return getVerificationCerts(pepDescriptor.getValue(), entityID, SAML2Constants.PEP_ROLE); } /** @@ -513,7 +517,7 @@ public static EncInfo getPEPEncInfo( ); return null; } - KeyDescriptorType kd = getKeyDescriptor(pepDesc,SAML2Constants.ENCRYPTION); + KeyDescriptorElement kd = getKeyDescriptor(pepDesc.getValue(), SAML2Constants.ENCRYPTION); if (kd == null) { SAML2SDKUtils.debug.error( classMethod+ @@ -533,7 +537,7 @@ public static EncInfo getPEPEncInfo( * @param role the role of the entity . Value can be PEP or PDP. * @return EncInfo the encryption info. */ - private static EncInfo getEncryptionInfo(KeyDescriptorType kd, + private static EncInfo getEncryptionInfo(KeyDescriptorElement kd, String entityID, String role) { String classMethod = "KeyUtil:getEncryptionInfo:"; java.security.cert.X509Certificate cert = getCert(kd); @@ -545,12 +549,12 @@ private static EncInfo getEncryptionInfo(KeyDescriptorType kd, ); return null; } - List emList = kd.getEncryptionMethod(); + List emList = kd.getValue().getEncryptionMethod(); EncryptionMethodType em = null; String algorithm = null; int keySize = 0; if (emList != null && !emList.isEmpty()) { - em = (EncryptionMethodType)emList.get(0); + em = emList.get(0).getValue(); if (em != null) { algorithm = em.getAlgorithm(); List cList = em.getContent(); @@ -586,7 +590,7 @@ private static EncInfo getEncryptionInfo(KeyDescriptorType kd, */ public static Set getPDPVerificationCerts(XACMLPDPDescriptorElement pdpDescriptor, String entityID) { - return getVerificationCerts(pdpDescriptor, entityID, SAML2Constants.PDP_ROLE); + return getVerificationCerts(pdpDescriptor.getValue(), entityID, SAML2Constants.PDP_ROLE); } /** diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/NamespacePrefixMapperImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/NamespacePrefixMapperImpl.java index e8d2e9f521..466e385e00 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/NamespacePrefixMapperImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/NamespacePrefixMapperImpl.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: NamespacePrefixMapperImpl.java,v 1.3 2008/06/25 05:47:49 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.saml2.meta; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; public class NamespacePrefixMapperImpl extends NamespacePrefixMapper { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2COTUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2COTUtils.java index e692d6ffab..f7505f58cc 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2COTUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2COTUtils.java @@ -23,21 +23,21 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: SAML2COTUtils.java,v 1.8 2009/10/28 23:58:58 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.saml2.meta; -import javax.xml.bind.JAXBException; +import com.sun.identity.saml2.jaxb.entityconfig.AttributeElement; +import jakarta.xml.bind.JAXBException; import java.util.Iterator; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.HashSet; -import java.util.logging.Level; + +import com.sun.identity.saml2.jaxb.metadata.RoleDescriptorType; import com.sun.identity.shared.debug.Debug; -import com.sun.identity.saml2.logging.LogUtil; import com.sun.identity.saml2.common.SAML2Constants; import com.sun.identity.saml2.jaxb.entityconfig.AffiliationConfigElement; import com.sun.identity.saml2.jaxb.entityconfig.AttributeType; @@ -52,6 +52,8 @@ import com.sun.identity.saml2.jaxb.metadata.XACMLAuthzDecisionQueryDescriptorElement; import com.sun.identity.saml2.jaxb.metadataextquery.AttributeQueryDescriptorElement; import com.sun.identity.saml2.jaxb.metadata.EntityDescriptorElement; +import jakarta.xml.bind.JAXBElement; + import java.util.ArrayList; /** @@ -125,81 +127,80 @@ public void updateEntityConfig(String realm, String name, String entityId) atype.setName(SAML2Constants.COT_LIST); atype.getValue().add(name); // add to eConfig - EntityConfigElement ele =objFactory.createEntityConfigElement(); - ele.setEntityID(entityId); - ele.setHosted(false); + EntityConfigElement ele = objFactory.createEntityConfigElement(objFactory.createEntityConfigType()); + ele.getValue().setEntityID(entityId); + ele.getValue().setHosted(false); if (isAffiliation) { // handle affiliation case - bctype = objFactory.createAffiliationConfigElement(); - bctype.getAttribute().add(atype); - ele.setAffiliationConfig(bctype); + bctype = new BaseConfigType() {}; + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ele.getValue().setAffiliationConfig(objFactory.createAffiliationConfigElement(bctype)); } else { - List ll = - ele.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + List> ll = + ele.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); // Decide which role EntityDescriptorElement includes - List list = - edes.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + List> list = + edes.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for(Iterator iter = list.iterator(); iter.hasNext();) { + for(Iterator> iter = list.iterator(); iter.hasNext();) { Object obj = iter.next(); if (obj instanceof SPSSODescriptorElement) { - bctype = objFactory.createSPSSOConfigElement(); - bctype.getAttribute().add(atype); - ll.add(bctype); + bctype = new BaseConfigType() {}; + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ll.add(objFactory.createSPSSOConfigElement(bctype)); } else if (obj instanceof IDPSSODescriptorElement) { - bctype = objFactory.createIDPSSOConfigElement(); - bctype.getAttribute().add(atype); - ll.add(bctype); + bctype = new BaseConfigType() {}; + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ll.add(objFactory.createIDPSSOConfigElement(bctype)); } else if (obj instanceof XACMLPDPDescriptorElement) { - bctype = objFactory.createXACMLPDPConfigElement(); - bctype.getAttribute().add(atype); - ll.add(bctype); + bctype = new BaseConfigType() {}; + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ll.add(objFactory.createXACMLPDPConfigElement(bctype)); } else if (obj instanceof XACMLAuthzDecisionQueryDescriptorElement) { - bctype = - objFactory.createXACMLAuthzDecisionQueryConfigElement(); - bctype.getAttribute().add(atype); - ll.add(bctype); + bctype = new BaseConfigType() {}; + + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ll.add(objFactory.createXACMLAuthzDecisionQueryConfigElement(bctype)); } else if (obj instanceof AttributeAuthorityDescriptorElement) { - bctype = - objFactory.createAttributeAuthorityConfigElement(); - bctype.getAttribute().add(atype); - ll.add(bctype); + bctype = new BaseConfigType() {}; + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ll.add(objFactory.createAttributeAuthorityConfigElement(bctype)); } else if (obj instanceof AttributeQueryDescriptorElement){ - bctype = objFactory.createAttributeQueryConfigElement(); - bctype.getAttribute().add(atype); - ll.add(bctype); + bctype = new BaseConfigType() {}; + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ll.add(objFactory.createAttributeQueryConfigElement(bctype)); } else if (obj instanceof AuthnAuthorityDescriptorElement) { - bctype = objFactory.createAuthnAuthorityConfigElement(); - bctype.getAttribute().add(atype); - ll.add(bctype); + bctype = new BaseConfigType() {}; + bctype.getAttribute().add(objFactory.createAttributeElement(atype)); + ll.add(objFactory.createAuthnAuthorityConfigElement(bctype)); } } } metaManager.setEntityConfig(realm,ele); } else { boolean needToSave = true; - List elist = null; + List> elist = null; if (isAffiliation) { AffiliationConfigElement affiliationCfgElm = metaManager.getAffiliationConfig(realm, entityId); - elist = new ArrayList(); + elist = new ArrayList<>(); elist.add(affiliationCfgElm); } else { - elist = eConfig. + elist = eConfig.getValue(). getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); } - for (Iterator iter = elist.iterator(); iter.hasNext();) { + for (Iterator> iter = elist.iterator(); iter.hasNext();) { boolean foundCOT = false; - BaseConfigType bConfig = (BaseConfigType)iter.next(); - List list = bConfig.getAttribute(); - for (Iterator iter2 = list.iterator(); iter2.hasNext();) { - AttributeType avp = (AttributeType)iter2.next(); + BaseConfigType bConfig = iter.next().getValue(); + List list = bConfig.getAttribute(); + for (Iterator iter2 = list.iterator(); iter2.hasNext();) { + AttributeType avp = iter2.next().getValue(); if (avp.getName().trim().equalsIgnoreCase( SAML2Constants.COT_LIST)) { foundCOT = true; - List avpl = avp.getValue(); + List avpl = avp.getValue(); if (avpl.isEmpty() ||!containsValue(avpl,name)) { avpl.add(name); needToSave = true; @@ -212,7 +213,7 @@ public void updateEntityConfig(String realm, String name, String entityId) AttributeType atype = objFactory.createAttributeType(); atype.setName(SAML2Constants.COT_LIST); atype.getValue().add(name); - list.add(atype); + list.add(objFactory.createAttributeElement(atype)); needToSave = true; } } @@ -222,9 +223,9 @@ public void updateEntityConfig(String realm, String name, String entityId) } } - private boolean containsValue(List list, String name) { - for (Iterator iter = list.iterator(); iter.hasNext();) { - if (((String) iter.next()).trim().equalsIgnoreCase(name)) { + private boolean containsValue(List list, String name) { + for (Iterator iter = list.iterator(); iter.hasNext();) { + if (iter.next().trim().equalsIgnoreCase(name)) { return true; } } @@ -273,26 +274,26 @@ public void removeFromEntityConfig(String realm,String name,String entityId) } if (eConfig != null) { - List elist = null; + List> elist = null; if (isAffiliation) { AffiliationConfigElement affiliationCfgElm = metaManager.getAffiliationConfig(realm, entityId); - elist = new ArrayList(); + elist = new ArrayList<>(); elist.add(affiliationCfgElm); } else { - elist = eConfig. + elist = eConfig.getValue(). getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); } boolean needToSave = false; - for (Iterator iter = elist.iterator(); iter.hasNext();) { - BaseConfigType bConfig = (BaseConfigType)iter.next(); - List list = bConfig.getAttribute(); - for (Iterator iter2 = list.iterator(); iter2.hasNext();) { - AttributeType avp = (AttributeType)iter2.next(); + for (Iterator> iter = elist.iterator(); iter.hasNext();) { + BaseConfigType bConfig = iter.next().getValue(); + List list = bConfig.getAttribute(); + for (Iterator iter2 = list.iterator(); iter2.hasNext();) { + AttributeType avp = iter2.next().getValue(); if (avp.getName().trim().equalsIgnoreCase( SAML2Constants.COT_LIST)) { - List avpl = avp.getValue(); + List avpl = avp.getValue(); if (avpl != null && !avpl.isEmpty() && containsValue(avpl,name)) { avpl.remove(name); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaManager.java index 10933eb89a..cce419f23b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaManager.java @@ -25,6 +25,7 @@ * $Id: SAML2MetaManager.java,v 1.18 2009/10/28 23:58:58 exu Exp $ * * Portions Copyrighted 2010-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.meta; @@ -37,8 +38,9 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBElement; import org.forgerock.openam.utils.CollectionUtils; import org.forgerock.openam.utils.StringUtils; @@ -374,7 +376,7 @@ public AffiliationDescriptorType getAffiliationDescriptor( entityId); return (eDescriptor == null ? null : - eDescriptor.getAffiliationDescriptor()); + eDescriptor.getValue().getAffiliationDescriptor()); } /** @@ -388,7 +390,7 @@ public void setEntityDescriptor( EntityDescriptorElement descriptor) throws SAML2MetaException { - String entityId = descriptor.getEntityID(); + String entityId = descriptor.getValue().getEntityID(); if (entityId == null) { debug.error( "SAML2MetaManager.setEntityDescriptor: entity ID is null"); @@ -465,9 +467,9 @@ public void createEntity( } String entityId = null; if (descriptor != null) { - entityId = descriptor.getEntityID(); + entityId = descriptor.getValue().getEntityID(); } else { - entityId = config.getEntityID(); + entityId = config.getValue().getEntityID(); } if (realm == null) { @@ -526,10 +528,10 @@ public void createEntity( } if (oldDescriptor != null) { if (descriptor != null) { - List currentRoles = oldDescriptor. + List currentRoles = oldDescriptor.getValue(). getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); Set currentRolesTypes = getEntityRolesTypes(currentRoles); - List newRoles = descriptor. + List newRoles = descriptor.getValue(). getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); for (Iterator i = newRoles.iterator(); i.hasNext(); ) { Object role = i.next(); @@ -572,10 +574,10 @@ public void createEntity( objs); } if (oldConfig != null) { - List currentRoles = oldConfig. + List currentRoles = oldConfig.getValue(). getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); Set currentRolesTypes = getEntityRolesTypes(currentRoles); - List newRoles = config. + List newRoles = config.getValue(). getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); for (Iterator i = newRoles.iterator(); i.hasNext(); ) { Object role = i.next(); @@ -818,9 +820,9 @@ public SPSSOConfigElement getSPSSOConfig(String realm, String entityId) return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { Object obj = iter.next(); if (obj instanceof SPSSOConfigElement) { return (SPSSOConfigElement)obj; @@ -845,10 +847,10 @@ public XACMLPDPConfigElement getPolicyDecisionPointConfig( EntityConfigElement eConfig = getEntityConfig(realm, entityId); if (eConfig != null) { - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for (Iterator i = list.iterator(); i.hasNext() && (elm == null);) { - Object obj = i.next(); + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for (Iterator> i = list.iterator(); i.hasNext() && (elm == null);) { + JAXBElement obj = i.next(); if (obj instanceof XACMLPDPConfigElement) { elm = (XACMLPDPConfigElement)obj; } @@ -872,10 +874,10 @@ public XACMLAuthzDecisionQueryConfigElement getPolicyEnforcementPointConfig( EntityConfigElement eConfig = getEntityConfig(realm, entityId); if (eConfig != null) { - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for (Iterator i = list.iterator(); i.hasNext() && (elm == null);) { - Object obj = i.next(); + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for (Iterator> i = list.iterator(); i.hasNext() && (elm == null);) { + JAXBElement obj = i.next(); if (obj instanceof XACMLAuthzDecisionQueryConfigElement) { elm = (XACMLAuthzDecisionQueryConfigElement)obj; } @@ -901,10 +903,10 @@ public IDPSSOConfigElement getIDPSSOConfig(String realm, String entityId) return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof IDPSSOConfigElement) { return (IDPSSOConfigElement)obj; } @@ -931,10 +933,10 @@ public AttributeAuthorityConfigElement getAttributeAuthorityConfig( return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof AttributeAuthorityConfigElement) { return (AttributeAuthorityConfigElement)obj; } @@ -961,10 +963,10 @@ public AttributeQueryConfigElement getAttributeQueryConfig( return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof AttributeQueryConfigElement) { return (AttributeQueryConfigElement)obj; } @@ -992,7 +994,7 @@ public AuthnAuthorityConfigElement getAuthnAuthorityConfig( } List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); for(Iterator iter = list.iterator(); iter.hasNext();) { Object obj = iter.next(); if (obj instanceof AuthnAuthorityConfigElement) { @@ -1020,7 +1022,7 @@ public AffiliationConfigElement getAffiliationConfig( return null; } - return (AffiliationConfigElement)eConfig.getAffiliationConfig(); + return (AffiliationConfigElement)eConfig.getValue().getAffiliationConfig(); } /** @@ -1032,7 +1034,7 @@ public AffiliationConfigElement getAffiliationConfig( public void setEntityConfig(String realm, EntityConfigElement config) throws SAML2MetaException { - String entityId = config.getEntityID(); + String entityId = config.getValue().getEntityID(); if (entityId == null) { debug.error("SAML2MetaManager.setEntityConfig: " + "entity ID is null"); @@ -1101,15 +1103,15 @@ private void addToCircleOfTrust( { try { if (eConfig != null) { - List elist = eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + List> elist = eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); // Use first one to add the entity to COT, if this is present in the config // Typically found in the proprietary extended metadata, not standard SAML2 entity metadata - BaseConfigType config = (BaseConfigType) elist.iterator().next(); - Map attr = SAML2MetaUtils.getAttributes(config); - List cotList = (List) attr.get(SAML2Constants.COT_LIST); + BaseConfigType config = elist.iterator().next().getValue(); + Map> attr = SAML2MetaUtils.getAttributes(config); + List cotList = attr.get(SAML2Constants.COT_LIST); if (CollectionUtils.isNotEmpty(cotList)) { - for (Iterator iter = cotList.iterator(); iter.hasNext();) { - String cotName = ((String) iter.next()).trim(); + for (Iterator iter = cotList.iterator(); iter.hasNext();) { + String cotName = iter.next().trim(); if (StringUtils.isNotEmpty(cotName)) { cotm.addCircleOfTrustMember(realm, cotName, COTConstants.SAML2, entityId, false); } @@ -1186,25 +1188,25 @@ private void removeFromCircleOfTrust(String realm, String entityId) { } if (eConfig != null) { - List elist = null; + List> elist = null; if (isAffiliation) { AffiliationConfigElement affiliationCfgElm = getAffiliationConfig(realm, entityId); - elist = new ArrayList(); + elist = new ArrayList<>(); elist.add(affiliationCfgElm); } else { - elist = eConfig. + elist = eConfig.getValue(). getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); } // use first one to delete the entity from COT - BaseConfigType config = (BaseConfigType)elist.iterator().next(); - Map attr = SAML2MetaUtils.getAttributes(config); - List cotAttr = (List) attr.get(SAML2Constants.COT_LIST); - List cotList = new ArrayList(cotAttr); + BaseConfigType config = elist.iterator().next().getValue(); + Map> attr = SAML2MetaUtils.getAttributes(config); + List cotAttr = attr.get(SAML2Constants.COT_LIST); + List cotList = new ArrayList<>(cotAttr); if ((cotList != null) && !cotList.isEmpty()) { - for (Iterator iter = cotList.iterator(); iter.hasNext();) { - String cotName = ((String) iter.next()).trim(); + for (Iterator iter = cotList.iterator(); iter.hasNext();) { + String cotName = iter.next().trim(); if ((cotName != null) && (!cotName.equals(""))) { cotm.removeCircleOfTrustMember(realm, cotName, COTConstants.SAML2, entityId, false); @@ -1235,7 +1237,7 @@ public List getAllHostedEntities(String realm) String entityId = (String)iter.next(); EntityConfigElement config = getEntityConfig(realm, entityId); - if (config != null && config.isHosted()) { + if (config != null && config.getValue().isHosted()) { hostedEntityIds.add(entityId); } } @@ -1406,7 +1408,7 @@ public List getAllRemoteEntities(String realm) String entityId = (String)iter.next(); EntityConfigElement config = getEntityConfig(realm, entityId); - if (config == null || !config.isHosted()) { + if (config == null || !config.getValue().isHosted()) { remoteEntityIds.add(entityId); } } @@ -1490,13 +1492,13 @@ public String getEntityByMetaAlias(String metaAlias) for (Iterator iter = entityIds.iterator(); iter.hasNext();) { String entityId = (String)iter.next(); EntityConfigElement config = getEntityConfig(realm, entityId); - if ((config == null) || !config.isHosted()) { + if ((config == null) || !config.getValue().isHosted()) { continue; } - List list = - config.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for(Iterator iter2 = list.iterator(); iter2.hasNext();) { - BaseConfigType bConfig = (BaseConfigType)iter2.next(); + List> list = + config.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for(Iterator> iter2 = list.iterator(); iter2.hasNext();) { + BaseConfigType bConfig = iter2.next().getValue(); String cMetaAlias = bConfig.getMetaAlias(); if (cMetaAlias != null && cMetaAlias.equals(metaAlias)) { return entityId; @@ -1528,12 +1530,12 @@ public List getAllHostedMetaAliasesByRealm(String realm) throws SAML2Met } for (String entityId : entityIds) { EntityConfigElement config = getEntityConfig(realm, entityId); - if (config == null || !config.isHosted()) { + if (config == null || !config.getValue().isHosted()) { continue; } - List configList = config.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for (BaseConfigType bConfigType : configList) { - String curMetaAlias = bConfigType.getMetaAlias(); + List> configList = config.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for (JAXBElement bConfigType : configList) { + String curMetaAlias = bConfigType.getValue().getMetaAlias(); if (curMetaAlias != null && !curMetaAlias.isEmpty()) { metaAliases.add(curMetaAlias); } @@ -1572,22 +1574,22 @@ public String getRoleByMetaAlias(String metaAlias) getPolicyEnforcementPointConfig(realm, entityId); if (idpConfig != null) { - String m = idpConfig.getMetaAlias(); + String m = idpConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.IDP_ROLE; } } else if (spConfig != null) { - String m = spConfig.getMetaAlias(); + String m = spConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.SP_ROLE; } } else if (pdpConfig != null) { - String m = pdpConfig.getMetaAlias(); + String m = pdpConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.PDP_ROLE; } } else if (pepConfig != null) { - String m = pepConfig.getMetaAlias(); + String m = pepConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.PEP_ROLE; } @@ -1613,7 +1615,7 @@ public List getAllHostedIdentityProviderMetaAliases(String realm) for(Iterator iter = hostedEntityIds.iterator(); iter.hasNext();) { String entityId = (String)iter.next(); if ((idpConfig = getIDPSSOConfig(realm, entityId)) != null) { - metaAliases.add(idpConfig.getMetaAlias()); + metaAliases.add(idpConfig.getValue().getMetaAlias()); } } @@ -1636,7 +1638,7 @@ public List getAllHostedServiceProviderMetaAliases(String realm) for(Iterator iter = hostedEntityIds.iterator(); iter.hasNext();) { String entityId = (String)iter.next(); if ((spConfig = getSPSSOConfig(realm, entityId)) != null) { - metaAliases.add(spConfig.getMetaAlias()); + metaAliases.add(spConfig.getValue().getMetaAlias()); } } @@ -1659,7 +1661,7 @@ public List getAllHostedPolicyDecisionPointMetaAliases(String realm) XACMLPDPConfigElement elm = getPolicyDecisionPointConfig( realm, entityId); if (elm != null) { - metaAliases.add(elm.getMetaAlias()); + metaAliases.add(elm.getValue().getMetaAlias()); } } return metaAliases; @@ -1684,7 +1686,7 @@ public List getAllHostedPolicyEnforcementPointMetaAliases(String realm) XACMLAuthzDecisionQueryConfigElement elm = getPolicyEnforcementPointConfig(realm, entityId); if (elm != null) { - metaAliases.add(elm.getMetaAlias()); + metaAliases.add(elm.getValue().getMetaAlias()); } } return metaAliases; @@ -1707,7 +1709,7 @@ public boolean isTrustedProvider(String realm, String entityId, SPSSOConfigElement spconfig = getSPSSOConfig(realm, entityId); if (spconfig != null) { - result = isSameCircleOfTrust(spconfig, realm, + result = isSameCircleOfTrust(spconfig.getValue(), realm, trustedEntityId); } if (result) { @@ -1716,7 +1718,7 @@ public boolean isTrustedProvider(String realm, String entityId, IDPSSOConfigElement idpconfig = getIDPSSOConfig(realm, entityId); if (idpconfig !=null) { - return (isSameCircleOfTrust(idpconfig, realm, + return (isSameCircleOfTrust(idpconfig.getValue(), realm, trustedEntityId)); } return false; @@ -1747,13 +1749,13 @@ public boolean isTrustedXACMLProvider(String realm, String entityId, XACMLPDPConfigElement pdpConfig = getPolicyDecisionPointConfig(realm,entityId); if (pdpConfig != null) { - result = isSameCircleOfTrust(pdpConfig,realm, + result = isSameCircleOfTrust(pdpConfig.getValue(),realm, trustedEntityId); } } else if (role.equals(SAML2Constants.PEP_ROLE)) { XACMLAuthzDecisionQueryConfigElement pepConfig = getPolicyEnforcementPointConfig(realm,entityId); - result = isSameCircleOfTrust(pepConfig,realm,trustedEntityId); + result = isSameCircleOfTrust(pepConfig.getValue(),realm,trustedEntityId); } } return result; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaSecurityUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaSecurityUtils.java index 877be42ea8..4a51957842 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaSecurityUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaSecurityUtils.java @@ -25,6 +25,7 @@ * $Id: SAML2MetaSecurityUtils.java,v 1.6 2009/06/08 23:43:18 madan_ranganath Exp $ * * Portions Copyrighted 2010-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.meta; @@ -37,8 +38,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import java.util.stream.Collectors; -import javax.xml.bind.JAXBException; +import com.sun.identity.saml2.jaxb.metadata.KeyTypes; +import jakarta.xml.bind.JAXBException; import com.sun.identity.saml.xmlsig.AMSignatureProvider; import com.sun.identity.saml2.jaxb.metadata.KeyDescriptorType; @@ -173,13 +176,13 @@ public static Document sign(String realm, EntityDescriptorElement descriptor) SAML2MetaManager metaManager = new SAML2MetaManager(); - EntityConfigElement cfgElem = metaManager.getEntityConfig(realm, descriptor.getEntityID()); + EntityConfigElement cfgElem = metaManager.getEntityConfig(realm, descriptor.getValue().getEntityID()); boolean isHosted; if (cfgElem == null) { //if there is no EntityConfig, this is considered as a remote entity isHosted = false; } else { - isHosted = cfgElem.isHosted(); + isHosted = cfgElem.getValue().isHosted(); } String signingCert = getRealmSetting(METADATA_SIGNING_KEY, realm); @@ -469,7 +472,7 @@ public static void updateProviderKeyInfo(String realm, SAML2MetaManager metaManager = new SAML2MetaManager(); EntityConfigElement config = metaManager.getEntityConfig(realm, entityID); - if (!config.isHosted()) { + if (!config.getValue().isHosted()) { String[] args = {entityID, realm}; throw new SAML2MetaException("entityNotHosted", args); } @@ -477,15 +480,15 @@ public static void updateProviderKeyInfo(String realm, BaseConfigType baseConfig; RoleDescriptorType descriptor; if (isIDP) { - baseConfig = SAML2MetaUtils.getIDPSSOConfig(config); - descriptor = SAML2MetaUtils.getIDPSSODescriptor(desp); + baseConfig = SAML2MetaUtils.getIDPSSOConfig(config).getValue(); + descriptor = SAML2MetaUtils.getIDPSSODescriptor(desp).getValue(); if (baseConfig == null || descriptor == null) { String[] args = {entityID, realm}; throw new SAML2MetaException("entityNotIDP", args); } } else { - baseConfig = SAML2MetaUtils.getSPSSOConfig(config); - descriptor = SAML2MetaUtils.getSPSSODescriptor(desp); + baseConfig = SAML2MetaUtils.getSPSSOConfig(config).getValue(); + descriptor = SAML2MetaUtils.getSPSSODescriptor(desp).getValue(); if (baseConfig == null || descriptor == null) { String[] args = {entityID, realm}; throw new SAML2MetaException("entityNotSP", args); @@ -504,7 +507,7 @@ public static void updateProviderKeyInfo(String realm, } else { Set keyDescriptors = new LinkedHashSet<>(certAliases.size()); for (String certAlias : certAliases) { - keyDescriptors.add(getKeyDescriptor(certAlias, isSigning, encAlgo, keySize)); + keyDescriptors.add(getKeyDescriptor(certAlias, isSigning, encAlgo, keySize).getValue()); } updateKeyDescriptor(descriptor, keyDescriptors); @@ -520,18 +523,22 @@ public static void updateProviderKeyInfo(String realm, } private static void updateKeyDescriptor(RoleDescriptorType desp, Set keyDescriptors) { - String use = keyDescriptors.iterator().next().getUse(); - List keys = desp.getKeyDescriptor(); + KeyTypes keyTypes = keyDescriptors.iterator().next().getUse(); + String use = keyTypes != null ? keyTypes.value() : null; + List keys = desp.getKeyDescriptor(); - Iterator iterator = keys.iterator(); + Iterator iterator = keys.iterator(); while (iterator.hasNext()) { - final KeyDescriptorType keyDescriptor = iterator.next(); - if (keyDescriptor.getUse().equalsIgnoreCase(use)) { + final KeyDescriptorElement keyDescriptor = iterator.next(); + if (keyDescriptor.getValue().getUse().value().equalsIgnoreCase(use)) { iterator.remove(); } } - - desp.getKeyDescriptor().addAll(keyDescriptors); + com.sun.identity.saml2.jaxb.metadata.ObjectFactory of + = new com.sun.identity.saml2.jaxb.metadata.ObjectFactory(); + List newDesc = + keyDescriptors.stream().map(of::createKeyDescriptorElement).collect(Collectors.toList()); + desp.getKeyDescriptor().addAll(newDesc); } private static void removeKeyDescriptor(RoleDescriptorType desp, @@ -543,8 +550,8 @@ private static void removeKeyDescriptor(RoleDescriptorType desp, if (isSigningUse) { keyUse = "signing"; } - if ((key.getUse() != null) && - key.getUse().equalsIgnoreCase(keyUse)) { + if (key.getValue() != null && (key.getValue().getUse() != null) && + key.getValue().getUse().value().equalsIgnoreCase(keyUse)) { iter.remove(); } } @@ -553,23 +560,19 @@ private static void removeKeyDescriptor(RoleDescriptorType desp, private static void setExtendedAttributeValue( BaseConfigType config, String attrName, Set attrVal) throws SAML2MetaException { - try { - List attributes = config.getAttribute(); - for(Iterator iter = attributes.iterator(); iter.hasNext();) { - AttributeType avp = (AttributeType)iter.next(); - if (avp.getName().trim().equalsIgnoreCase(attrName)) { - iter.remove(); - } - } - if (attrVal != null) { - ObjectFactory factory = new ObjectFactory(); - AttributeType atype = factory.createAttributeType(); - atype.setName(attrName); - atype.getValue().addAll(attrVal); - config.getAttribute().add(atype); + List attributes = config.getAttribute(); + for(Iterator iter = attributes.iterator(); iter.hasNext();) { + AttributeType avp = (AttributeType)iter.next(); + if (avp.getName().trim().equalsIgnoreCase(attrName)) { + iter.remove(); } - } catch (JAXBException e) { - throw new SAML2MetaException(e); + } + if (attrVal != null) { + ObjectFactory factory = new ObjectFactory(); + AttributeType atype = factory.createAttributeType(); + atype.setName(attrName); + atype.getValue().addAll(attrVal); + config.getAttribute().add(factory.createAttributeElement(atype)); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaUtils.java index be2a0cfc33..58b51414e0 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/meta/SAML2MetaUtils.java @@ -25,6 +25,7 @@ * $Id: SAML2MetaUtils.java,v 1.9 2009/09/21 17:28:12 exu Exp $ * * Portions Copyrighted 2010-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.meta; @@ -40,10 +41,12 @@ import java.util.ResourceBundle; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import com.sun.identity.saml2.jaxb.entityconfig.AttributeElement; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -54,7 +57,6 @@ import com.sun.identity.shared.xml.XMLUtils; import com.sun.identity.saml2.common.SAML2Constants; -import com.sun.identity.saml2.jaxb.entityconfig.AttributeType; import com.sun.identity.saml2.jaxb.entityconfig.BaseConfigType; import com.sun.identity.saml2.jaxb.entityconfig.IDPSSOConfigElement; import com.sun.identity.saml2.jaxb.entityconfig.SPSSOConfigElement; @@ -81,16 +83,16 @@ public final class SAML2MetaUtils { "com.sun.identity.saml2.jaxb.xmlsig:" + "com.sun.identity.saml2.jaxb.assertion:" + "com.sun.identity.saml2.jaxb.metadata:" + - "com.sun.identity.saml2.jaxb.metadataattr:" + - "com.sun.identity.saml2.jaxb.entityconfig:" + - "com.sun.identity.saml2.jaxb.schema"; + "com.sun.identity.saml2.jaxb.metadataattr:" + + "com.sun.identity.saml2.jaxb.metadataextquery:" + + "com.sun.identity.saml2.jaxb.entityconfig"; private static final String JAXB_PACKAGE_LIST_PROP = "com.sun.identity.liberty.ws.jaxb.packageList"; private static JAXBContext jaxbContext = null; private static final String PROP_JAXB_FORMATTED_OUTPUT = "jaxb.formatted.output"; private static final String PROP_NAMESPACE_PREFIX_MAPPER = - "com.sun.xml.bind.namespacePrefixMapper"; + "org.glassfish.jaxb.namespacePrefixMapper"; private static NamespacePrefixMapperImpl nsPrefixMapper = new NamespacePrefixMapperImpl(); @@ -215,12 +217,12 @@ public static void convertJAXBToOutputStream(Object jaxbObj, * converted from the JAXB object. * @exception JAXBException if an error occurs while converting JAXB object */ - protected static Map convertJAXBToAttrMap(String attrName, Object jaxbObj) + protected static Map> convertJAXBToAttrMap(String attrName, Object jaxbObj) throws JAXBException { String xmlString = convertJAXBToString(jaxbObj); - Map attrs = new HashMap(); - Set values = new HashSet(); + Map> attrs = new HashMap<>(); + Set values = new HashSet<>(); values.add(xmlString); attrs.put(attrName, values); @@ -236,9 +238,9 @@ protected static Map convertJAXBToAttrMap(String attrName, Object jaxbObj) */ public static Map> getAttributes(BaseConfigType config) { Map> attrMap = new HashMap<>(); - List list = config.getAttribute(); - for (AttributeType avp : list) { - attrMap.put(avp.getName(), avp.getValue()); + List list = config.getAttribute(); + for (AttributeElement avp : list) { + attrMap.put(avp.getValue().getName(), avp.getValue().getValue()); } return attrMap; @@ -297,13 +299,13 @@ public static XACMLPDPDescriptorElement getPolicyDecisionPointDescriptor( XACMLPDPDescriptorElement descriptor = null; if (eDescriptor != null) { - List list = - eDescriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + List> list = + eDescriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for (Iterator i = list.iterator(); - i.hasNext() && (descriptor == null); + for (Iterator> i = list.iterator(); + i.hasNext() && (descriptor == null); ) { - Object obj = i.next(); + JAXBElement obj = i.next(); if (obj instanceof XACMLPDPDescriptorElement) { descriptor = (XACMLPDPDescriptorElement)obj; } @@ -328,13 +330,13 @@ public static XACMLPDPDescriptorElement getPolicyDecisionPointDescriptor( XACMLAuthzDecisionQueryDescriptorElement descriptor = null; if (eDescriptor != null) { - List list = - eDescriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + List> list = + eDescriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for (Iterator i = list.iterator(); - i.hasNext() && (descriptor == null); + for (Iterator> i = list.iterator(); + i.hasNext() && (descriptor == null); ) { - Object obj = i.next(); + JAXBElement obj = i.next(); if (obj instanceof XACMLAuthzDecisionQueryDescriptorElement) { descriptor = (XACMLAuthzDecisionQueryDescriptorElement)obj; } @@ -358,10 +360,10 @@ public static SPSSODescriptorElement getSPSSODescriptor( return null; } - List list = - eDescriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list = + eDescriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); // TODO: may need to cache to avoid using instanceof if (obj instanceof SPSSODescriptorElement) { return (SPSSODescriptorElement)obj; @@ -385,10 +387,10 @@ public static IDPSSODescriptorElement getIDPSSODescriptor( return null; } - List list = - eDescriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list + = eDescriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof IDPSSODescriptorElement) { return (IDPSSODescriptorElement)obj; } @@ -411,11 +413,11 @@ public static IDPSSODescriptorElement getIDPSSODescriptor( return null; } - List list = - eDescriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + List> list = + eDescriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof AttributeAuthorityDescriptorElement) { return (AttributeAuthorityDescriptorElement)obj; } @@ -438,11 +440,11 @@ public static IDPSSODescriptorElement getIDPSSODescriptor( return null; } - List list = - eDescriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + List> list + = eDescriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof AttributeQueryDescriptorElement) { return (AttributeQueryDescriptorElement)obj; } @@ -465,11 +467,11 @@ public static IDPSSODescriptorElement getIDPSSODescriptor( return null; } - List list = - eDescriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + List> list = + eDescriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof AuthnAuthorityDescriptorElement) { return (AuthnAuthorityDescriptorElement)obj; } @@ -534,10 +536,9 @@ public static SPSSOConfigElement getSPSSOConfig(EntityConfigElement eConfig) return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list = eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof SPSSOConfigElement) { return (SPSSOConfigElement)obj; } @@ -561,10 +562,9 @@ public static IDPSSOConfigElement getIDPSSOConfig( return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list = eConfig.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof IDPSSOConfigElement) { return (IDPSSOConfigElement)obj; } @@ -687,13 +687,13 @@ private static Object preProcessSAML2Document(Document doc) throws SAML2MetaExce private static List importSAML2Entites(SAML2MetaManager metaManager, String realm, EntitiesDescriptorElement descriptor) throws SAML2MetaException { - List result = new ArrayList(); + List result = new ArrayList<>(); - List descriptors = descriptor.getEntityDescriptorOrEntitiesDescriptor(); + List> descriptors = descriptor.getValue().getEntityDescriptorOrEntitiesDescriptor(); if (descriptors != null && !descriptors.isEmpty()) { - Iterator entities = descriptors.iterator(); + Iterator> entities = descriptors.iterator(); while (entities.hasNext()) { - Object o = entities.next(); + JAXBElement o = entities.next(); if (o instanceof EntityDescriptorElement) { String entityId = importSAML2Entity(metaManager, realm, (EntityDescriptorElement) o); @@ -712,16 +712,17 @@ private static String importSAML2Entity(SAML2MetaManager metaManager, String rea String result = null; - List roles = descriptor.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - Iterator it = roles.iterator(); + List> roles + = descriptor.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + Iterator> it = roles.iterator(); while (it.hasNext()) { - RoleDescriptorType role = (RoleDescriptorType)it.next(); - List protocols = role.getProtocolSupportEnumeration(); + RoleDescriptorType role = it.next().getValue(); + List protocols = role.getProtocolSupportEnumeration(); if (!protocols.contains(SAML2Constants.PROTOCOL_NAMESPACE)) { if (debug.messageEnabled()) { debug.message("SAML2MetaUtils.importSAML2Entity: " + "Removing non-SAML2 role from entity " - + descriptor.getEntityID()); + + descriptor.getValue().getEntityID()); } it.remove(); } @@ -729,7 +730,7 @@ private static String importSAML2Entity(SAML2MetaManager metaManager, String rea if (roles.size() > 0) { metaManager.createEntityDescriptor(realm, descriptor); - result = descriptor.getEntityID(); + result = descriptor.getValue().getEntityID(); } return result; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAccountMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAccountMapper.java index 9b723f62a8..09c7e51725 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAccountMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAccountMapper.java @@ -25,6 +25,7 @@ * $Id: DefaultAccountMapper.java,v 1.4 2008/06/25 05:47:50 qcheng Exp $ * * Portions Copyrighted 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.plugins; @@ -207,9 +208,9 @@ protected String getAttribute(String realm, protected final BaseConfigType getSSOConfig(String realm, String entityID) throws SAML2MetaException { if (IDP.equals(role)) { - return metaManager.getIDPSSOConfig(realm, entityID); + return metaManager.getIDPSSOConfig(realm, entityID).getValue(); } else { - return metaManager.getSPSSOConfig(realm, entityID); + return metaManager.getSPSSOConfig(realm, entityID).getValue(); } } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultFedletAdapter.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultFedletAdapter.java index 204417ef83..47f9084c72 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultFedletAdapter.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultFedletAdapter.java @@ -24,7 +24,7 @@ * * $Id: DefaultFedletAdapter.java,v 1.2 2009/06/17 03:09:13 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.plugins; @@ -102,7 +102,7 @@ public boolean doFedletSLO ( try { if (logoutUrl == null) { BaseConfigType spConfig = SAML2Utils.getSAML2MetaManager() - .getSPSSOConfig("/", hostedEntityID); + .getSPSSOConfig("/", hostedEntityID).getValue(); List appLogoutURL = (List) SAML2MetaUtils.getAttributes( spConfig).get(SAML2Constants.APP_LOGOUT_URL); if ((appLogoutURL != null) && !appLogoutURL.isEmpty()) { @@ -262,7 +262,7 @@ private void onFedletSLOSuccessOrFailure( try { if (logoutUrl == null) { BaseConfigType spConfig = SAML2Utils.getSAML2MetaManager() - .getSPSSOConfig("/", hostedEntityID); + .getSPSSOConfig("/", hostedEntityID).getValue(); List appLogoutURL = (List) SAML2MetaUtils.getAttributes( spConfig).get(SAML2Constants.APP_LOGOUT_URL); if ((appLogoutURL != null) && !appLogoutURL.isEmpty()) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/ECPIDPFinder.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/ECPIDPFinder.java index 9198141893..1c7f0c70bb 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/ECPIDPFinder.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/ECPIDPFinder.java @@ -24,7 +24,7 @@ * * $Id: ECPIDPFinder.java,v 1.2 2008/06/25 05:47:51 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.plugins; @@ -63,7 +63,7 @@ public List getPreferredIDP(AuthnRequest authnRequest, SPSSOConfigElement spssoconfig = SAML2Utils.getSAML2MetaManager() .getSPSSOConfig(realm, hostProviderID); - Map attributes = SAML2MetaUtils.getAttributes(spssoconfig); + Map attributes = SAML2MetaUtils.getAttributes(spssoconfig.getValue()); List idps = (List)attributes.get(SAML2Constants.ECP_REQUEST_IDP_LIST); if ((idps == null) || (idps.isEmpty())) { return null; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java index 5158935a90..3b17958208 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java @@ -21,7 +21,7 @@ * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.plugins; @@ -59,6 +59,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; +import jakarta.xml.bind.JAXBElement; import org.apache.commons.lang3.StringUtils; /** @@ -143,7 +144,7 @@ public List getPreferredIDP( sm.getSPSSOConfig(realm, authnRequest.getIssuer().getValue()); Map spConfigAttrsMap = null; if (spEntityCfg != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg.getValue()); } // Check if the local configuration of the remote SP wants to use @@ -341,7 +342,7 @@ private String selectIDPBasedOnLOA(List idpList, String realm, AuthnRequ debugMessage(classMethod, "IDP is: " + idp); idpDesc = SAML2Utils.getSAML2MetaManager().getEntityDescriptor(realm, idp); if (idpDesc != null) { - ExtensionsType et = idpDesc.getExtensions(); + ExtensionsType et = idpDesc.getValue().getExtensions(); if (et != null) { debugMessage(classMethod, "Extensions found for idp: " + idp); List idpExtensions = et.getAny(); @@ -352,21 +353,21 @@ private String selectIDPBasedOnLOA(List idpList, String realm, AuthnRequ EntityAttributesElement eael = (EntityAttributesElement) idpExtensionsI.next(); if (eael != null) { debugMessage(classMethod, "Entity Attributes found for idp: " + idp); - List attribL = eael.getAttributeOrAssertion(); + List> attribL = eael.getValue().getAttributeOrAssertion(); if (attribL != null || !attribL.isEmpty()) { Iterator attrI = attribL.iterator(); while (attrI.hasNext()) { AttributeElement ae = (AttributeElement) attrI.next(); // TODO: Verify what type of element this is (Attribute or assertion) // For validation purposes - List av = ae.getAttributeValue(); + List av = ae.getValue().getAttributeValue(); if (av != null || !av.isEmpty()) { debugMessage(classMethod, "Attribute Values found for idp: " + idp); - Iterator avI = av.iterator(); + Iterator avI = av.iterator(); while (avI.hasNext()) { - AttributeValueElement ave = (AttributeValueElement) avI.next(); - if (ave != null) { - List contentL = ave.getContent(); + AttributeValueElement ave = avI.next(); + if (ave != null && ave.getValue() instanceof List) { + List contentL = (List)ave.getValue(); debugMessage(classMethod, "Attribute Value Elements found for idp: " + idp + "-->" + contentL); if (contentL != null || !contentL.isEmpty()) { @@ -625,7 +626,7 @@ public List getAttributeListValueFromIDPSSOConfig( IDPSSOConfigElement config = SAML2Utils.getSAML2MetaManager().getIDPSSOConfig( realm, hostEntityId); - Map attrs = SAML2MetaUtils.getAttributes(config); + Map attrs = SAML2MetaUtils.getAttributes(config.getValue()); List value = (List) attrs.get(attrName); if (value != null && value.size() != 0) { result = value; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyImpl.java index acf324ac51..754b7d999b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyImpl.java @@ -24,7 +24,7 @@ * * $Id: SAML2IDPProxyImpl.java,v 1.5 2009/03/12 20:33:40 huacui Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.plugins; @@ -94,7 +94,7 @@ public List getPreferredIDP ( sm.getSPSSOConfig(realm, authnRequest.getIssuer().getValue()); Map spConfigAttrsMap = null; if (spEntityCfg != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg.getValue()); } String useIntroductionForProxying = SPSSOFederate.getParameter(spConfigAttrsMap, diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2ProviderManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2ProviderManager.java index 2dcf0498b4..8c32de8edc 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2ProviderManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2ProviderManager.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: SAML2ProviderManager.java,v 1.3 2008/06/25 05:47:52 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -92,9 +94,9 @@ public boolean isAffiliationMember(String providerID, String affID) { public boolean isNameIDEncryptionEnabled(String providerID) { BaseConfigType config = null; try { - config = metaManager.getSPSSOConfig("/", providerID); + config = metaManager.getSPSSOConfig("/", providerID).getValue(); if (config == null) { - config = metaManager.getIDPSSOConfig("/", providerID); + config = metaManager.getIDPSSOConfig("/", providerID).getValue(); } } catch (SAML2MetaException smex) { SAML2Utils.debug.error( @@ -163,9 +165,9 @@ public String getEncryptionKeyAlgorithm(String providerID) { public PrivateKey getDecryptionKey(String providerID) { BaseConfigType providerConfig = null; try { - providerConfig = metaManager.getSPSSOConfig("/", providerID); + providerConfig = metaManager.getSPSSOConfig("/", providerID).getValue(); if (providerConfig == null) { - providerConfig = metaManager.getIDPSSOConfig("/", providerID); + providerConfig = metaManager.getIDPSSOConfig("/", providerID).getValue(); } } catch (SAML2MetaException smex) { SAML2Utils.debug.error("SAML2ProviderManager.getDecryptionKey", @@ -187,9 +189,9 @@ public PrivateKey getDecryptionKey(String providerID) { public String getSigningKeyAlias(String providerID) { BaseConfigType config = null; try { - config = metaManager.getSPSSOConfig("/", providerID); + config = metaManager.getSPSSOConfig("/", providerID).getValue(); if (config == null) { - config = metaManager.getIDPSSOConfig("/", providerID); + config = metaManager.getIDPSSOConfig("/", providerID).getValue(); } } catch (SAML2MetaException smex) { SAML2Utils.debug.error( @@ -212,9 +214,9 @@ public String getSigningKeyAlias(String providerID) { private EncInfo getEncInfo(String providerID) { SSODescriptorType ssod = null; try { - ssod = metaManager.getSPSSODescriptor("/", providerID); + ssod = metaManager.getSPSSODescriptor("/", providerID).getValue(); if (ssod == null) { - ssod = metaManager.getIDPSSODescriptor("/", providerID); + ssod = metaManager.getIDPSSODescriptor("/", providerID).getValue(); } } catch (SAML2MetaException smex) { SAML2Utils.debug.error( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AssertionIDRequestUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AssertionIDRequestUtil.java index e5f94cd264..30bde81bfb 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AssertionIDRequestUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AssertionIDRequestUtil.java @@ -25,7 +25,7 @@ * $Id: AssertionIDRequestUtil.java,v 1.8 2009/06/12 22:21:40 mallas Exp $ * * Portions Copyrighted 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -403,13 +403,13 @@ public static Response processAssertionIDRequest( try { if (SAML2Constants.IDP_ROLE.equals(role)) { roled = metaManager.getIDPSSODescriptor(realm, - samlAuthorityEntityID); + samlAuthorityEntityID).getValue(); } else if (SAML2Constants.AUTHN_AUTH_ROLE.equals(role)) { roled = metaManager.getAuthnAuthorityDescriptor(realm, - samlAuthorityEntityID); + samlAuthorityEntityID).getValue(); } else if (SAML2Constants.ATTR_AUTH_ROLE.equals(role)) { roled = metaManager.getAttributeAuthorityDescriptor(realm, - samlAuthorityEntityID); + samlAuthorityEntityID).getValue(); } } catch (SAML2MetaException sme) { SAML2Utils.debug.error("AssertionIDRequestUtil." + @@ -503,8 +503,8 @@ private static RoleDescriptorType getRoleDescriptorAndLocation( throw new SAML2Exception(SAML2Utils.bundle.getString( "idpNotFound")); } - aIDReqServices = idpd.getAssertionIDRequestService(); - roled = idpd; + aIDReqServices = idpd.getValue().getAssertionIDRequestService(); + roled = idpd.getValue(); } else if (role.equals(SAML2Constants.AUTHN_AUTH_ROLE)) { AuthnAuthorityDescriptorElement attrd = metaManager.getAuthnAuthorityDescriptor(realm, @@ -513,8 +513,8 @@ private static RoleDescriptorType getRoleDescriptorAndLocation( throw new SAML2Exception(SAML2Utils.bundle.getString( "authnAuthorityNotFound")); } - aIDReqServices = attrd.getAssertionIDRequestService(); - roled = attrd; + aIDReqServices = attrd.getValue().getAssertionIDRequestService(); + roled = attrd.getValue(); } else if (role.equals(SAML2Constants.ATTR_AUTH_ROLE)) { AttributeAuthorityDescriptorElement aad = metaManager.getAttributeAuthorityDescriptor(realm, @@ -523,8 +523,8 @@ private static RoleDescriptorType getRoleDescriptorAndLocation( throw new SAML2Exception(SAML2Utils.bundle.getString( "attrAuthorityNotFound")); } - aIDReqServices = aad.getAssertionIDRequestService(); - roled = aad; + aIDReqServices = aad.getValue().getAssertionIDRequestService(); + roled = aad.getValue(); } else { throw new SAML2Exception(SAML2Utils.bundle.getString( "unsupportedRole")); @@ -549,8 +549,8 @@ private static RoleDescriptorType getRoleDescriptorAndLocation( for(Iterator iter = aIDReqServices.iterator(); iter.hasNext(); ) { AssertionIDRequestServiceElement aIDReqService = (AssertionIDRequestServiceElement)iter.next(); - if (binding.equalsIgnoreCase(aIDReqService.getBinding())) { - location.append(aIDReqService.getLocation()); + if (binding.equalsIgnoreCase(aIDReqService.getValue().getBinding())) { + location.append(aIDReqService.getValue().getLocation()); break; } } @@ -603,7 +603,7 @@ private static void verifyAssertionIDRequest( "assertionIDRequestIssuerNotFound")); } - Set verificationCerts = KeyUtil.getVerificationCerts(spSSODesc, requestedEntityID, + Set verificationCerts = KeyUtil.getVerificationCerts(spSSODesc.getValue(), requestedEntityID, SAML2Constants.SP_ROLE); if (!verificationCerts.isEmpty()) { @@ -653,13 +653,13 @@ private static String fillInBasicAuthInfo(String location, String realm, try { if (role.equals(SAML2Constants.IDP_ROLE)) { config = metaManager.getIDPSSOConfig(realm, - samlAuthorityEntityID); + samlAuthorityEntityID).getValue(); } else if (role.equals(SAML2Constants.AUTHN_AUTH_ROLE)) { config = metaManager.getAuthnAuthorityConfig(realm, - samlAuthorityEntityID); + samlAuthorityEntityID).getValue(); } else if (role.equals(SAML2Constants.ATTR_AUTH_ROLE)) { config = metaManager.getAttributeAuthorityConfig(realm, - samlAuthorityEntityID); + samlAuthorityEntityID).getValue(); } } catch (SAML2MetaException sme) { if (SAML2Utils.debug.messageEnabled()) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java index 8c46b56db7..4ad178e8a7 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java @@ -25,14 +25,13 @@ * $Id: AttributeQueryUtil.java,v 1.11 2009/07/24 22:51:48 madan_ranganath Exp $ * * Portions copyright 2010-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; import static org.forgerock.openam.utils.Time.*; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; @@ -335,7 +334,7 @@ public static Response processAttributeQuery(AttributeQuery attrQuery, desiredAttrs = attrQuery.getAttributes(); } try { - desiredAttrs = verifyDesiredAttributes(aad.getAttribute(), + desiredAttrs = verifyDesiredAttributes(aad.getValue().getAttribute(), desiredAttrs); } catch (SAML2Exception se) { return SAML2Utils.getErrorResponse(attrQuery, @@ -507,7 +506,7 @@ public static void verifyAttrQuerySignature(AttributeQuery attrQuery, throw new SAML2Exception(SAML2Utils.bundle.getString( "attrQueryIssuerNotFound")); } - Set signingCerts = KeyUtil.getVerificationCerts(attrqDesc, requestedEntityID, + Set signingCerts = KeyUtil.getVerificationCerts(attrqDesc.getValue(), requestedEntityID, SAML2Constants.ATTR_QUERY_ROLE); if (!signingCerts.isEmpty()) { @@ -607,7 +606,7 @@ public static String getIdentity(AttributeQuery attrQuery, IDPSSOConfigElement config = SAML2Utils.getSAML2MetaManager().getIDPSSOConfig( realm, attrAuthorityEntityID); - Map attrs = SAML2MetaUtils.getAttributes(config); + Map attrs = SAML2MetaUtils.getAttributes(config.getValue()); List nimAttrs = (List)attrs.get(SAML2Constants.NAME_ID_FORMAT_MAP); @@ -820,7 +819,7 @@ private static EncryptedAssertion encryptAssertion(Assertion assertion, Encrypte AttributeQueryDescriptorElement aqd = metaManager.getAttributeQueryDescriptor(realm, requesterEntityID); - EncInfo encInfo = KeyUtil.getEncInfo(aqd, requesterEntityID, + EncInfo encInfo = KeyUtil.getEncInfo(aqd.getValue(), requesterEntityID, SAML2Constants.ATTR_QUERY_ROLE); Element el = EncManager.getEncInstance().encrypt( @@ -866,26 +865,25 @@ private static List verifyDesiredAttributes(List su return desiredAttrs; } - private static List convertAttributes(List jaxbAttrs) + private static List convertAttributes(List jaxbAttrs) throws SAML2Exception { - List resultAttrs = new ArrayList(); - for(Iterator iter = jaxbAttrs.iterator(); iter.hasNext(); ) { - AttributeElement jaxbAttr = (AttributeElement)iter.next(); + List resultAttrs = new ArrayList<>(); + for(Iterator iter = jaxbAttrs.iterator(); iter.hasNext(); ) { + AttributeElement jaxbAttr = iter.next(); Attribute attr = AssertionFactory.getInstance().createAttribute(); - attr.setName(jaxbAttr.getName()); - attr.setNameFormat(jaxbAttr.getNameFormat()); - attr.setFriendlyName(jaxbAttr.getFriendlyName()); + attr.setName(jaxbAttr.getValue().getName()); + attr.setNameFormat(jaxbAttr.getValue().getNameFormat()); + attr.setFriendlyName(jaxbAttr.getValue().getFriendlyName()); - List jaxbValues = jaxbAttr.getAttributeValue(); + List jaxbValues = jaxbAttr.getValue().getAttributeValue(); if ((jaxbValues != null) && (!jaxbValues.isEmpty())) { - List newValues = new ArrayList(); - for(Iterator iterV = jaxbValues.iterator(); iterV.hasNext();) { - AttributeValueElement jaxbValeu = - (AttributeValueElement)iter.next(); - List content = jaxbValeu.getContent(); - if ((content != null) && (!content.isEmpty())) { - newValues.add(content.get(0)); + List newValues = new ArrayList<>(); + for(Iterator iterV = jaxbValues.iterator(); iterV.hasNext();) { + AttributeValueElement jaxbValeu = iterV.next(); + Object content = jaxbValeu.getValue(); + if (content != null) { + newValues.add(jaxbValeu); } } if (!newValues.isEmpty()) { @@ -990,7 +988,7 @@ private static Attribute filterAttributeValues(Attribute attr, private static boolean isSameAttribute(Attribute desired, AttributeElement supported) { return desired.getName().equals(supported.getName()) - && isNameFormatMatching(desired.getNameFormat(), supported.getNameFormat()); + && isNameFormatMatching(desired.getNameFormat(), supported.getValue().getNameFormat()); } /** @@ -1021,16 +1019,16 @@ private static boolean isValueValid(Attribute desiredAttr, if ((valuesD == null) || (valuesD.isEmpty())) { return true; } - List attrValuesS = supportedAttr.getAttributeValue(); + List attrValuesS = supportedAttr.getValue().getAttributeValue(); if ((attrValuesS == null) || (attrValuesS.isEmpty())) { return true; } - List valuesS = new ArrayList(); - for(Iterator iter = attrValuesS.iterator(); iter.hasNext(); ) { + List valuesS = new ArrayList<>(); + for(Iterator iter = attrValuesS.iterator(); iter.hasNext(); ) { AttributeValueElement attrValueElem = - (AttributeValueElement)iter.next(); - valuesS.addAll(attrValueElem.getContent()); + iter.next(); + valuesS.add(attrValueElem.getValue()); } try { @@ -1126,7 +1124,7 @@ private static void verifyResponse(Response response, "responseNotSigned")); } - Set signingCerts = KeyUtil.getVerificationCerts(aad, attrAuthorityEntityID, + Set signingCerts = KeyUtil.getVerificationCerts(aad.getValue(), attrAuthorityEntityID, SAML2Constants.ATTR_AUTH_ROLE); if (!signingCerts.isEmpty()) { @@ -1151,7 +1149,7 @@ private static String findLocation( AttributeAuthorityDescriptorElement aad, String binding, String attrQueryProfile, String attrProfile) { SAML2Utils.debug.message("AttributeQueryUtil.findLocation entering..."); - List attrProfiles = aad.getAttributeProfile(); + List attrProfiles = aad.getValue().getAttributeProfile(); if ((attrProfiles == null) || (attrProfiles.isEmpty())) { SAML2Utils.debug.message("AttributeQueryUtil.findLocation: attrProfiles is null or empty"); if (attrProfile != null) { @@ -1164,14 +1162,14 @@ private static String findLocation( } SAML2Utils.debug.message("AttributeQueryUtil.findLocation: entering..."); - List attrServices = aad.getAttributeService(); - for(Iterator iter = attrServices.iterator(); iter.hasNext(); ) { + List attrServices = aad.getValue().getAttributeService(); + for(Iterator iter = attrServices.iterator(); iter.hasNext(); ) { AttributeServiceElement attrService = - (AttributeServiceElement)iter.next(); + iter.next(); if (isValidAttributeService(binding, attrService, attrQueryProfile)) { SAML2Utils.debug.message("AttributeQueryUtil.findLocation: found valid service"); - return attrService.getLocation(); + return attrService.getValue().getLocation(); } } SAML2Utils.debug.message("AttributeQueryUtil.findLocation: nothing found, leaving last line with null"); @@ -1182,7 +1180,7 @@ private static String findLocation( private static boolean isValidAttributeService(String binding, AttributeServiceElement attrService, String attrQueryProfile) { - if (!binding.equalsIgnoreCase(attrService.getBinding())) { + if (!binding.equalsIgnoreCase(attrService.getValue().getBinding())) { return false; } @@ -1193,7 +1191,7 @@ private static boolean isValidAttributeService(String binding, return ((attrQueryProfile.equals( SAML2Constants.DEFAULT_ATTR_QUERY_PROFILE)) || (SAML2Constants.X509_SUBJECT_ATTR_QUERY_PROFILE.equals( - attrQueryProfile) && attrService.isSupportsX509Query())); + attrQueryProfile) && attrService.getValue().isSupportsX509Query())); } /** @@ -1257,11 +1255,11 @@ private static String getAttributeValueFromAttrAuthorityConfig( AttributeAuthorityConfigElement config = metaManager.getAttributeAuthorityConfig(realm, attrAuthorityEntityID); - Map attrs = SAML2MetaUtils.getAttributes(config); + Map> attrs = SAML2MetaUtils.getAttributes(config.getValue()); String value = null; - List values = (List) attrs.get(attrName); + List values = attrs.get(attrName); if ((values != null) && (!values.isEmpty())) { - value = ((String)values.iterator().next()).trim(); + value = values.iterator().next().trim(); } return value; } catch (SAML2MetaException sme) { @@ -1348,7 +1346,7 @@ public static Map> getAttributesForFedlet(String spEntityID, return null; } - String attrqMetaAlias = attrQueryConfig.getMetaAlias(); + String attrqMetaAlias = attrQueryConfig.getValue().getMetaAlias(); if (attrqMetaAlias == null) { if (SAML2Utils.debug.messageEnabled()) { SAML2Utils.debug.message(classMethod + "Attribute Query MetaAlias is null"); @@ -1498,7 +1496,7 @@ private static AttributeQuery constructAttrQueryForFedlet( AttributeAuthorityDescriptorElement aad = metaManager.getAttributeAuthorityDescriptor("/", idpEntityID); - EncInfo encInfo = KeyUtil.getEncInfo(aad, idpEntityID, + EncInfo encInfo = KeyUtil.getEncInfo(aad.getValue(), idpEntityID, SAML2Constants.ATTR_AUTH_ROLE); EncryptedID encryptedID = nameID.encrypt(encInfo.getWrappingKey(), diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AuthnQueryUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AuthnQueryUtil.java index 16e2a5a754..c626687f90 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AuthnQueryUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AuthnQueryUtil.java @@ -25,14 +25,13 @@ * $Id: AuthnQueryUtil.java,v 1.8 2008/12/03 00:32:31 hengming Exp $ * * Portions Copyrighted 2010-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; import static org.forgerock.openam.utils.Time.*; import java.util.ArrayList; -import java.util.Date; import java.util.Iterator; import java.util.List; import java.security.PrivateKey; @@ -133,12 +132,12 @@ public static Response sendAuthnQuery(AuthnQuery authnQuery, } String location = null; - List authnService = aad.getAuthnQueryService(); - for(Iterator iter = authnService.iterator(); iter.hasNext(); ) { + List authnService = aad.getValue().getAuthnQueryService(); + for(Iterator iter = authnService.iterator(); iter.hasNext(); ) { AuthnQueryServiceElement authnService1 = - (AuthnQueryServiceElement)iter.next(); - if (binding.equalsIgnoreCase(authnService1.getBinding())) { - location = authnService1.getLocation(); + iter.next(); + if (binding.equalsIgnoreCase(authnService1.getValue().getBinding())) { + location = authnService1.getValue().getLocation(); break; } } @@ -395,7 +394,8 @@ private static void verifyAuthnQuery(AuthnQuery authnQuery, throw new SAML2Exception(SAML2Utils.bundle.getString( "authnQueryIssuerNotFound")); } - Set signingCerts = KeyUtil.getVerificationCerts(spSSODesc, spEntityID, SAML2Constants.SP_ROLE); + Set signingCerts = KeyUtil.getVerificationCerts( + spSSODesc.getValue(), spEntityID, SAML2Constants.SP_ROLE); if (!signingCerts.isEmpty()) { boolean valid = authnQuery.isSignatureValid(signingCerts); @@ -451,7 +451,7 @@ private static Response sendAuthnQuerySOAP(AuthnQuery authnQuery, AuthnAuthorityConfigElement config = metaManager.getAuthnAuthorityConfig(realm, authnAuthorityEntityID); - authnServiceURL = SAML2Utils.fillInBasicAuthInfo(config, + authnServiceURL = SAML2Utils.fillInBasicAuthInfo(config.getValue(), authnServiceURL); SOAPMessage resMsg = null; @@ -507,7 +507,7 @@ private static void verifyResponse(Response response, "responseNotSigned")); } - Set signingCerts = KeyUtil.getVerificationCerts(aad, authnAuthorityEntityID, + Set signingCerts = KeyUtil.getVerificationCerts(aad.getValue(), authnAuthorityEntityID, SAML2Constants.AUTHN_AUTH_ROLE); if (signingCerts.isEmpty()) { @@ -544,7 +544,7 @@ private static void verifyResponse(Response response, return; } - signingCerts = KeyUtil.getVerificationCerts(aad, authnAuthorityEntityID, SAML2Constants.IDP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(aad.getValue(), authnAuthorityEntityID, SAML2Constants.IDP_ROLE); for(Iterator iter = assertions.iterator(); iter.hasNext(); ) { Assertion assertion = (Assertion)iter.next(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java index b4cf82ac35..443351167b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java @@ -25,6 +25,7 @@ * $Id: DiscoveryBootstrap.java,v 1.4 2008/12/05 00:18:31 exu Exp $ * * Portions Copyrighted 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -164,7 +165,7 @@ private String getResourceOffering(String authnContextClassRef, String univID = values[0]; try { - ResourceOfferingType offering = discoEntry.getResourceOffering(); + ResourceOfferingType offering = discoEntry.getValue().getResourceOffering(); ServiceInstanceType serviceInstance = offering.getServiceInstance(); String providerID = serviceInstance.getProviderID(); if (!DiscoServiceManager.useImpliedResource()) { @@ -201,7 +202,7 @@ private String getResourceOffering(String authnContextClassRef, IDPSSODescriptorElement idpSSODesc = SAML2Utils .getSAML2MetaManager().getIDPSSODescriptor(realm, providerID); - EncInfo encInfo = KeyUtil.getEncInfo(idpSSODesc, wscID, + EncInfo encInfo = KeyUtil.getEncInfo(idpSSODesc.getValue(), wscID, SAML2Constants.IDP_ROLE); NameIdentifier ni = diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DoManageNameID.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DoManageNameID.java index 4c3e14dc59..6d020c0ce9 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DoManageNameID.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DoManageNameID.java @@ -25,7 +25,7 @@ * $Id: DoManageNameID.java,v 1.26 2009/11/24 21:53:27 madan_ranganath Exp $ * * Portions copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -34,10 +34,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.OutputStream; -import java.security.Key; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import java.util.Date; import java.util.Enumeration; import java.util.Iterator; import java.util.List; @@ -231,7 +229,7 @@ public static void initiateManageNameIDRequest( getMNIServiceElement(realm, remoteEntityID, hostEntityRole, binding); if (binding == null) { - binding = mniService.getBinding(); + binding = mniService.getValue().getBinding(); } if (binding == null) { @@ -242,7 +240,7 @@ public static void initiateManageNameIDRequest( String mniURL = null; if (mniService != null) { - mniURL = mniService.getLocation(); + mniURL = mniService.getValue().getLocation(); } if (mniURL == null) { @@ -291,9 +289,9 @@ public static void initiateManageNameIDRequest( BaseConfigType config = null; if (hostEntityRole.equalsIgnoreCase(SAML2Constants.SP_ROLE)) { - config = metaManager.getIDPSSOConfig(realm, remoteEntityID); + config = metaManager.getIDPSSOConfig(realm, remoteEntityID).getValue(); } else { - config = metaManager.getSPSSOConfig(realm, remoteEntityID); + config = metaManager.getSPSSOConfig(realm, remoteEntityID).getValue(); } mniURL = SAML2Utils.fillInBasicAuthInfo(config, mniURL); if (!doMNIBySOAP(mniRequest, mniURL, metaAlias, hostEntityRole, @@ -368,7 +366,7 @@ public static String getMNIBindingInfo(HttpServletRequest request, getMNIServiceElement(realm, remoteEntityID, hostEntityRole, null); if (mniService != null) { - binding = mniService.getBinding(); + binding = mniService.getValue().getBinding(); } } } catch (SessionException e) { @@ -478,10 +476,10 @@ private static boolean verifyMNIRequest(ManageNameIDRequest mniRequest, Set signingCerts; if (hostEntityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { SPSSODescriptorElement spSSODesc = metaManager.getSPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(spSSODesc, remoteEntity, SAML2Constants.SP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(spSSODesc.getValue(), remoteEntity, SAML2Constants.SP_ROLE); } else { IDPSSODescriptorElement idpSSODesc = metaManager.getIDPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(idpSSODesc, remoteEntity, SAML2Constants.IDP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(idpSSODesc.getValue(), remoteEntity, SAML2Constants.IDP_ROLE); } if (!signingCerts.isEmpty()) { @@ -591,10 +589,10 @@ private static boolean verifyMNIResponse(ManageNameIDResponse mniResponse, Set signingCerts; if (hostEntityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { SPSSODescriptorElement spSSODesc = metaManager.getSPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(spSSODesc, remoteEntity, SAML2Constants.SP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(spSSODesc.getValue(), remoteEntity, SAML2Constants.SP_ROLE); } else { IDPSSODescriptorElement idpSSODesc = metaManager.getIDPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(idpSSODesc, remoteEntity, SAML2Constants.IDP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(idpSSODesc.getValue(), remoteEntity, SAML2Constants.IDP_ROLE); } if (!signingCerts.isEmpty()) { @@ -745,9 +743,9 @@ public static void processHttpRequest(HttpServletRequest request, ManageNameIDServiceElement mniService = getMNIServiceElement(realm, remoteEntityID, hostRole, SAML2Constants.HTTP_REDIRECT); - String mniURL = mniService.getResponseLocation(); + String mniURL = mniService.getValue().getResponseLocation(); if (mniURL == null){ - mniURL = mniService.getLocation(); + mniURL = mniService.getValue().getLocation(); } ManageNameIDResponse mniResponse = processManageNameIDRequest( mniRequest, metaAlias, remoteEntityID, paramsMap, mniURL, @@ -1852,12 +1850,12 @@ static private void setNameIDForMNIRequest(ManageNameIDRequest mniRequest, if (hostEntityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { SPSSODescriptorElement spSSODesc = metaManager.getSPSSODescriptor(realm, remoteEntity); - encInfo = KeyUtil.getEncInfo(spSSODesc, remoteEntity, + encInfo = KeyUtil.getEncInfo(spSSODesc.getValue(), remoteEntity, SAML2Constants.SP_ROLE); } else { IDPSSODescriptorElement idpSSODesc = metaManager.getIDPSSODescriptor(realm, remoteEntity); - encInfo = KeyUtil.getEncInfo(idpSSODesc, remoteEntity, + encInfo = KeyUtil.getEncInfo(idpSSODesc.getValue(), remoteEntity, SAML2Constants.IDP_ROLE); } @@ -1974,16 +1972,16 @@ static public ManageNameIDServiceElement getIDPManageNameIDConfig( return null; } - List list = idpSSODesc.getManageNameIDService(); + List list = idpSSODesc.getValue().getManageNameIDService(); if ((list != null) && !list.isEmpty()) { if (binding == null) { - return (ManageNameIDServiceElement)list.get(0); + return list.get(0); } - Iterator it = list.iterator(); + Iterator it = list.iterator(); while (it.hasNext()) { - mni = (ManageNameIDServiceElement)it.next(); - if (binding.equalsIgnoreCase(mni.getBinding())) { + mni = it.next(); + if (binding.equalsIgnoreCase(mni.getValue().getBinding())) { break; } } @@ -2015,7 +2013,7 @@ static public ManageNameIDServiceElement getSPManageNameIDConfig( return null; } - List list = spSSODesc.getManageNameIDService(); + List list = spSSODesc.getValue().getManageNameIDService(); if ((list != null) && !list.isEmpty()) { if (binding == null) { @@ -2024,7 +2022,7 @@ static public ManageNameIDServiceElement getSPManageNameIDConfig( Iterator it = list.iterator(); while (it.hasNext()) { mni = (ManageNameIDServiceElement)it.next(); - if (binding.equalsIgnoreCase(mni.getBinding())) { + if (binding.equalsIgnoreCase(mni.getValue().getBinding())) { break; } } @@ -2290,9 +2288,9 @@ public static void processPOSTRequest(HttpServletRequest request, } ManageNameIDServiceElement mniService = getMNIServiceElement(realm, remoteEntityID, hostEntityRole, SAML2Constants.HTTP_POST); - String mniURL = mniService.getResponseLocation(); + String mniURL = mniService.getValue().getResponseLocation(); if (mniURL == null){ - mniURL = mniService.getLocation(); + mniURL = mniService.getValue().getLocation(); } ///common for post, redirect, soap diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPArtifactResolution.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPArtifactResolution.java index cdefbe2ebf..c282ddd827 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPArtifactResolution.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPArtifactResolution.java @@ -25,7 +25,7 @@ * $Id: IDPArtifactResolution.java,v 1.13 2009/11/20 21:41:16 exu Exp $ * * Portions Copyrighted 2012-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -333,7 +333,7 @@ public static SOAPMessage onMessage(SOAPMessage message, return SOAPCommunicator.getInstance().createSOAPFault(SAML2Constants.CLIENT_FAULT, "ArtifactResolveNotSigned", null); } - Set verificationCerts = KeyUtil.getVerificationCerts(spSSODescriptor, spEntityID, + Set verificationCerts = KeyUtil.getVerificationCerts(spSSODescriptor.getValue(), spEntityID, SAML2Constants.SP_ROLE); if (!artResolve.isSignatureValid(verificationCerts)) { SAML2Utils.debug.error(classMethod + @@ -469,7 +469,7 @@ public static SOAPMessage onMessage(SOAPMessage message, } // check if need to sign the assertion - boolean signAssertion = spSSODescriptor.isWantAssertionsSigned(); + boolean signAssertion = spSSODescriptor.getValue().isWantAssertionsSigned(); if (signAssertion) { if (SAML2Utils.debug.messageEnabled()) { SAML2Utils.debug.message(classMethod + diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPProxyUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPProxyUtil.java index 63d4954b3d..58feea1887 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPProxyUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPProxyUtil.java @@ -25,7 +25,7 @@ * $Id: IDPProxyUtil.java,v 1.18 2009/11/20 21:41:16 exu Exp $ * * Portions Copyrighted 2010-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -38,6 +38,7 @@ import com.sun.identity.saml2.common.SAML2FailoverUtils; import com.sun.identity.saml2.common.SOAPCommunicator; +import com.sun.identity.saml2.jaxb.metadata.SingleLogoutServiceElement; import com.sun.identity.saml2.logging.LogUtil; import com.sun.identity.saml2.protocol.RequesterID; import com.sun.identity.saml2.protocol.impl.RequesterIDImpl; @@ -74,7 +75,6 @@ import com.sun.identity.saml2.protocol.Scoping; import java.io.IOException; import java.security.PrivateKey; -import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.ArrayList; @@ -184,14 +184,14 @@ public static void sendProxyAuthnRequest( String binding; try { idpDescriptor = IDPSSOUtil.metaManager.getIDPSSODescriptor(realm, preferredIDP); - List ssoServiceList = idpDescriptor.getSingleSignOnService(); + List ssoServiceList = idpDescriptor.getValue().getSingleSignOnService(); SingleSignOnServiceElement endpoint = getMatchingSSOEndpoint(ssoServiceList, originalBinding); if (endpoint == null) { SAML2Utils.debug.error(classMethod + "Single Sign-on service is not found for the proxying IDP."); throw new SAML2Exception(SAML2Utils.bundle.getString("ssoServiceNotFoundIDPProxy")); } - binding = endpoint.getBinding(); - destination = endpoint.getLocation(); + binding = endpoint.getValue().getBinding(); + destination = endpoint.getValue().getLocation(); localDescriptor = IDPSSOUtil.metaManager.getSPSSODescriptor(realm, hostedEntityId); localDescriptorConfig = IDPSSOUtil.metaManager.getSPSSOConfig(realm, hostedEntityId); @@ -219,7 +219,8 @@ public static void sendProxyAuthnRequest( IDPCache.proxySPAuthnReqCache.put(requestID, authnRequest); - boolean signingNeeded = idpDescriptor.isWantAuthnRequestsSigned() || localDescriptor.isAuthnRequestsSigned(); + boolean signingNeeded = idpDescriptor.getValue().isWantAuthnRequestsSigned() + || localDescriptor.getValue().isAuthnRequestsSigned(); // check if relayState is present and get the unique // id which will be appended to the SSO URL before @@ -233,7 +234,7 @@ public static void sendProxyAuthnRequest( if (binding.equals(SAML2Constants.HTTP_POST)) { if (signingNeeded) { String certAlias = SPSSOFederate.getParameter( - SAML2MetaUtils.getAttributes(localDescriptorConfig), + SAML2MetaUtils.getAttributes(localDescriptorConfig.getValue()), SAML2Constants.SIGNING_CERT_ALIAS); SPSSOFederate.signAuthnRequest(certAlias,newAuthnRequest); } @@ -269,7 +270,7 @@ public static void sendProxyAuthnRequest( if (signingNeeded) { String certAlias = SPSSOFederate.getParameter( - SAML2MetaUtils.getAttributes(localDescriptorConfig), + SAML2MetaUtils.getAttributes(localDescriptorConfig.getValue()), SAML2Constants.SIGNING_CERT_ALIAS); String signedQueryStr = SPSSOFederate.signQueryString( queryString.toString(),certAlias); @@ -314,7 +315,7 @@ private static SingleSignOnServiceElement getMatchingSSOEndpoint(List the incoming request //did not contained a Scoping field SPSSOConfigElement spConfig = getSPSSOConfigByAuthnRequest(realm, origRequest); - Map> spConfigAttrMap = SAML2MetaUtils.getAttributes(spConfig); + Map> spConfigAttrMap = SAML2MetaUtils.getAttributes(spConfig.getValue()); scoping = ProtocolFactory.getInstance().createScoping(); String proxyCountParam = SPSSOFederate.getParameter(spConfigAttrMap, SAML2Constants.IDP_PROXY_COUNT); @@ -479,7 +480,7 @@ public static boolean isIDPProxyEnabled(AuthnRequest authnRequest, //let's check if always IdP proxy and IdP Proxy itself is enabled spConfig = getSPSSOConfigByAuthnRequest(realm, authnRequest); if (spConfig != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spConfig); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spConfig.getValue()); Boolean alwaysEnabled = SPSSOFederate.getAttrValueFromMap( spConfigAttrsMap, SAML2Constants.ALWAYS_IDP_PROXY); Boolean proxyEnabled = SPSSOFederate.getAttrValueFromMap( @@ -508,7 +509,7 @@ public static boolean isIDPProxyEnabled(AuthnRequest authnRequest, IDPSSOUtil.metaManager.getSPSSOConfig(realm, authnRequest.getIssuer().getValue()); if (spConfig != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spConfig); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spConfig.getValue()); } Boolean enabledString = SPSSOFederate.getAttrValueFromMap( spConfigAttrsMap, SAML2Constants.ENABLE_IDP_PROXY); @@ -672,7 +673,8 @@ private static String getNameIDFormat(Response res, String metaAlias) { String realm = SAML2Utils.getRealm(SAML2MetaUtils.getRealmByMetaAlias(metaAlias)); try { String hostEntityId = sm.getEntityByMetaAlias(metaAlias); - Set decryptionKeys = KeyUtil.getDecryptionKeys(sm.getSPSSOConfig(realm, hostEntityId)); + Set decryptionKeys = KeyUtil.getDecryptionKeys( + sm.getSPSSOConfig(realm, hostEntityId).getValue()); assertion = encryptedAssertions.get(0).decrypt(decryptionKeys); } catch (SAML2Exception ex) { SAML2Utils.debug.error("getNameIDFormat failed decrypting EncryptedAssertion", ex); @@ -808,7 +810,7 @@ public static String getLocation (String realm, String idpEntityID, throw new SAML2Exception( SAML2Utils.bundle.getString("metaDataError")); } - List slosList = idpsso.getSingleLogoutService(); + List slosList = idpsso.getValue().getSingleLogoutService(); if (slosList == null) { String[] data = {idpEntityID}; LogUtil.error(Level.INFO,LogUtil.SLO_NOT_FOUND,data, @@ -1081,7 +1083,7 @@ public static void sendIDPInitProxyLogoutRequest( String logoutAll = request.getParameter(SAML2Constants.LOGOUT_ALL); HashMap paramsMap = new HashMap(); IDPSSOConfigElement config = sm.getIDPSSOConfig(realm, spEntityID); - paramsMap.put("metaAlias", config.getMetaAlias()); + paramsMap.put("metaAlias", config.getValue().getMetaAlias()); paramsMap.put(SAML2Constants.ROLE, SAML2Constants.IDP_ROLE); paramsMap.put(SAML2Constants.BINDING, SAML2Constants.HTTP_REDIRECT); paramsMap.put("Destination", request.getParameter("Destination")); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOUtil.java index 2c4635e6f8..9acfb7a31e 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOUtil.java @@ -1229,7 +1229,8 @@ private static AuthnStatement getAuthnStatement( if (CollectionUtils.isNotEmpty(encryptedAssertions)) { boolean firstAssertion = true; String hostEntityId = metaManager.getEntityByMetaAlias(metaAlias); - Set decryptionKeys = KeyUtil.getDecryptionKeys(metaManager.getSPSSOConfig(realm, hostEntityId)); + Set decryptionKeys = KeyUtil.getDecryptionKeys( + metaManager.getSPSSOConfig(realm, hostEntityId).getValue()); for (EncryptedAssertion encryptedAssertion : encryptedAssertions) { Assertion assertion = encryptedAssertion.decrypt(decryptionKeys); authenticatingAuthorities.addAll(extractAuthenticatingAuthorities(assertion)); @@ -1853,7 +1854,7 @@ public static String getDefaultACSurl( String classMethod = "IDPSSOUtil.getDefaultACSurl: "; SPSSODescriptorElement spSSODescriptorElement = getSPSSODescriptor( realm, spEntityID, classMethod); - List acsList = spSSODescriptorElement.getAssertionConsumerService(); + List acsList = spSSODescriptorElement.getValue().getAssertionConsumerService(); AssertionConsumerServiceElement acs = null; String acsURL = null; String binding = null; @@ -1861,13 +1862,13 @@ public static String getDefaultACSurl( String firstBinding = null; for (int i = 0; i < acsList.size(); i++) { acs = (AssertionConsumerServiceElement) acsList.get(i); - if (acs.isIsDefault()) { - acsURL = acs.getLocation(); - binding = acs.getBinding(); + if (acs.getValue().isIsDefault()) { + acsURL = acs.getValue().getLocation(); + binding = acs.getValue().getBinding(); } if (i == 0) { - firstAcsURL = acs.getLocation(); - firstBinding = acs.getBinding(); + firstAcsURL = acs.getValue().getLocation(); + firstBinding = acs.getValue().getBinding(); } } @@ -1898,14 +1899,14 @@ public static String getBindingForAcsUrl( String classMethod = "IDPSSOUtil.getBindingForAcsUrl: "; SPSSODescriptorElement spSSODescriptorElement = getSPSSODescriptor( realm, spEntityID, classMethod); - List acsList = spSSODescriptorElement.getAssertionConsumerService(); + List acsList = spSSODescriptorElement.getValue().getAssertionConsumerService(); AssertionConsumerServiceElement acs = null; String binding = null; for (int i = 0; i < acsList.size(); i++) { acs = (AssertionConsumerServiceElement) acsList.get(i); - String location = acs.getLocation(); + String location = acs.getValue().getLocation(); if (location != null && location.equals(acsURL)) { - return acs.getBinding(); + return acs.getValue().getBinding(); } } return null; @@ -1933,7 +1934,7 @@ public static String getACSurlFromMetaByBinding( String classMethod = "IDPSSOUtil.getACSurlFromMetaByBinding: "; SPSSODescriptorElement spSSODescriptorElement = getSPSSODescriptor( realm, spEntityID, classMethod); - List acsList = spSSODescriptorElement.getAssertionConsumerService(); + List acsList = spSSODescriptorElement.getValue().getAssertionConsumerService(); String acsURL = null; String binding = null; String defaultAcsURL = null; @@ -1944,18 +1945,18 @@ public static String getACSurlFromMetaByBinding( for (int i = 0; i < acsList.size(); i++) { acs = (AssertionConsumerServiceElement) acsList.get(i); - binding = acs.getBinding(); + binding = acs.getValue().getBinding(); if (binding.equals(desiredBinding)) { - acsURL = acs.getLocation(); + acsURL = acs.getValue().getLocation(); break; } - if (acs.isIsDefault()) { - defaultAcsURL = acs.getLocation(); - defaultBinding = acs.getBinding(); + if (acs.getValue().isIsDefault()) { + defaultAcsURL = acs.getValue().getLocation(); + defaultBinding = acs.getValue().getBinding(); } if (i == 0) { - firstAcsURL = acs.getLocation(); - firstBinding = acs.getBinding(); + firstAcsURL = acs.getValue().getLocation(); + firstBinding = acs.getValue().getBinding(); } } if (acsURL == null || acsURL.length() == 0) { @@ -2003,7 +2004,7 @@ public static String getACSurlFromMetaByIndex( SPSSODescriptorElement spSSODescriptorElement = getSPSSODescriptor( realm, spEntityID, classMethod); - List acsList = spSSODescriptorElement.getAssertionConsumerService(); + List acsList = spSSODescriptorElement.getValue().getAssertionConsumerService(); int index; String acsURL = null; String binding = null; @@ -2015,20 +2016,20 @@ public static String getACSurlFromMetaByIndex( for (int i = 0; i < acsList.size(); i++) { acs = (AssertionConsumerServiceElement) acsList.get(i); - index = acs.getIndex(); - binding = acs.getBinding(); + index = acs.getValue().getIndex(); + binding = acs.getValue().getBinding(); if (index == acsIndex) { - acsURL = acs.getLocation(); - binding = acs.getBinding(); + acsURL = acs.getValue().getLocation(); + binding = acs.getValue().getBinding(); break; } - if (acs.isIsDefault()) { - defaultAcsURL = acs.getLocation(); - defaultBinding = acs.getBinding(); + if (acs.getValue().isIsDefault()) { + defaultAcsURL = acs.getValue().getLocation(); + defaultBinding = acs.getValue().getBinding(); } if (i == 0) { - firstAcsURL = acs.getLocation(); - firstBinding = acs.getBinding(); + firstAcsURL = acs.getValue().getLocation(); + firstBinding = acs.getValue().getBinding(); } } if (acsURL == null || acsURL.length() == 0) { @@ -2100,7 +2101,7 @@ public static void sendResponseArtifact(HttpServletRequest request, ArtifactResolutionServiceElement ars = (ArtifactResolutionServiceElement) - idpSSODescriptorElement.getArtifactResolutionService().get(0); + idpSSODescriptorElement.getValue().getArtifactResolutionService().get(0); if (ars == null) { SAML2Utils.debug.error(classMethod + "Unable to get ArtifactResolutionServiceElement from meta."); @@ -2115,7 +2116,7 @@ public static void sendResponseArtifact(HttpServletRequest request, try { art = ProtocolFactory.getInstance().createArtifact( null, - ars.getIndex(), + ars.getValue().getIndex(), SAML2Utils.generateSourceID(idpEntityID), SAML2Utils.generateMessageHandleWithServerID() ); @@ -2343,7 +2344,7 @@ public static String getAttributeValueFromIDPSSOConfig( try { IDPSSOConfigElement config = metaManager.getIDPSSOConfig( realm, hostEntityId); - Map attrs = SAML2MetaUtils.getAttributes(config); + Map attrs = SAML2MetaUtils.getAttributes(config.getValue()); List value = (List) attrs.get(attrName); if (value != null && value.size() != 0) { result = (String) value.get(0); @@ -2586,7 +2587,7 @@ static void signAndEncryptResponseComponents(String realm, SPSSODescriptorElement spSSODescriptorElement = getSPSSODescriptor( realm, spEntityID, classMethod); // get the encryption information - EncInfo encInfo = KeyUtil.getEncInfo(spSSODescriptorElement, + EncInfo encInfo = KeyUtil.getEncInfo(spSSODescriptorElement.getValue(), spEntityID, SAML2Constants.SP_ROLE); if (encInfo == null) { SAML2Utils.debug.error(classMethod + @@ -2715,7 +2716,7 @@ private static String getWriterURL(String realm, metaManager.getIDPSSOConfig(realm, idpEntityID); Map idpConfigAttrsMap = null; if (idpEntityCfg != null) { - idpConfigAttrsMap = SAML2MetaUtils.getAttributes(idpEntityCfg); + idpConfigAttrsMap = SAML2MetaUtils.getAttributes(idpEntityCfg.getValue()); } if ((idpConfigAttrsMap == null) || (idpConfigAttrsMap.size() == 0)) { return null; @@ -2731,7 +2732,7 @@ private static String getWriterURL(String realm, metaManager.getSPSSOConfig(realm, spEntityID); Map spConfigAttrsMap = null; if (spEntityCfg != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg.getValue()); } if ((spConfigAttrsMap == null) || (spConfigAttrsMap.size() == 0)) { return null; @@ -2981,12 +2982,12 @@ private static boolean isACSurlValidInMetadataSP(String acsURL, SPSSODescriptorElement spSSODescriptorElement = getSPSSODescriptor( realm, spEntityID, classMethod); - List acsList = spSSODescriptorElement.getAssertionConsumerService(); + List acsList = spSSODescriptorElement.getValue().getAssertionConsumerService(); AssertionConsumerServiceElement acs = null; for (int i = 0; i < acsList.size(); i++) { acs = (AssertionConsumerServiceElement) acsList.get(i); - String acsInMeta = acs.getLocation(); + String acsInMeta = acs.getValue().getLocation(); if (acsInMeta.equalsIgnoreCase(acsURL)) { isValidACSurl = true; SAML2Utils.debug.message(classMethod + " acsURL=" + acsURL + @@ -3013,7 +3014,7 @@ private static boolean wantAssertionsSigned(String realm, String spEntityID) thr SAML2Utils.debug.message(method + ": realm - " + realm + "/: spEntityID - " + spEntityID); } SPSSODescriptorElement spSSODescriptor = getSPSSODescriptor(spEntityID, realm, method); - return spSSODescriptor.isWantAssertionsSigned(); + return spSSODescriptor.getValue().isWantAssertionsSigned(); } /** diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionListener.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionListener.java index f8e3836fac..39e06c1acd 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionListener.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionListener.java @@ -25,6 +25,7 @@ * $Id: IDPSessionListener.java,v 1.10 2009/09/23 22:28:31 bigfatrat Exp $ * * Portions Copyrighted 2014-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -33,6 +34,7 @@ import java.util.Map; import java.util.HashMap; import java.util.logging.Level; +import java.util.stream.Collectors; import com.sun.identity.plugin.monitoring.FedMonAgent; import com.sun.identity.plugin.monitoring.FedMonSAML2Svc; @@ -55,6 +57,7 @@ import com.sun.identity.saml2.meta.SAML2MetaManager; import com.sun.identity.saml2.meta.SAML2MetaUtils; import com.sun.identity.shared.debug.Debug; +import jakarta.xml.bind.JAXBElement; import org.forgerock.openam.federation.saml2.SAML2TokenRepositoryException; @@ -154,7 +157,7 @@ public void sessionInvalidated(Object session) NameID nameID = pair.getNameID(); BaseConfigType idpConfig = - sm.getIDPSSOConfig(realm, idpEntityID); + sm.getIDPSSOConfig(realm, idpEntityID).getValue(); if (idpConfig != null) { List idpSessionSyncList = @@ -296,7 +299,8 @@ private void initiateIDPSingleLogout(String sessionIndex, String metaAlias, Stri throw new SAML2Exception(SAML2Utils.bundle.getString("metaDataError")); } - List slosList = spsso.getSingleLogoutService(); + List slosList = spsso.getValue().getSingleLogoutService().stream() + .map(JAXBElement::getValue).collect(Collectors.toList()); String location = LogoutUtil.getSLOServiceLocation(slosList, SAML2Constants.SOAP); if (location == null) { @@ -310,6 +314,6 @@ private void initiateIDPSingleLogout(String sessionIndex, String metaAlias, Stri SPSSOConfigElement spConfig = sm.getSPSSOConfig(realm, spEntityID); LogoutUtil.doLogout(metaAlias, spEntityID, slosList, null, binding, null, sessionIndex, nameID, null, null, - paramsMap, spConfig); + paramsMap, spConfig.getValue()); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSingleLogout.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSingleLogout.java index d982167391..df0e2451e4 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSingleLogout.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSingleLogout.java @@ -25,6 +25,7 @@ * $Id: IDPSingleLogout.java,v 1.28 2009/11/25 01:20:47 madan_ranganath Exp $ * * Portions Copyrighted 2010-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -304,10 +305,10 @@ public static void initiateLogoutRequest(HttpServletRequest request, HttpServlet } StringBuffer requestID = null; try { - requestID = LogoutUtil.doLogout(metaAlias, spEntityID, extensionsList, logoutEndpoint, relayState, - idpSessionIndex, pair.getNameID(), request, response, paramsMap, spConfig); + requestID = LogoutUtil.doLogout(metaAlias, spEntityID, extensionsList, logoutEndpoint.getValue(), relayState, + idpSessionIndex, pair.getNameID(), request, response, paramsMap, spConfig.getValue()); } catch (SAML2Exception ex) { - if (logoutEndpoint.getBinding().equals(SAML2Constants.SOAP)) { + if (logoutEndpoint.getValue().getBinding().equals(SAML2Constants.SOAP)) { debug.error( "IDPSingleLogout.initiateLogoutRequest:" , ex); soapFailCount++; @@ -318,7 +319,7 @@ public static void initiateLogoutRequest(HttpServletRequest request, HttpServlet } String requestIDStr = requestID.toString(); - String bindingUsed = logoutEndpoint.getBinding(); + String bindingUsed = logoutEndpoint.getValue().getBinding(); if (debug.messageEnabled()) { debug.message("\nIDPSLO.requestIDStr = " + requestIDStr + "\nbinding = " + bindingUsed); } @@ -506,7 +507,7 @@ public static void processLogoutRequest( sm.getIDPSSODescriptor(realm, idpEntityID); String loc = null; if (idpsso != null) { - List sloList = idpsso.getSingleLogoutService(); + List sloList = idpsso.getValue().getSingleLogoutService(); if ((sloList != null) && (!sloList.isEmpty())) { loc = LogoutUtil.getSLOResponseServiceLocation( sloList, binding); @@ -560,7 +561,7 @@ && isMisroutedRequest(request, response, out, session)) { // this is the case where there is no more SP session // participant SingleLogoutServiceElement endpoint = getLogoutResponseEndpoint(realm, spEntityID, binding); - binding = endpoint.getBinding(); + binding = endpoint.getValue().getBinding(); String location = getResponseLocation(endpoint); logoutRes.setDestination(XMLUtils.escapeSpecialCharacters(location)); @@ -616,7 +617,7 @@ private static SingleLogoutServiceElement getLogoutResponseEndpoint(String realm debug.error("Unable to find the SP's single logout response service with " + binding + " binding"); throw new SAML2Exception(SAML2Utils.bundle.getString("sloResponseServiceLocationNotfound")); } - if (SAML2Constants.SOAP.equals(endpoint.getBinding())) { + if (SAML2Constants.SOAP.equals(endpoint.getValue().getBinding())) { debug.error("Unable to send logout response with SOAP binding"); throw new SAML2Exception(SAML2Utils.bundle.getString("unsupportedBinding")); } @@ -624,9 +625,9 @@ private static SingleLogoutServiceElement getLogoutResponseEndpoint(String realm } private static String getResponseLocation(SingleLogoutServiceElement endpoint) { - String location = endpoint.getResponseLocation(); + String location = endpoint.getValue().getResponseLocation(); if (StringUtils.isBlank(location)) { - location = endpoint.getLocation(); + location = endpoint.getValue().getLocation(); } return location; } @@ -783,7 +784,7 @@ public static boolean processLogoutResponse(HttpServletRequest request, HttpServ sm.getIDPSSODescriptor(realm, idpEntityID); String loc = null; if (idpsso != null) { - List sloList = idpsso.getSingleLogoutService(); + List sloList = idpsso.getValue().getSingleLogoutService(); if (sloList != null && !sloList.isEmpty()) { loc = LogoutUtil.getSLOResponseServiceLocation( sloList, binding); @@ -902,9 +903,9 @@ static boolean processLogoutResponse(HttpServletRequest request, HttpServletResp if (logoutEndpoint == null) { continue; } - StringBuffer requestID = LogoutUtil.doLogout(metaAlias, spEntityID, extensionsList, logoutEndpoint, - relayState, idpSessionIndex, pair.getNameID(), request, response, paramsMap, spConfig); - String bindingUsed = logoutEndpoint.getBinding(); + StringBuffer requestID = LogoutUtil.doLogout(metaAlias, spEntityID, extensionsList, logoutEndpoint.getValue(), + relayState, idpSessionIndex, pair.getNameID(), request, response, paramsMap, spConfig.getValue()); + String bindingUsed = logoutEndpoint.getValue().getBinding(); if (bindingUsed.equals(SAML2Constants.HTTP_REDIRECT) || bindingUsed.equals(SAML2Constants.HTTP_POST)) { String requestIDStr = requestID.toString(); if (debug.messageEnabled()) { @@ -1090,7 +1091,7 @@ public static LogoutResponse processLogoutRequest(LogoutRequest logoutReq, HttpS session = idpSession.getSession(); // handle external application logout if configured BaseConfigType idpConfig = SAML2Utils.getSAML2MetaManager() - .getIDPSSOConfig(realm, idpEntityID); + .getIDPSSOConfig(realm, idpEntityID).getValue(); List appLogoutURL = (List) SAML2MetaUtils.getAttributes( idpConfig).get(SAML2Constants.APP_LOGOUT_URL); if (debug.messageEnabled()) { @@ -1196,10 +1197,10 @@ public static LogoutResponse processLogoutRequest(LogoutRequest logoutReq, HttpS continue; } try { - requestID = LogoutUtil.doLogout(metaAlias, spEntityID, null, logoutEndpoint, relayState, - sessionIndex, pair.getNameID(), request, response, paramsMap, spConfig); + requestID = LogoutUtil.doLogout(metaAlias, spEntityID, null, logoutEndpoint.getValue(), relayState, + sessionIndex, pair.getNameID(), request, response, paramsMap, spConfig.getValue()); } catch (SAML2Exception ex) { - if (logoutEndpoint.getBinding().equals(SAML2Constants.SOAP)) { + if (logoutEndpoint.getValue().getBinding().equals(SAML2Constants.SOAP)) { debug.error( "IDPSingleLogout.initiateLogoutRequest:" , ex); soapFailCount++; @@ -1209,7 +1210,7 @@ public static LogoutResponse processLogoutRequest(LogoutRequest logoutReq, HttpS } } - String bindingUsed = logoutEndpoint.getBinding(); + String bindingUsed = logoutEndpoint.getValue().getBinding(); if (bindingUsed.equals(SAML2Constants.HTTP_REDIRECT) || bindingUsed.equals(SAML2Constants.HTTP_POST)) { String requestIDStr = requestID.toString(); @@ -1590,7 +1591,7 @@ private static void sendAlreadyLogedOutResp(HttpServletResponse response, HttpSe realm, SAML2Constants.IDP_ROLE, logoutReq.getIssuer().getSPProvidedID()); SingleLogoutServiceElement endpoint = getLogoutResponseEndpoint(realm, spEntityID, binding); - binding = endpoint.getBinding(); + binding = endpoint.getValue().getBinding(); String location = getResponseLocation(endpoint); debug.message(classMethod + "Location found: " + location + " for binding " + binding); logRes.setDestination(XMLUtils.escapeSpecialCharacters(location)); @@ -1773,6 +1774,6 @@ public static List getSPSLOServiceEndpoints( throw new SAML2Exception(SAML2Utils.bundle.getString("metaDataError")); } - return spsso.getSingleLogoutService(); + return spsso.getValue().getSingleLogoutService(); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/LogoutUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/LogoutUtil.java index 424a36f9be..7b8cd71bdb 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/LogoutUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/LogoutUtil.java @@ -25,7 +25,7 @@ * $Id: LogoutUtil.java,v 1.16 2009/11/20 21:41:16 exu Exp $ * * Portions Copyrighted 2012-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -45,6 +45,7 @@ import java.util.Set; import java.util.logging.Level; +import com.sun.identity.saml2.jaxb.metadata.KeyDescriptorElement; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.xml.soap.SOAPException; @@ -70,7 +71,6 @@ import com.sun.identity.saml2.jaxb.entityconfig.BaseConfigType; import com.sun.identity.saml2.jaxb.metadata.EndpointType; import com.sun.identity.saml2.jaxb.metadata.IDPSSODescriptorElement; -import com.sun.identity.saml2.jaxb.metadata.KeyDescriptorType; import com.sun.identity.saml2.jaxb.metadata.SPSSODescriptorElement; import com.sun.identity.saml2.jaxb.metadata.SingleLogoutServiceElement; import com.sun.identity.saml2.key.EncInfo; @@ -604,7 +604,7 @@ public static SingleLogoutServiceElement getMostAppropriateSLOServiceLocation( Map sloBindings = new HashMap(sloList.size()); for (SingleLogoutServiceElement sloEndpoint : sloList) { - sloBindings.put(sloEndpoint.getBinding(), sloEndpoint); + sloBindings.put(sloEndpoint.getValue().getBinding(), sloEndpoint); } SingleLogoutServiceElement endpoint = sloBindings.get(preferredBinding); @@ -651,7 +651,7 @@ public static String getSLOServiceLocation( for (int i=0; i signingCerts; if (hostEntityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { SPSSODescriptorElement spSSODesc = metaManager.getSPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(spSSODesc, remoteEntity, SAML2Constants.SP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(spSSODesc.getValue(), remoteEntity, SAML2Constants.SP_ROLE); } else { IDPSSODescriptorElement idpSSODesc = metaManager.getIDPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(idpSSODesc, remoteEntity, SAML2Constants.IDP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(idpSSODesc.getValue(), remoteEntity, SAML2Constants.IDP_ROLE); } if (!signingCerts.isEmpty()) { @@ -1018,10 +1018,10 @@ public static boolean verifySLOResponse(LogoutResponse sloResponse, Set signingCerts; if (hostEntityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { SPSSODescriptorElement spSSODesc = metaManager.getSPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(spSSODesc, remoteEntity, SAML2Constants.SP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(spSSODesc.getValue(), remoteEntity, SAML2Constants.SP_ROLE); } else { IDPSSODescriptorElement idpSSODesc = metaManager.getIDPSSODescriptor(realm, remoteEntity); - signingCerts = KeyUtil.getVerificationCerts(idpSSODesc, remoteEntity, SAML2Constants.IDP_ROLE); + signingCerts = KeyUtil.getVerificationCerts(idpSSODesc.getValue(), remoteEntity, SAML2Constants.IDP_ROLE); } if (!signingCerts.isEmpty()) { @@ -1063,18 +1063,18 @@ public static void setNameIDForSLORequest(LogoutRequest request, } EncInfo encryptInfo = null; - KeyDescriptorType keyDescriptor = null; + KeyDescriptorElement keyDescriptor = null; if (hostEntityRole.equalsIgnoreCase(SAML2Constants.IDP_ROLE)) { SPSSODescriptorElement spSSODesc = metaManager.getSPSSODescriptor(realm, remoteEntity); - keyDescriptor = KeyUtil.getKeyDescriptor(spSSODesc, "encryption"); - encryptInfo = KeyUtil.getEncInfo(spSSODesc, remoteEntity, + keyDescriptor = KeyUtil.getKeyDescriptor(spSSODesc.getValue(), "encryption"); + encryptInfo = KeyUtil.getEncInfo(spSSODesc.getValue(), remoteEntity, SAML2Constants.SP_ROLE); } else { IDPSSODescriptorElement idpSSODesc = metaManager.getIDPSSODescriptor(realm, remoteEntity); - keyDescriptor = KeyUtil.getKeyDescriptor(idpSSODesc, "encryption"); - encryptInfo = KeyUtil.getEncInfo(idpSSODesc, remoteEntity, + keyDescriptor = KeyUtil.getKeyDescriptor(idpSSODesc.getValue(), "encryption"); + encryptInfo = KeyUtil.getEncInfo(idpSSODesc.getValue(), remoteEntity, SAML2Constants.IDP_ROLE); } @@ -1252,7 +1252,7 @@ public static String getSLOBindingInfo(HttpServletRequest request, getSLOServiceElement(realm, remoteEntityID, hostEntityRole, null); if (sloService != null) { - binding = sloService.getBinding(); + binding = sloService.getValue().getBinding(); } } } catch (SessionException e) { @@ -1320,16 +1320,16 @@ static public SingleLogoutServiceElement getIDPSLOConfig( return null; } - List list = idpSSODesc.getSingleLogoutService(); + List list = idpSSODesc.getValue().getSingleLogoutService(); if ((list != null) && !list.isEmpty()) { if (binding == null) { - return (SingleLogoutServiceElement)list.get(0); + return list.get(0); } - Iterator it = list.iterator(); + Iterator it = list.iterator(); while (it.hasNext()) { - slo = (SingleLogoutServiceElement)it.next(); - if (binding.equalsIgnoreCase(slo.getBinding())) { + slo = it.next(); + if (binding.equalsIgnoreCase(slo.getValue().getBinding())) { break; } } @@ -1361,7 +1361,7 @@ static public SingleLogoutServiceElement getSPSLOConfig( return null; } - List list = spSSODesc.getSingleLogoutService(); + List list = spSSODesc.getValue().getSingleLogoutService(); if ((list != null) && !list.isEmpty()) { if (binding == null) { @@ -1370,7 +1370,7 @@ static public SingleLogoutServiceElement getSPSLOConfig( Iterator it = list.iterator(); while (it.hasNext()) { slo = (SingleLogoutServiceElement)it.next(); - if (binding.equalsIgnoreCase(slo.getBinding())) { + if (binding.equalsIgnoreCase(slo.getValue().getBinding())) { break; } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/NameIDMapping.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/NameIDMapping.java index 2efee6f720..0ccc95af2f 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/NameIDMapping.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/NameIDMapping.java @@ -25,7 +25,7 @@ * $Id: NameIDMapping.java,v 1.6 2009/11/20 21:41:16 exu Exp $ * * Portions Copyrighted 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -183,7 +183,7 @@ public static NameIDMappingResponse initiateNameIDMappingRequest( getNameIDMappingService(realm, idpEntityID, binding); if (nameIDMappingService != null) { - nimURL = nameIDMappingService.getLocation(); + nimURL = nameIDMappingService.getValue().getLocation(); } } if (SAML2Utils.debug.messageEnabled()) { @@ -204,7 +204,7 @@ public static NameIDMappingResponse initiateNameIDMappingRequest( signNIMRequest(nimRequest, realm, spEntityID, true); BaseConfigType config = metaManager.getIDPSSOConfig(realm, - idpEntityID); + idpEntityID).getValue(); nimURL = SAML2SDKUtils.fillInBasicAuthInfo(config, nimURL); @@ -448,7 +448,7 @@ static public NameIDMappingServiceElement getNameIDMappingService( return null; } - List list = idpSSODesc.getNameIDMappingService(); + List list = idpSSODesc.getValue().getNameIDMappingService(); NameIDMappingServiceElement nimService = null; if ((list != null) && !list.isEmpty()) { @@ -458,7 +458,7 @@ static public NameIDMappingServiceElement getNameIDMappingService( Iterator it = list.iterator(); while (it.hasNext()) { nimService = (NameIDMappingServiceElement)it.next(); - if (binding.equalsIgnoreCase(nimService.getBinding())) { + if (binding.equalsIgnoreCase(nimService.getValue().getBinding())) { return nimService; } } @@ -472,9 +472,9 @@ static EncryptedID getEncryptedID(NameID nameID, String realm, RoleDescriptorType roled = null; if (role.equals(SAML2Constants.SP_ROLE)) { - roled = metaManager.getSPSSODescriptor(realm, entityID); + roled = metaManager.getSPSSODescriptor(realm, entityID).getValue(); } else { - roled = metaManager.getIDPSSODescriptor(realm, entityID); + roled = metaManager.getIDPSSODescriptor(realm, entityID).getValue(); } EncInfo encInfo = KeyUtil.getEncInfo(roled, entityID, role); @@ -570,7 +570,7 @@ private static boolean verifyNIMResponse(NameIDMappingResponse nimResponse, IDPSSODescriptorElement idpSSODesc = metaManager.getIDPSSODescriptor( realm, idpEntityID); - Set signingCerts = KeyUtil.getVerificationCerts(idpSSODesc, idpEntityID, + Set signingCerts = KeyUtil.getVerificationCerts(idpSSODesc.getValue(), idpEntityID, SAML2Constants.IDP_ROLE); if (!signingCerts.isEmpty()) { @@ -591,7 +591,7 @@ private static NameID getNameID(NameIDMappingRequest nimRequest, String realm, S EncryptedID encryptedID = nimRequest.getEncryptedID(); try { final IDPSSOConfigElement idpSsoConfig = metaManager.getIDPSSOConfig(realm, idpEntityID); - nameID = encryptedID.decrypt(KeyUtil.getDecryptionKeys(idpSsoConfig)); + nameID = encryptedID.decrypt(KeyUtil.getDecryptionKeys(idpSsoConfig.getValue())); } catch (SAML2Exception ex) { if (SAML2Utils.debug.messageEnabled()) { SAML2Utils.debug.message("NameIDMapping.getNameID:", ex); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPACSUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPACSUtils.java index 53a9cbc135..14869dcdb9 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPACSUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPACSUtils.java @@ -26,7 +26,7 @@ * * Portions Copyrighted 2010-2016 ForgeRock AS. * Portions Copyrighted 2016 Nomura Research Institute, Ltd. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -392,7 +392,7 @@ private static Response getResponseFromArtifact(String samlArt, IDPSSOConfigElement config = null; config = sm.getIDPSSOConfig(orgName, idpEntityID); location = SAML2Utils.fillInBasicAuthInfo( - config, location); + config.getValue(), location); resMsg = con.call(msg, location); } catch (SAML2Exception s2e) { SAML2Utils.debug.error("SPACSUtils.getResponseFromArtifact: " @@ -496,7 +496,7 @@ private static String getIDPArtifactResolutionServiceUrl( throws SAML2Exception,IOException { // find the artifact resolution service url - List arsList=idp.getArtifactResolutionService(); + List arsList=idp.getValue().getArtifactResolutionService(); ArtifactResolutionServiceElement ars = null; String location = null; String defaultLocation = null; @@ -505,10 +505,10 @@ private static String getIDPArtifactResolutionServiceUrl( boolean isDefault = false; for (int i=0; i verificationCerts = KeyUtil.getVerificationCerts(idp, idpEntityID, + Set verificationCerts = KeyUtil.getVerificationCerts(idp.getValue(), idpEntityID, SAML2Constants.IDP_ROLE); if (!artiResp.isSigned() || !artiResp.isSignatureValid(verificationCerts)) { if (SAML2Utils.debug.messageEnabled()) { @@ -834,7 +834,7 @@ private static ResponseInfo getResponseFromPostECP( throw se; } - Set certificates = KeyUtil.getVerificationCerts(idpDesc, idpEntityID, SAML2Constants.IDP_ROLE); + Set certificates = KeyUtil.getVerificationCerts(idpDesc.getValue(), idpEntityID, SAML2Constants.IDP_ROLE); List assertions = resp.getAssertion(); if ((assertions != null) && (!assertions.isEmpty())) { for(Iterator iter = assertions.iterator(); iter.hasNext(); ) { @@ -1055,7 +1055,7 @@ public static Object processResponse( boolean needAttributeEncrypted = getNeedAttributeEncrypted(needAssertionEncrypted, spssoconfig); boolean needNameIDEncrypted = getNeedNameIDEncrypted(needAssertionEncrypted, spssoconfig); - Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig); + Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig.getValue()); if (needNameIDEncrypted && encId == null) { SAML2Utils.debug.error(classMethod + "process: NameID was not encrypted."); @@ -1096,7 +1096,7 @@ public static Object processResponse( } String nameIDFormat = nameId.getFormat(); if (nameIDFormat != null) { - List spNameIDFormatList = spDesc.getNameIDFormat(); + List spNameIDFormatList = spDesc.getValue().getNameIDFormat(); if ((spNameIDFormatList != null) && (!spNameIDFormatList.isEmpty()) && (!spNameIDFormatList.contains(nameIDFormat))) { @@ -1815,7 +1815,7 @@ private static String getAttributeValueFromSPSSOConfig(String orgName, if (config == null) { return null; } - Map attrs = SAML2MetaUtils.getAttributes(config); + Map attrs = SAML2MetaUtils.getAttributes(config.getValue()); List value = (List) attrs.get(attrName); if (value != null && value.size() != 0) { result = ((String) value.iterator().next()).trim(); @@ -2076,7 +2076,7 @@ public static String getPrincipalWithoutLogin(Subject assertionSubject, Assertio final EncryptedID encId = assertionSubject.getEncryptedID(); final SPSSOConfigElement spssoconfig = metaManager.getSPSSOConfig(realm, spEntityId); - final Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig); + final Set decryptionKeys = KeyUtil.getDecryptionKeys(spssoconfig.getValue()); final SPAccountMapper acctMapper = SAML2Utils.getSPAccountMapper(realm, spEntityId); boolean needNameIDEncrypted = false; @@ -2111,7 +2111,7 @@ public static String getPrincipalWithoutLogin(Subject assertionSubject, Assertio final String nameIDFormat = nameId.getFormat(); if (nameIDFormat != null) { - List spNameIDFormatList = spDesc.getNameIDFormat(); + List spNameIDFormatList = spDesc.getValue().getNameIDFormat(); if (CollectionUtils.isNotEmpty(spNameIDFormatList) && !spNameIDFormatList.contains(nameIDFormat)) { Object[] args = {nameIDFormat}; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSSOFederate.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSSOFederate.java index bc275565a3..17a273e1f6 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSSOFederate.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSSOFederate.java @@ -25,7 +25,7 @@ * $Id: SPSSOFederate.java,v 1.29 2009/11/24 21:53:28 madan_ranganath Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -250,21 +250,21 @@ private static void initiateAuthnRequest( } String binding = getParameter(paramsMap, SAML2Constants.REQ_BINDING); - List ssoServiceList = idpsso.getSingleSignOnService(); + List ssoServiceList = idpsso.getValue().getSingleSignOnService(); final SingleSignOnServiceElement endPoint = getSingleSignOnServiceEndpoint(ssoServiceList, binding); - if (endPoint == null || StringUtils.isEmpty(endPoint.getLocation())) { + if (endPoint == null || StringUtils.isEmpty(endPoint.getValue().getLocation())) { String[] data = { idpEntityID }; LogUtil.error(Level.INFO, LogUtil.SSO_NOT_FOUND, data, null); throw new SAML2Exception(SAML2Utils.bundle.getString("ssoServiceNotfound")); } - String ssoURL = endPoint.getLocation(); + String ssoURL = endPoint.getValue().getLocation(); SAML2Utils.debug.message("SPSSOFederate: SingleSignOnService URL : {}", ssoURL); if (binding == null) { SAML2Utils.debug.message("SPSSOFederate: reqBinding is null using endpoint binding: {} ", - endPoint.getBinding()); - binding = endPoint.getBinding(); + endPoint.getValue().getBinding()); + binding = endPoint.getValue().getBinding(); if (binding == null) { String[] data = { idpEntityID }; LogUtil.error(Level.INFO, LogUtil.NO_RETURN_BINDING, data, null); @@ -374,7 +374,7 @@ public static String getRedirect(String authReqXMLString, String relayStateID, S StringBuilder redirectURL = new StringBuilder().append(ssoURL).append(ssoURL.contains("?") ? "&" : "?"); // sign the query string - if (idpsso.isWantAuthnRequestsSigned() || spsso.isAuthnRequestsSigned()) { + if (idpsso.getValue().isWantAuthnRequestsSigned() || spsso.getValue().isAuthnRequestsSigned()) { String certAlias = getParameter(spConfigAttrsMap, SAML2Constants.SIGNING_CERT_ALIAS); String signedQueryStr = signQueryString(queryString.toString(), certAlias); redirectURL.append(signedQueryStr); @@ -412,7 +412,7 @@ public static Map> getAttrsMapForAuthnReq(String real Map spConfigAttrsMap = null; if (spEntityCfg != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg.getValue()); } return spConfigAttrsMap; @@ -445,7 +445,7 @@ public static String getPostBindingMsg(IDPSSODescriptorElement idpsso, SPSSODesc Map spConfigAttrsMap, AuthnRequest authnRequest) throws SAML2Exception { - if (idpsso.isWantAuthnRequestsSigned() || spsso.isAuthnRequestsSigned()) { + if (idpsso.getValue().isWantAuthnRequestsSigned() || spsso.getValue().isAuthnRequestsSigned()) { String certAlias = getParameter(spConfigAttrsMap, SAML2Constants.SIGNING_CERT_ALIAS); signAuthnRequest(certAlias, authnRequest); } @@ -503,7 +503,7 @@ public static void initiateECPRequest(HttpServletRequest request, sm.getSPSSOConfig(realm,spEntityID); Map spConfigAttrsMap=null; if (spEntityCfg != null) { - spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg); + spConfigAttrsMap = SAML2MetaUtils.getAttributes(spEntityCfg.getValue()); } // get SPSSODescriptor SPSSODescriptorElement spsso = @@ -586,12 +586,12 @@ public static void initiateECPRequest(HttpServletRequest request, realm, idpEntityID, SAML2Constants.IDP_ROLE, SAML2Constants.ENTITY_DESCRIPTION); idpEntry.setName(description); - List ssoServiceList = idpDesc.getSingleSignOnService(); + List ssoServiceList = idpDesc.getValue().getSingleSignOnService(); SingleSignOnServiceElement endPoint = getSingleSignOnServiceEndpoint(ssoServiceList, SAML2Constants.SOAP); - if (endPoint == null || StringUtils.isEmpty(endPoint.getLocation())) { + if (endPoint == null || StringUtils.isEmpty(endPoint.getValue().getLocation())) { throw new SAML2Exception(SAML2Utils.bundle.getString("ssoServiceNotfound")); } - String ssoURL = endPoint.getLocation(); + String ssoURL = endPoint.getValue().getLocation(); SAML2Utils.debug.message("SPSSOFederate.initiateECPRequest URL : {}", ssoURL); idpEntry.setLoc(ssoURL); if (idpEntries == null) { @@ -605,7 +605,7 @@ public static void initiateECPRequest(HttpServletRequest request, .createIDPList(); idpList.setIDPEntries(idpEntries); ecpRequest.setIDPList(idpList); - Map attrs = SAML2MetaUtils.getAttributes(spEntityCfg); + Map attrs = SAML2MetaUtils.getAttributes(spEntityCfg.getValue()); List values = (List)attrs.get( SAML2Constants.ECP_REQUEST_IDP_LIST_GET_COMPLETE); if ((values != null) && (!values.isEmpty())) { @@ -965,11 +965,11 @@ public static SingleSignOnServiceElement getSingleSignOnServiceEndpoint( SingleSignOnServiceElement preferredEndpoint = null; boolean noPreferredBinding = StringUtils.isEmpty(binding); for (SingleSignOnServiceElement endpoint : ssoServiceList) { - if (noPreferredBinding && (SAML2Constants.HTTP_REDIRECT.equals(endpoint.getBinding()) - || SAML2Constants.HTTP_POST.equals(endpoint.getBinding()))) { + if (noPreferredBinding && (SAML2Constants.HTTP_REDIRECT.equals(endpoint.getValue().getBinding()) + || SAML2Constants.HTTP_POST.equals(endpoint.getValue().getBinding()))) { preferredEndpoint = endpoint; break; - } else if (binding.equals(endpoint.getBinding())) { + } else if (binding.equals(endpoint.getValue().getBinding())) { preferredEndpoint = endpoint; break; } @@ -990,21 +990,21 @@ static OrderedSet getACSUrl(SPSSODescriptorElement spsso, new StringBuffer().append(SAML2Constants.BINDING_PREFIX) .append(binding).toString(); } - List acsList = spsso.getAssertionConsumerService(); + List acsList = spsso.getValue().getAssertionConsumerService(); String acsURL=null; if (acsList != null && !acsList.isEmpty()) { Iterator ac = acsList.iterator(); while (ac.hasNext()) { AssertionConsumerServiceElement ace = (AssertionConsumerServiceElement) ac.next(); - if ((ace != null && ace.isIsDefault()) && + if ((ace != null && ace.getValue().isIsDefault()) && (responseBinding == null || responseBinding.length() ==0 )) { - acsURL = ace.getLocation(); - responseBinding = ace.getBinding(); + acsURL = ace.getValue().getLocation(); + responseBinding = ace.getValue().getBinding(); break; } else if ((ace != null) && - (ace.getBinding().equals(responseBinding))) { - acsURL = ace.getLocation(); + (ace.getValue().getBinding().equals(responseBinding))) { + acsURL = ace.getValue().getLocation(); break; } } @@ -1165,7 +1165,7 @@ public static List getExtensionsList(String entityID,String realm) { EntityDescriptorElement ed = sm.getEntityDescriptor(realm,entityID); if (ed != null) { com.sun.identity.saml2.jaxb.metadata.ExtensionsType ext = - ed.getExtensions(); + ed.getValue().getExtensions(); if (ext != null) { extensionsList = ext.getAny(); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSessionListener.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSessionListener.java index 137b9ba092..82a7660dad 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSessionListener.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSessionListener.java @@ -25,6 +25,7 @@ * $Id: SPSessionListener.java,v 1.6 2009/09/23 22:28:32 bigfatrat Exp $ * * Portions Copyrighted 2014-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -33,6 +34,7 @@ import java.util.Map; import java.util.HashMap; import java.util.logging.Level; +import java.util.stream.Collectors; import com.sun.identity.plugin.monitoring.FedMonAgent; import com.sun.identity.plugin.monitoring.FedMonSAML2Svc; @@ -54,6 +56,7 @@ import com.sun.identity.saml2.meta.SAML2MetaManager; import com.sun.identity.saml2.meta.SAML2MetaUtils; import com.sun.identity.shared.debug.Debug; +import jakarta.xml.bind.JAXBElement; /** @@ -142,7 +145,7 @@ public void sessionInvalidated(Object session) SAML2MetaUtils.getRealmByMetaAlias(metaAlias)); BaseConfigType spConfig = - sm.getSPSSOConfig(realm, spEntityID); + sm.getSPSSOConfig(realm, spEntityID).getValue(); if (spConfig != null) { List spSessionSyncList = (List) SAML2MetaUtils.getAttributes(spConfig). @@ -240,7 +243,8 @@ private static void initiateSPSingleLogout(String metaAlias, String realm, Strin throw new SAML2Exception(SAML2Utils.bundle.getString("metaDataError")); } - List slosList = idpsso.getSingleLogoutService(); + List slosList = idpsso.getValue().getSingleLogoutService() + .stream().map(JAXBElement::getValue).collect(Collectors.toList()); String location = LogoutUtil.getSLOServiceLocation(slosList, SAML2Constants.SOAP); if (location == null) { @@ -255,6 +259,6 @@ private static void initiateSPSingleLogout(String metaAlias, String realm, Strin IDPSSOConfigElement idpConfig = sm.getIDPSSOConfig(realm, nameIdInfoKey.getRemoteEntityID()); LogoutUtil.doLogout(metaAlias, nameIdInfoKey.getRemoteEntityID(), slosList, null, binding, null, - fedSession.idpSessionIndex, fedSession.info.getNameID(), null, null, paramsMap, idpConfig); + fedSession.idpSessionIndex, fedSession.info.getNameID(), null, null, paramsMap, idpConfig.getValue()); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java index a057221d6d..2d8cbed654 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java @@ -25,7 +25,7 @@ * $Id: SPSingleLogout.java,v 1.29 2009/11/24 21:53:28 madan_ranganath Exp $ * * Portions Copyrighted 2013-2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.profile; @@ -447,7 +447,7 @@ private static String prepareForLogout(String realm, SAML2Utils.bundle.getString("metaDataError")); } - List slosList = idpsso.getSingleLogoutService(); + List slosList = idpsso.getValue().getSingleLogoutService(); if (slosList == null) { String[] data = {nameIdInfoKey.getRemoteEntityID()}; LogUtil.error(Level.INFO,LogUtil.SLO_NOT_FOUND,data, @@ -476,7 +476,7 @@ private static String prepareForLogout(String realm, request, response, paramsMap, - idpConfig); + idpConfig.getValue()); String requestIDStr = requestID.toString(); if (debug.messageEnabled()) { @@ -906,7 +906,7 @@ public static void processLogoutRequest( SAML2Utils.bundle.getString("metaDataError")); } - List slosList = idpsso.getSingleLogoutService(); + List slosList = idpsso.getValue().getSingleLogoutService(); if (slosList == null) { String[] data = {idpEntityID}; LogUtil.error(Level.INFO,LogUtil.SLO_NOT_FOUND,data, @@ -1191,7 +1191,7 @@ public static LogoutResponse processLogoutRequest( // get application logout URL BaseConfigType spConfig = SAML2Utils.getSAML2MetaManager() - .getSPSSOConfig(realm, spEntityID); + .getSPSSOConfig(realm, spEntityID).getValue(); List appLogoutURL = (List) SAML2MetaUtils.getAttributes( spConfig).get(SAML2Constants.APP_LOGOUT_URL); if (debug.messageEnabled()) { @@ -1462,7 +1462,7 @@ private static String getSLOResponseLocationOrLocation( SPSSODescriptorElement spsso, String binding) { String location = null; if (spsso != null) { - List sloList = spsso.getSingleLogoutService(); + List sloList = spsso.getValue().getSingleLogoutService(); if (sloList != null && !sloList.isEmpty()) { location = LogoutUtil.getSLOResponseServiceLocation( sloList, binding); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryClient.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryClient.java index 7a9e43243e..913f4b462b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryClient.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryClient.java @@ -26,7 +26,7 @@ * * Portions Copyrighted 2015-2016 ForgeRock AS. * Portions Copyrighted 2016 Nomura Research Institute, Ltd. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.soapbinding; @@ -190,7 +190,7 @@ public static Response processXACMLQuery(RequestAbstract request, endPoint = SAML2SDKUtils.fillInBasicAuthInfo( - pepConfig,endPoint); + pepConfig.getValue(),endPoint); String[] urls = { endPoint }; SOAPClient soapClient = new SOAPClient(urls); if (debug.messageEnabled()) { @@ -423,7 +423,7 @@ private static String getPDPEndPoint(String pdpEntityID) getPolicyDecisionPointDescriptor(null, pdpEntityID); if (pdpDescriptor != null) { - List xacmlPDP = pdpDescriptor.getXACMLAuthzService(); + List xacmlPDP = pdpDescriptor.getValue().getXACMLAuthzService(); if (xacmlPDP != null) { Iterator i = xacmlPDP.iterator(); while (i.hasNext()) { @@ -431,7 +431,7 @@ private static String getPDPEndPoint(String pdpEntityID) if (o instanceof XACMLAuthzServiceElement) { XACMLAuthzServiceElement xType = (XACMLAuthzServiceElement) o; - endPoint = xType.getLocation(); + endPoint = xType.getValue().getLocation(); if (debug.messageEnabled()) { debug.message(classMethod + "EndPoint :" + endPoint); @@ -590,7 +590,7 @@ private static Response verifyResponse(String realm,String pepEntityID, Set decryptionKeys; List encAssertions = samlResponse.getEncryptedAssertion(); if (encAssertions != null) { - decryptionKeys = KeyUtil.getDecryptionKeys(pepConfig); + decryptionKeys = KeyUtil.getDecryptionKeys(pepConfig.getValue()); for (EncryptedAssertion encAssertion : encAssertions) { Assertion assertion = encAssertion.decrypt(decryptionKeys); if (assertions == null) { @@ -740,7 +740,7 @@ private static String getAttributeValueFromPEPConfig( } String result = null; - Map attrs = SAML2MetaUtils.getAttributes(pepConfig); + Map attrs = SAML2MetaUtils.getAttributes(pepConfig.getValue()); if (attrs != null) { List value = (List) attrs.get(attrName); @@ -774,7 +774,7 @@ private static String getAttributeValueFromPDPConfig( } String result = null; - Map attrs = SAML2MetaUtils.getAttributes(pdpConfig); + Map attrs = SAML2MetaUtils.getAttributes(pdpConfig.getValue()); if (attrs != null) { List value = (List) attrs.get(attrName); @@ -808,7 +808,7 @@ private static boolean wantAssertionSigned(String realm,String pepEntityID) getPolicyEnforcementPointDescriptor(realm, pepEntityID); - return pepDescriptor.isWantAssertionsSigned(); + return pepDescriptor.getValue().isWantAssertionsSigned(); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryHandlerServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryHandlerServlet.java index 3cc254d0fb..1de24b6a0c 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryHandlerServlet.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/soapbinding/QueryHandlerServlet.java @@ -25,7 +25,7 @@ * $Id: QueryHandlerServlet.java,v 1.9 2009/09/22 22:49:28 madan_ranganath Exp $ * * Portions Copyrighted 2012-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.saml2.soapbinding; @@ -418,7 +418,7 @@ Response processXACMLResponse(String realm,String pdpEntityID, pepEntityID); EncInfo encInfo = null; - boolean wantAssertionSigned=pepDescriptor.isWantAssertionsSigned(); + boolean wantAssertionSigned=pepDescriptor.getValue().isWantAssertionsSigned(); if (debug.messageEnabled()) { debug.message(classMethod + diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/WSFederationUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/WSFederationUtils.java index 23eff6934d..8594079823 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/WSFederationUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/WSFederationUtils.java @@ -25,7 +25,7 @@ * $Id: WSFederationUtils.java,v 1.6 2009/10/28 23:58:58 exu Exp $ * * Portions Copyrighted 2015-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.common; @@ -521,8 +521,8 @@ public static SAML11RequestedSecurityToken createSAML11Token(String realm, Strin throw new WSFederationException(se); } - IDPAttributeMapper attrMapper = getIDPAttributeMapper(WSFederationMetaUtils.getAttributes(idpConfig)); - IDPAccountMapper accountMapper = getIDPAccountMapper(WSFederationMetaUtils.getAttributes(idpConfig)); + IDPAttributeMapper attrMapper = getIDPAttributeMapper(WSFederationMetaUtils.getAttributes(idpConfig.getValue())); + IDPAccountMapper accountMapper = getIDPAccountMapper(WSFederationMetaUtils.getAttributes(idpConfig.getValue())); List attributes = attrMapper.getAttributes(session, idpEntityId, spEntityId, realm); @@ -539,13 +539,13 @@ public static SAML11RequestedSecurityToken createSAML11Token(String realm, Strin NameIdentifier nameIdentifier = accountMapper.getNameID(session, realm, idpEntityId, spEntityId); - int notBeforeSkew = WSFederationMetaUtils.getIntAttribute(idpConfig, + int notBeforeSkew = WSFederationMetaUtils.getIntAttribute(idpConfig.getValue(), SAML2Constants.ASSERTION_NOTBEFORE_SKEW_ATTRIBUTE, SAML2Constants.NOTBEFORE_ASSERTION_SKEW_DEFAULT); - int effectiveTime = WSFederationMetaUtils.getIntAttribute(idpConfig, + int effectiveTime = WSFederationMetaUtils.getIntAttribute(idpConfig.getValue(), SAML2Constants.ASSERTION_EFFECTIVE_TIME_ATTRIBUTE, SAML2Constants.ASSERTION_EFFECTIVE_TIME); - String certAlias = WSFederationMetaUtils.getAttribute(idpConfig, SAML2Constants.SIGNING_CERT_ALIAS); + String certAlias = WSFederationMetaUtils.getAttribute(idpConfig.getValue(), SAML2Constants.SIGNING_CERT_ALIAS); if (wantAssertionSigned && certAlias == null) { // SP wants us to sign the assertion, but we don't have a signing cert diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/NamespacePrefixMapperImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/NamespacePrefixMapperImpl.java index 26384ba2a5..1aebb4a7f1 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/NamespacePrefixMapperImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/NamespacePrefixMapperImpl.java @@ -23,13 +23,15 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: NamespacePrefixMapperImpl.java,v 1.3 2008/06/25 05:48:05 qcheng Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.wsfederation.meta; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; /** * Stub implementation - need this for JAXB marshalling diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java index c6c07c46ef..df539b5181 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java @@ -23,22 +23,26 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: WSFederationCOTUtils.java,v 1.5 2009/10/28 23:58:59 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ package com.sun.identity.wsfederation.meta; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Iterator; import java.util.List; import com.sun.identity.shared.debug.Debug; import com.sun.identity.saml2.common.SAML2Constants; +import com.sun.identity.wsfederation.jaxb.entityconfig.AttributeElement; import com.sun.identity.wsfederation.jaxb.entityconfig.AttributeType; import com.sun.identity.wsfederation.jaxb.entityconfig.BaseConfigType; import com.sun.identity.wsfederation.jaxb.entityconfig.FederationConfigElement; import com.sun.identity.wsfederation.jaxb.entityconfig.ObjectFactory; import com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement; +import jakarta.xml.bind.JAXBElement; /** * WSFederationCOTUtils provides utility methods to update @@ -93,44 +97,44 @@ public void updateEntityConfig(String realm, String name, FederationConfigElement eConfig = metaManager.getEntityConfig(realm, entityId); if (eConfig == null) { - BaseConfigType bctype = null; + JAXBElement bctype = null; AttributeType atype = objFactory.createAttributeType(); atype.setName(SAML2Constants.COT_LIST); atype.getValue().add(name); // add to eConfig FederationConfigElement ele = - objFactory.createFederationConfigElement(); - ele.setFederationID(entityId); - ele.setHosted(false); - List ll = - ele.getIDPSSOConfigOrSPSSOConfig(); + objFactory.createFederationConfigElement(objFactory.createFederationConfigType()); + ele.getValue().setFederationID(entityId); + ele.getValue().setHosted(false); + List> ll = + ele.getValue().getIDPSSOConfigOrSPSSOConfig(); // Decide which role EntityDescriptorElement includes // Right now, it is either an SP or an IdP // IdP will have UriNamedClaimTypesOffered if (metaManager.getUriNamedClaimTypesOffered(edes) != null) { - bctype = objFactory.createIDPSSOConfigElement(); - bctype.getAttribute().add(atype); + bctype = objFactory.createIDPSSOConfigElement(new BaseConfigType() {}); + bctype.getValue().getAttribute().add(objFactory.createAttributeElement(atype)); ll.add(bctype); } else { - bctype = objFactory.createSPSSOConfigElement(); - bctype.getAttribute().add(atype); + bctype = objFactory.createSPSSOConfigElement(new BaseConfigType() {}); + bctype.getValue().getAttribute().add(objFactory.createAttributeElement(atype)); ll.add(bctype); } metaManager.setEntityConfig(realm,ele); } else { - List elist = eConfig. + List> elist = eConfig.getValue(). getIDPSSOConfigOrSPSSOConfig(); - for (Iterator iter = elist.iterator(); iter.hasNext();) { - BaseConfigType bConfig = (BaseConfigType)iter.next(); - List list = bConfig.getAttribute(); + for (Iterator> iter = elist.iterator(); iter.hasNext();) { + BaseConfigType bConfig = iter.next().getValue(); + List list = bConfig.getAttribute(); boolean foundCOT = false; - for (Iterator iter2 = list.iterator(); iter2.hasNext();) { - AttributeType avp = (AttributeType)iter2.next(); + for (Iterator iter2 = list.iterator(); iter2.hasNext();) { + AttributeType avp = iter2.next().getValue(); if (avp.getName().trim().equalsIgnoreCase( SAML2Constants.COT_LIST)) { foundCOT = true; - List avpl = avp.getValue(); + List avpl = avp.getValue(); if (avpl.isEmpty() ||!containsValue(avpl,name)) { avpl.add(name); metaManager.setEntityConfig(realm, @@ -141,9 +145,9 @@ public void updateEntityConfig(String realm, String name, } // no cot_list in the original entity config if (!foundCOT) { - AttributeType atype = objFactory.createAttributeType(); - atype.setName(SAML2Constants.COT_LIST); - atype.getValue().add(name); + AttributeElement atype = objFactory.createAttributeElement(objFactory.createAttributeType()); + atype.getValue().setName(SAML2Constants.COT_LIST); + atype.getValue().getValue().add(name); list.add(atype); metaManager.setEntityConfig(realm, eConfig); } @@ -193,7 +197,7 @@ public void removeFromEntityConfig(String realm, String name, FederationConfigElement eConfig = metaManager.getEntityConfig(realm, entityId); if (eConfig != null) { - List elist = eConfig. + List elist = eConfig.getValue(). getIDPSSOConfigOrSPSSOConfig(); for (Iterator iter = elist.iterator(); iter.hasNext();) { BaseConfigType bConfig = (BaseConfigType)iter.next(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaManager.java index df2ef57138..dcacc9270b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaManager.java @@ -25,6 +25,8 @@ * $Id: WSFederationMetaManager.java,v 1.8 2009/10/28 23:58:59 exu Exp $ * * Portions Copyrighted 2015 ForgeRock AS. + * + * Portions Copyrighted 2026 3A Systems LLC. */ @@ -45,7 +47,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import com.sun.identity.cot.CircleOfTrustManager; import com.sun.identity.cot.COTException; @@ -62,6 +64,7 @@ import com.sun.identity.wsfederation.jaxb.wsse.SecurityTokenReferenceType; import com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType; import com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509Certificate; +import jakarta.xml.bind.JAXBElement; /** * The WSFederationMetaManager provides methods to manage both the @@ -235,7 +238,7 @@ public FederationElement getEntityDescriptor(String realm, public void setFederation(String realm, FederationElement federation) throws WSFederationMetaException { - String federationId = federation.getFederationID(); + String federationId = federation.getValue().getFederationID(); if (federationId == null) { federationId = WSFederationConstants.DEFAULT_FEDERATION_ID; } @@ -286,7 +289,7 @@ public void createFederation(String realm, FederationElement federation) throws WSFederationMetaException { - String federationId = federation.getFederationID(); + String federationId = federation.getValue().getFederationID(); if (federationId == null) { federationId = WSFederationConstants.DEFAULT_FEDERATION_ID; } @@ -347,13 +350,13 @@ public void deleteFederation(String realm, String federationId) IDPSSOConfigElement idpconfig = getIDPSSOConfig(realm, federationId); if (idpconfig !=null) { - removeFromCircleOfTrust(idpconfig, realm, federationId); + removeFromCircleOfTrust(idpconfig.getValue(), realm, federationId); } SPSSOConfigElement spconfig = getSPSSOConfig(realm, federationId); if (spconfig != null) { - removeFromCircleOfTrust(spconfig, realm, federationId); + removeFromCircleOfTrust(spconfig.getValue(), realm, federationId); } // end of remove entity from cot configInst.deleteConfiguration(realm, federationId, null); @@ -477,10 +480,10 @@ public SPSSOConfigElement getSPSSOConfig(String realm, return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { + JAXBElement obj = iter.next(); if (obj instanceof SPSSOConfigElement) { return (SPSSOConfigElement)obj; } @@ -508,9 +511,9 @@ public IDPSSOConfigElement getIDPSSOConfig(String realm, return null; } - List list = - eConfig.getIDPSSOConfigOrSPSSOConfig(); - for(Iterator iter = list.iterator(); iter.hasNext();) { + List> list = + eConfig.getValue().getIDPSSOConfigOrSPSSOConfig(); + for(Iterator> iter = list.iterator(); iter.hasNext();) { Object obj = iter.next(); if (obj instanceof IDPSSOConfigElement) { return (IDPSSOConfigElement)obj; @@ -539,7 +542,7 @@ public BaseConfigType getBaseConfig(String realm, return null; } - return (BaseConfigType)eConfig.getIDPSSOConfigOrSPSSOConfig().get(0); + return (BaseConfigType)eConfig.getValue().getIDPSSOConfigOrSPSSOConfig().get(0).getValue(); } /** @@ -554,7 +557,7 @@ public void setEntityConfig(String realm, FederationConfigElement config) throws WSFederationMetaException { - String federationId = config.getFederationID(); + String federationId = config.getValue().getFederationID(); if (federationId == null) { debug.error("WSFederationMetaManager.setEntityConfig: " + "entity ID is null"); @@ -612,7 +615,7 @@ public void createEntityConfig(String realm, FederationConfigElement config) throws WSFederationMetaException { - String federationId = config.getFederationID(); + String federationId = config.getValue().getFederationID(); if (federationId == null) { debug.error("WSFederationMetaManager.createEntityConfig: " + "entity ID is null"); @@ -659,12 +662,12 @@ public void createEntityConfig(String realm, SPSSOConfigElement spconfig = getSPSSOConfig(realm, federationId); if (spconfig != null) { - addToCircleOfTrust(spconfig, realm, federationId); + addToCircleOfTrust(spconfig.getValue(), realm, federationId); } IDPSSOConfigElement idpconfig = getIDPSSOConfig(realm, federationId); if (idpconfig !=null) { - addToCircleOfTrust(idpconfig, realm, federationId); + addToCircleOfTrust(idpconfig.getValue(), realm, federationId); } } catch (ConfigurationException e) { debug.error("WSFederationMetaManager.createEntityConfig:", e); @@ -741,13 +744,13 @@ public void deleteEntityConfig(String realm, String federationId) IDPSSOConfigElement idpconfig = getIDPSSOConfig(realm, federationId); if (idpconfig !=null) { - removeFromCircleOfTrust(idpconfig, realm, federationId); + removeFromCircleOfTrust(idpconfig.getValue(), realm, federationId); } SPSSOConfigElement spconfig = getSPSSOConfig(realm, federationId); if (spconfig != null) { - removeFromCircleOfTrust(spconfig, realm, federationId); + removeFromCircleOfTrust(spconfig.getValue(), realm, federationId); } Set attr = new HashSet(); @@ -830,12 +833,12 @@ public List getAllHostedMetaAliasesByRealm(String realm) throws WSFedera } for (String entityId : entityIds) { FederationConfigElement config = getEntityConfig(realm, entityId); - if (config == null || !config.isHosted()) { + if (config == null || !config.getValue().isHosted()) { continue; } - List configList = config.getIDPSSOConfigOrSPSSOConfig(); - for (BaseConfigType bConfigType : configList) { - String curMetaAlias = bConfigType.getMetaAlias(); + List> configList = config.getValue().getIDPSSOConfigOrSPSSOConfig(); + for (JAXBElement bConfigType : configList) { + String curMetaAlias = bConfigType.getValue().getMetaAlias(); if (curMetaAlias != null && !curMetaAlias.isEmpty()) { metaAliases.add(curMetaAlias); } @@ -893,7 +896,7 @@ public List getAllHostedEntities(String realm) String federationId = (String)iter.next(); FederationConfigElement config = getEntityConfig(realm, federationId); - if (config != null && config.isHosted()) { + if (config != null && config.getValue().isHosted()) { hostedEntityIds.add(federationId); } } @@ -970,7 +973,7 @@ public List getAllHostedIdentityProviderEntities( public List getAllRemoteEntities(String realm) throws WSFederationMetaException { - List remoteEntityIds = new ArrayList(); + List remoteEntityIds = new ArrayList<>(); String[] objs = { realm }; try { Set entityIds = configInst.getAllConfigurationNames(realm); @@ -979,7 +982,7 @@ public List getAllRemoteEntities(String realm) String federationId = (String)iter.next(); FederationConfigElement config = getEntityConfig(realm, federationId); - if (config == null || !config.isHosted()) { + if (config == null || !config.getValue().isHosted()) { remoteEntityIds.add(federationId); } } @@ -1069,10 +1072,10 @@ public String getEntityByMetaAlias(String metaAlias) if (config == null) { continue; } - List list = - config.getIDPSSOConfigOrSPSSOConfig(); - for(Iterator iter2 = list.iterator(); iter2.hasNext();) { - BaseConfigType bConfig = (BaseConfigType)iter2.next(); + List> list = + config.getValue().getIDPSSOConfigOrSPSSOConfig(); + for(Iterator> iter2 = list.iterator(); iter2.hasNext();) { + BaseConfigType bConfig = iter2.next().getValue(); String cMetaAlias = bConfig.getMetaAlias(); if (cMetaAlias != null && cMetaAlias.equals(metaAlias)) { return federationId; @@ -1142,22 +1145,22 @@ public String getRoleByMetaAlias(String metaAlias) SPSSOConfigElement spConfig = getSPSSOConfig(realm, federationId); if (idpConfig == null) { - String m = spConfig.getMetaAlias(); + String m = spConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.SP_ROLE; } } else if (spConfig == null) { - String m = idpConfig.getMetaAlias(); + String m = idpConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.IDP_ROLE; } } else { //Assuming that sp and idp cannot have the same metaAlias - String m = spConfig.getMetaAlias(); + String m = spConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.SP_ROLE; } else { - m = idpConfig.getMetaAlias(); + m = idpConfig.getValue().getMetaAlias(); if ((m != null) && m.equals(metaAlias)) { role = SAML2Constants.IDP_ROLE; } @@ -1186,7 +1189,7 @@ public List getAllHostedIdentityProviderMetaAliases( = getAllHostedIdentityProviderEntities(realm); for(String federationId : hostedEntityIds) { if ((idpConfig = getIDPSSOConfig(realm, federationId)) != null) { - metaAliases.add(idpConfig.getMetaAlias()); + metaAliases.add(idpConfig.getValue().getMetaAlias()); } } return metaAliases; @@ -1210,7 +1213,7 @@ public List getAllHostedServiceProviderMetaAliases( realm); for(String federationId : hostedEntityIds) { if ((spConfig = getSPSSOConfig(realm, federationId)) != null) { - metaAliases.add(spConfig.getMetaAlias()); + metaAliases.add(spConfig.getValue().getMetaAlias()); } } return metaAliases; @@ -1234,7 +1237,7 @@ public boolean isTrustedProvider(String realm, String federationId, SPSSOConfigElement spconfig = getSPSSOConfig(realm, federationId); if (spconfig != null) { - result = isSameCircleOfTrust(spconfig, realm, + result = isSameCircleOfTrust(spconfig.getValue(), realm, trustedEntityId); } if (result) { @@ -1243,7 +1246,7 @@ public boolean isTrustedProvider(String realm, String federationId, IDPSSOConfigElement idpconfig = getIDPSSOConfig(realm, federationId); if (idpconfig !=null) { - return (isSameCircleOfTrust(idpconfig, realm, + return (isSameCircleOfTrust(idpconfig.getValue(), realm, trustedEntityId)); } return false; @@ -1315,11 +1318,11 @@ public Set getAllEntities(String realm) public String getTokenIssuerEndpoint(FederationElement fed) { // Just return first TokenIssuerEndpoint in the Federation - for ( Object o: fed.getAny() ) + for ( Object o: fed.getValue().getAny() ) { if ( o instanceof TokenIssuerEndpointElement ) { - return ((TokenIssuerEndpointElement)o).getAddress().getValue(); + return ((TokenIssuerEndpointElement)o).getValue().getAddress().getValue(); } } @@ -1335,11 +1338,11 @@ public String getTokenIssuerEndpoint(FederationElement fed) public String getTokenIssuerName(FederationElement fed) { // Just return first TokenIssuerName in the Federation - for ( Object o: fed.getAny() ) + for ( Object o: fed.getValue().getAny() ) { if ( o instanceof TokenIssuerNameElement ) { - return ((TokenIssuerNameElement)o).getValue(); + return ((TokenIssuerNameElement)o).getValue().getValue(); } } @@ -1356,12 +1359,12 @@ public String getTokenIssuerName(FederationElement fed) public byte[] getTokenSigningCertificate(FederationElement fed) { // Just return first TokenIssuerName in the Federation - for ( Object o: fed.getAny() ) + for ( Object o: fed.getValue().getAny() ) { if ( o instanceof TokenSigningKeyInfoElement ) { SecurityTokenReferenceType str = - ((TokenSigningKeyInfoElement)o).getSecurityTokenReference(); + ((TokenSigningKeyInfoElement)o).getValue().getSecurityTokenReference().getValue(); for ( Object o1: str.getAny() ) { if ( o1 instanceof X509DataType ) @@ -1395,7 +1398,7 @@ public UriNamedClaimTypesOfferedElement getUriNamedClaimTypesOffered( FederationElement fed) { // Just return first TokenIssuerName in the Federation - for ( Object o: fed.getAny() ) + for ( Object o: fed.getValue().getAny() ) { if ( o instanceof UriNamedClaimTypesOfferedElement ) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaSecurityUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaSecurityUtils.java index d59cf6fcc9..a69e318fb0 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaSecurityUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaSecurityUtils.java @@ -25,6 +25,7 @@ * $Id: WSFederationMetaSecurityUtils.java,v 1.6 2009/10/28 23:58:59 exu Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.wsfederation.meta; @@ -37,9 +38,10 @@ import java.util.List; import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import com.sun.identity.saml.xmlsig.AMSignatureProvider; +import com.sun.identity.wsfederation.jaxb.entityconfig.AttributeElement; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -466,7 +468,7 @@ public static void updateProviderKeyInfo(String realm, WSFederationMetaManager metaManager = new WSFederationMetaManager(); FederationConfigElement config = metaManager.getEntityConfig(realm, entityID); - if (!config.isHosted()) { + if (!config.getValue().isHosted()) { String[] args = {entityID, realm}; throw new WSFederationMetaException("entityNotHosted", args); } @@ -483,7 +485,7 @@ public static void updateProviderKeyInfo(String realm, if ((certAlias == null) || (certAlias.length() == 0)) { // remove key info removeKeyDescriptor(desp); - setExtendedAttributeValue(idpConfig, + setExtendedAttributeValue(idpConfig.getValue(), SAML2Constants.SIGNING_CERT_ALIAS, null); } else { TokenSigningKeyInfoElement kde = getKeyDescriptor(certAlias); @@ -491,7 +493,7 @@ public static void updateProviderKeyInfo(String realm, // update extended metadata Set value = new HashSet(); value.add(certAlias); - setExtendedAttributeValue(idpConfig, + setExtendedAttributeValue(idpConfig.getValue(), SAML2Constants.SIGNING_CERT_ALIAS, value); } } else { @@ -505,7 +507,7 @@ public static void updateProviderKeyInfo(String realm, if ((certAlias == null) || (certAlias.length() == 0)) { // remove key info removeKeyDescriptor(desp); - setExtendedAttributeValue(spConfig, + setExtendedAttributeValue(spConfig.getValue(), SAML2Constants.SIGNING_CERT_ALIAS, null); } else { TokenSigningKeyInfoElement kde = getKeyDescriptor(certAlias); @@ -513,7 +515,7 @@ public static void updateProviderKeyInfo(String realm, // update extended metadata Set value = new HashSet(); value.add(certAlias); - setExtendedAttributeValue(spConfig, + setExtendedAttributeValue(spConfig.getValue(), SAML2Constants.SIGNING_CERT_ALIAS, value); } } @@ -526,22 +528,22 @@ private static void updateKeyDescriptor(FederationElement desp, // NOTE : we only support one signing and one encryption key right now // the code need to be change if we need to support multiple signing // and/or encryption keys in one entity - List objList = desp.getAny(); + List objList = desp.getValue().getAny(); for (Iterator iter = objList.iterator(); iter.hasNext();) { Object o = iter.next(); if (o instanceof TokenSigningKeyInfoElement) { iter.remove(); } } - desp.getAny().add(0,newKey); + desp.getValue().getAny().add(0,newKey); } private static void removeKeyDescriptor(FederationElement desp) { // NOTE : we only support one signing and one encryption key right now // the code need to be change if we need to support multiple signing // and/or encryption keys in one entity - List objList = desp.getAny(); - for (Iterator iter = objList.iterator(); iter.hasNext();) { + List objList = desp.getValue().getAny(); + for (Iterator iter = objList.iterator(); iter.hasNext();) { Object o = iter.next(); if (o instanceof TokenSigningKeyInfoElement) { iter.remove(); @@ -551,23 +553,19 @@ private static void removeKeyDescriptor(FederationElement desp) { private static void setExtendedAttributeValue(BaseConfigType config, String attrName, Set attrVal) throws WSFederationMetaException { - try { - List attributes = config.getAttribute(); - for(Iterator iter = attributes.iterator(); iter.hasNext();) { - AttributeType avp = (AttributeType)iter.next(); - if (avp.getName().trim().equalsIgnoreCase(attrName)) { - iter.remove(); - } - } - if (attrVal != null) { - ObjectFactory factory = new ObjectFactory(); - AttributeType atype = factory.createAttributeType(); - atype.setName(attrName); - atype.getValue().addAll(attrVal); - config.getAttribute().add(atype); + List attributes = config.getAttribute(); + for(Iterator iter = attributes.iterator(); iter.hasNext();) { + AttributeType avp = iter.next().getValue(); + if (avp.getName().trim().equalsIgnoreCase(attrName)) { + iter.remove(); } - } catch (JAXBException e) { - throw new WSFederationMetaException(e); + } + if (attrVal != null) { + ObjectFactory factory = new ObjectFactory(); + AttributeType atype = factory.createAttributeType(); + atype.setName(attrName); + atype.getValue().addAll(attrVal); + config.getAttribute().add(factory.createAttributeElement(atype)); } } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java index 75ca934f21..f53d4ae020 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java @@ -25,7 +25,7 @@ * $Id: WSFederationMetaUtils.java,v 1.5 2009/10/28 23:58:59 exu Exp $ * * Portions Copyrighted 2012-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.meta; @@ -44,10 +44,10 @@ import java.util.Set; import jakarta.servlet.http.HttpServletRequest; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.forgerock.openam.utils.CollectionUtils; import org.forgerock.openam.utils.StringUtils; @@ -268,7 +268,7 @@ public static void setAttributes(BaseConfigType config, objFactory = new com.sun.identity.wsfederation.jaxb.entityconfig.ObjectFactory(); - List attributeList = config.getAttribute(); + List attributeList = config.getAttribute(); attributeList.clear(); @@ -276,9 +276,9 @@ public static void setAttributes(BaseConfigType config, for (String key : map.keySet()) { AttributeElement - avp = objFactory.createAttributeElement(); - avp.setName(key); - avp.getValue().addAll(map.get(key)); + avp = objFactory.createAttributeElement(objFactory.createAttributeType()); + avp.getValue().setName(key); + avp.getValue().getValue().addAll(map.get(key)); attributeList.add(avp); } @@ -296,7 +296,7 @@ public static String getAttribute(BaseConfigType config, String key) for (AttributeElement avp : list) { if (avp.getName().equals(key)) { - return CollectionUtils.getFirstItem(avp.getValue()); + return CollectionUtils.getFirstItem(avp.getValue().getValue()); } } @@ -431,7 +431,7 @@ public static void fillEntriesInSet(Map attrMap, String key, String value) { * @return The Base URL of the OpenAM deployment. */ public static String getEndpointBaseUrl(IDPSSOConfigElement idpConfig, HttpServletRequest request) { - String endpointBaseUrl = getAttribute(idpConfig, WSFederationConstants.ENDPOINT_BASE_URL); + String endpointBaseUrl = getAttribute(idpConfig.getValue(), WSFederationConstants.ENDPOINT_BASE_URL); if (StringUtils.isEmpty(endpointBaseUrl)) { endpointBaseUrl = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAccountMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAccountMapper.java index 357d1e7f7c..7d80125f92 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAccountMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAccountMapper.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: DefaultAccountMapper.java,v 1.5 2009/10/28 23:58:59 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -149,12 +151,12 @@ protected String getAttribute(String realm, BaseConfigType config = null; if(role.equals(IDP)) { config = WSFederationUtils.getMetaManager().getIDPSSOConfig( - realm, entityID); + realm, entityID).getValue(); } else { config = WSFederationUtils.getMetaManager().getSPSSOConfig( - realm, entityID); + realm, entityID).getValue(); } - Map attributes = WSFederationMetaUtils.getAttributes(config); + Map> attributes = WSFederationMetaUtils.getAttributes(config); if(attributes == null || attributes.isEmpty()) { if(debug.messageEnabled()) { @@ -165,9 +167,9 @@ protected String getAttribute(String realm, return null; } - List list = (List)attributes.get(attributeName); + List list = attributes.get(attributeName); if(list != null && list.size() > 0) { - return (String)list.iterator().next(); + return list.iterator().next(); } if(debug.messageEnabled()) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAttributeMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAttributeMapper.java index a794e18b3f..2fa3231b7b 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAttributeMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultAttributeMapper.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: DefaultAttributeMapper.java,v 1.4 2009/10/28 23:58:59 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -95,10 +97,10 @@ public Map getConfigAttributeMap( BaseConfigType config = null; if(role.equals(SP)) { config = WSFederationUtils.getMetaManager().getSPSSOConfig( - realm, hostEntityID); + realm, hostEntityID).getValue(); } else { config = WSFederationUtils.getMetaManager().getIDPSSOConfig( - realm, hostEntityID); + realm, hostEntityID).getValue(); } if(config == null) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAccountMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAccountMapper.java index f42650c506..1a1b9d68f8 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAccountMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAccountMapper.java @@ -25,6 +25,7 @@ * $Id: DefaultIDPAccountMapper.java,v 1.7 2009/10/28 23:58:59 exu Exp $ * * Portions Copyrighted 2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC. */ package com.sun.identity.wsfederation.plugins; @@ -102,7 +103,7 @@ public NameIdentifier getNameID( String name2 = null; try { - String attrName = WSFederationMetaUtils.getAttribute(idpConfig, WSFederationConstants.NAMEID_ATTRIBUTE); + String attrName = WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.NAMEID_ATTRIBUTE); if (StringUtils.isEmpty(attrName)) { attrName = WSFederationConstants.UID; } @@ -126,7 +127,7 @@ public NameIdentifier getNameID( throw new WSFederationException(dspe); } - String nameIdFormat = WSFederationMetaUtils.getAttribute(idpConfig, + String nameIdFormat = WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.NAMEID_FORMAT); if ( nameIdFormat == null || nameIdFormat.length() == 0 ) { nameIdFormat = WSFederationConstants.NAMED_CLAIM_TYPES[ @@ -134,7 +135,7 @@ public NameIdentifier getNameID( } String strNameIncludesDomain = - WSFederationMetaUtils.getAttribute(idpConfig, + WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.NAME_INCLUDES_DOMAIN); boolean nameIncludesDomain = Boolean.valueOf(strNameIncludesDomain); @@ -144,7 +145,7 @@ public NameIdentifier getNameID( // Need to get a domain from somewhere and append it to name2 // Try user profile first String domainAttribute = - WSFederationMetaUtils.getAttribute(idpConfig, + WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.DOMAIN_ATTRIBUTE); String upnDomain = null; if ( domainAttribute != null && domainAttribute.length() > 0 ) @@ -162,7 +163,7 @@ public NameIdentifier getNameID( if ( upnDomain == null || upnDomain.length() == 0 ) { // Nothing on the user profile - get from config - upnDomain = WSFederationMetaUtils.getAttribute(idpConfig, + upnDomain = WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.UPN_DOMAIN); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAuthenticationMethodMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAuthenticationMethodMapper.java index 106ede7882..8bce9c25c1 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAuthenticationMethodMapper.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/DefaultIDPAuthenticationMethodMapper.java @@ -23,6 +23,8 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * $Id: DefaultIDPAuthenticationMethodMapper.java,v 1.4 2009/10/28 23:58:59 exu Exp $ + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -90,7 +92,7 @@ public IDPAuthenticationTypeInfo getIDPAuthnContextInfo( IDPSSOConfigElement config = WSFederationUtils.getMetaManager().getIDPSSOConfig( realm, idpEntityID); - attrs = WSFederationMetaUtils.getAttributes(config); + attrs = WSFederationMetaUtils.getAttributes(config.getValue()); } catch (WSFederationMetaException sme) { debug.error(classMethod + "get IDPSSOConfig failed:", sme); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/whitelist/ValidWReplyExtractor.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/whitelist/ValidWReplyExtractor.java index 268d065678..3764295e3f 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/whitelist/ValidWReplyExtractor.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/whitelist/ValidWReplyExtractor.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC */ package com.sun.identity.wsfederation.plugins.whitelist; @@ -45,9 +46,9 @@ public Collection extractValidDomains(final WSFederationEntityInfo entit if (SAML2Constants.SP_ROLE.equalsIgnoreCase(entityInfo.role)) { - config = WSFederationUtils.getMetaManager().getSPSSOConfig(entityInfo.realm, entityInfo.entityID); + config = WSFederationUtils.getMetaManager().getSPSSOConfig(entityInfo.realm, entityInfo.entityID).getValue(); } else { - config = WSFederationUtils.getMetaManager().getIDPSSOConfig(entityInfo.realm, entityInfo.entityID); + config = WSFederationUtils.getMetaManager().getIDPSSOConfig(entityInfo.realm, entityInfo.entityID).getValue(); } if (config == null) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/IDPSSOUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/IDPSSOUtil.java index b987cc9eb6..e97b846d67 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/IDPSSOUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/IDPSSOUtil.java @@ -24,7 +24,7 @@ * * $Id: IDPSSOUtil.java,v 1.3 2009/10/28 23:58:59 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -85,7 +85,7 @@ public static String getAuthenticationServiceURL( IDPSSOConfigElement config = WSFederationUtils.getMetaManager().getIDPSSOConfig( realm, hostEntityId); - authUrl = WSFederationMetaUtils.getAttribute(config, + authUrl = WSFederationMetaUtils.getAttribute(config.getValue(), SAML2Constants.AUTH_URL); } catch (WSFederationMetaException sme) { if (debug.messageEnabled()) { @@ -143,14 +143,14 @@ public static String getACSurl(String entityId, String realm, { // Check that wreply is registered on this SP // Just return first TokenIssuerEndpoint in the Federation - for ( Object o: sp.getAny() ) + for ( Object o: sp.getValue().getAny() ) { if ( o instanceof TokenIssuerEndpointElement ) { try { URL replyUrl = new URL(wreply); URL thisUrl = new URL( - ((TokenIssuerEndpointElement)o).getAddress(). + ((TokenIssuerEndpointElement)o).getValue().getAddress(). getValue()); if ( replyUrl.equals(thisUrl)) return wreply; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/SAML11RequestedSecurityToken.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/SAML11RequestedSecurityToken.java index a8d8e40622..bc85f3f7cf 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/SAML11RequestedSecurityToken.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/profile/SAML11RequestedSecurityToken.java @@ -25,6 +25,7 @@ * $Id: SAML11RequestedSecurityToken.java,v 1.7 2009/12/14 23:42:48 mallas Exp $ * * Portions Copyrighted 2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems LLC */ package com.sun.identity.wsfederation.profile; @@ -368,7 +369,7 @@ public Map verifyToken(String realm, String hostEntityId, } String strWantAssertionSigned = - WSFederationMetaUtils.getAttribute(spConfig, + WSFederationMetaUtils.getAttribute(spConfig.getValue(), WSFederationConstants.WANT_ASSERTION_SIGNED); // By default, we want to sign assertions diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/ActiveRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/ActiveRequest.java index d18552b7c0..5ee71018f2 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/ActiveRequest.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/ActiveRequest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.servlet; @@ -125,7 +125,7 @@ public void process() throws ServletException, IOException, WSFederationExceptio throw new WSFederationException(BUNDLE_NAME, "unableToFindIDPConfiguration", null); } - final boolean activeRequestorEnabled = Boolean.parseBoolean(WSFederationMetaUtils.getAttribute(idpConfig, + final boolean activeRequestorEnabled = Boolean.parseBoolean(WSFederationMetaUtils.getAttribute(idpConfig.getValue(), ACTIVE_REQUESTOR_PROFILE_ENABLED)); if (!activeRequestorEnabled) { @@ -150,7 +150,7 @@ public void process() throws ServletException, IOException, WSFederationExceptio StandardCharsets.UTF_8))); } parseAndValidateRequest(soapMessage, idpConfig); - ssoToken = authenticateEndUser(soapMessage, WSFederationMetaUtils.getAttribute(idpConfig, + ssoToken = authenticateEndUser(soapMessage, WSFederationMetaUtils.getAttribute(idpConfig.getValue(), AUTHENTICATOR_CLASS, "org.forgerock.openam.saml2.plugins.DefaultWsFedAuthenticator")); final SAML11RequestedSecurityToken requestedSecurityToken = WSFederationUtils.createSAML11Token(realm, idpEntityId, address, ssoToken, address, SAMLConstants.AUTH_METHOD_PASSWORD_URI, true); @@ -238,7 +238,7 @@ private void parseAndValidateRequest(SOAPMessage soapMessage, IDPSSOConfigElemen } final String stsEndpoint = WSFederationMetaUtils.getEndpointBaseUrl(idpConfig, request) - + "/WSFederationServlet/sts/metaAlias" + idpConfig.getMetaAlias(); + + "/WSFederationServlet/sts/metaAlias" + idpConfig.getValue().getMetaAlias(); final Date expiresDate; try { expiresDate = DateUtils.stringToDate(expires); @@ -269,7 +269,7 @@ private void parseAndValidateRequest(SOAPMessage soapMessage, IDPSSOConfigElemen } address = getSingleElement(soapBody, WSA_NAMESPACE, "Address"); - final List trustedAddresses = WSFederationMetaUtils.getAttributes(idpConfig, TRUSTED_ADDRESSES); + final List trustedAddresses = WSFederationMetaUtils.getAttributes(idpConfig.getValue(), TRUSTED_ADDRESSES); if (trustedAddresses == null || !trustedAddresses.contains(address)) { throw newReceiverException("invalidReceiver"); } diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/IPSigninRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/IPSigninRequest.java index fd8529efdf..a3c4c56cb5 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/IPSigninRequest.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/IPSigninRequest.java @@ -25,7 +25,7 @@ * $Id: IPSigninRequest.java,v 1.8 2009/10/28 23:59:00 exu Exp $ * * Portions Copyrighted 2014-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.servlet; @@ -280,7 +280,7 @@ private void sendResponse(Object session, String idpEntityId, throw new WSFederationException(se); } - String strWantAssertionSigned = WSFederationMetaUtils.getAttribute(spConfig, + String strWantAssertionSigned = WSFederationMetaUtils.getAttribute(spConfig.getValue(), WSFederationConstants.WANT_ASSERTION_SIGNED); // By default, we want to sign assertions boolean wantAssertionSigned = strWantAssertionSigned != null ? Boolean.parseBoolean(strWantAssertionSigned) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MetadataRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MetadataRequest.java index b8575dc688..ce4f5f06b8 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MetadataRequest.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MetadataRequest.java @@ -24,7 +24,7 @@ * * $Id: MetadataRequest.java,v 1.2 2009/10/28 23:59:00 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.servlet; @@ -41,7 +41,7 @@ import java.util.List; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MexRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MexRequest.java index 3cac0e51a3..8cbcc19746 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MexRequest.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/MexRequest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.servlet; @@ -93,7 +93,7 @@ public void process() throws ServletException, IOException, WSFederationExceptio throw new WSFederationException(WSFederationConstants.BUNDLE_NAME, "unableToFindIDPConfiguration", null); } - final boolean activeRequestorEnabled = Boolean.parseBoolean(WSFederationMetaUtils.getAttribute(idpConfig, + final boolean activeRequestorEnabled = Boolean.parseBoolean(WSFederationMetaUtils.getAttribute(idpConfig.getValue(), WSFederationConstants.ACTIVE_REQUESTOR_PROFILE_ENABLED)); if (!activeRequestorEnabled) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninRequest.java index 13c470123b..88a77cce56 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninRequest.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninRequest.java @@ -25,7 +25,7 @@ * $Id: RPSigninRequest.java,v 1.9 2009/11/03 00:48:54 madan_ranganath Exp $ * * Portions Copyrighted 2015-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.servlet; @@ -133,7 +133,7 @@ public void process() throws WSFederationException, IOException } Map> spConfigAttributes = - WSFederationMetaUtils.getAttributes(spConfig); + WSFederationMetaUtils.getAttributes(spConfig.getValue()); String accountRealmSelection = spConfigAttributes.get( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninResponse.java index a502c05a43..7f54168238 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninResponse.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/RPSigninResponse.java @@ -24,7 +24,7 @@ * * $Id: RPSigninResponse.java,v 1.8 2009/12/14 23:42:48 mallas Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.wsfederation.servlet; @@ -147,7 +147,7 @@ public void process() throws WSFederationException, IOException { metaManager.getSPSSOConfig(realm, spEntityId); int timeskew = SAML2Constants.ASSERTION_TIME_SKEW_DEFAULT; - String timeskewStr = WSFederationMetaUtils.getAttribute(spssoconfig, + String timeskewStr = WSFederationMetaUtils.getAttribute(spssoconfig.getValue(), SAML2Constants.ASSERTION_TIME_SKEW); if (timeskewStr != null && timeskewStr.trim().length() > 0) { timeskew = Integer.parseInt(timeskewStr); @@ -173,7 +173,7 @@ public void process() throws WSFederationException, IOException { assert smap != null; - Map attributes = WSFederationMetaUtils.getAttributes(spssoconfig); + Map attributes = WSFederationMetaUtils.getAttributes(spssoconfig.getValue()); SPAccountMapper acctMapper = getSPAccountMapper(attributes); SPAttributeMapper attrMapper = getSPAttributeMapper(attributes); @@ -236,7 +236,7 @@ public void process() throws WSFederationException, IOException { if (wctx != null) { target = WSFederationUtils.removeReplyURL(wctx); } else { - target = WSFederationMetaUtils.getAttribute(spssoconfig, + target = WSFederationMetaUtils.getAttribute(spssoconfig.getValue(), SAML2Constants.DEFAULT_RELAY_STATE); } @@ -349,7 +349,7 @@ public static void setAttrMapInSession( } private boolean isAssertionCacheEnabled(SPSSOConfigElement spssoconfig) { - String enabled = WSFederationMetaUtils.getAttribute(spssoconfig, + String enabled = WSFederationMetaUtils.getAttribute(spssoconfig.getValue(), SAML2Constants.ASSERTION_CACHE_ENABLED); if(enabled == null) { //TODO: until the console/cli is fixed for this attribute, diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/liberty/LibertyManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/liberty/LibertyManager.java index 162b8f4f32..86d9b6ea1f 100755 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/liberty/LibertyManager.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/liberty/LibertyManager.java @@ -24,7 +24,7 @@ * * $Id: LibertyManager.java,v 1.7 2008/06/25 05:48:17 qcheng Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ @@ -1276,7 +1276,7 @@ public static String getNewRequest(HttpServletRequest request) { try { if (metaManager != null) { BaseConfigType providerConfig = - metaManager.getSPDescriptorConfig(realm, entityID); + metaManager.getSPDescriptorConfig(realm, entityID).getValue(); homePage = IDFFMetaUtils.getFirstAttributeValue( IDFFMetaUtils.getAttributes(providerConfig), IFSConstants.PROVIDER_HOME_PAGE_URL); @@ -2025,7 +2025,7 @@ public static NameIdentifier getMappedNameIdentifier( hostedDescriptor = metaManager.getSPDescriptor( realm, hostedEntityID); hostedConfig = metaManager.getSPDescriptorConfig( - realm, hostedEntityID); + realm, hostedEntityID).getValue(); } catch (IDFFMetaException ie) { debug.error(classMethod + "couldn't obtain hosted meta:", ie); return null; diff --git a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxySAMLAuthenticator.java b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxySAMLAuthenticator.java index e8f472e2b4..322d895129 100644 --- a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxySAMLAuthenticator.java +++ b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxySAMLAuthenticator.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. -* Portions copyright 2025 3A Systems LLC. +* Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.saml2; @@ -158,8 +158,8 @@ public void authenticate() throws FederatedSSOException, IOException { SAML2Utils.debug.error(classMethod, sme); } - if (idpSSODescriptor.isWantAuthnRequestsSigned() - || (spSSODescriptor != null && spSSODescriptor.isAuthnRequestsSigned())) { + if (idpSSODescriptor.getValue().isWantAuthnRequestsSigned() + || (spSSODescriptor != null && spSSODescriptor.getValue().isAuthnRequestsSigned())) { // need to verify the query string containing authnRequest if (StringUtils.isBlank(data.getSpEntityID())) { throw new ClientFaultException(data.getIdpAdapter(), INVALID_SAML_REQUEST); @@ -170,7 +170,7 @@ public void authenticate() throws FederatedSSOException, IOException { throw new ServerFaultException(data.getIdpAdapter(), METADATA_ERROR); } - Set certificates = KeyUtil.getVerificationCerts(spSSODescriptor, data.getSpEntityID(), + Set certificates = KeyUtil.getVerificationCerts(spSSODescriptor.getValue(), data.getSpEntityID(), SAML2Constants.SP_ROLE); try { @@ -192,20 +192,20 @@ public void authenticate() throws FederatedSSOException, IOException { // In ECP profile, sp doesn't know idp. if (!isFromECP) { // verify Destination - List ssoServiceList = idpSSODescriptor.getSingleSignOnService(); + List ssoServiceList = idpSSODescriptor.getValue().getSingleSignOnService(); SingleSignOnServiceElement endPoint = SPSSOFederate.getSingleSignOnServiceEndpoint(ssoServiceList, binding); - if (endPoint == null || StringUtils.isEmpty(endPoint.getLocation())) { + if (endPoint == null || StringUtils.isEmpty(endPoint.getValue().getLocation())) { SAML2Utils.debug .error("{} authn request unable to get endpoint location for IdpEntity: {} MetaAlias: {} ", classMethod, data.getIdpEntityID(), data.getIdpMetaAlias()); throw new ClientFaultException(data.getIdpAdapter(), "invalidDestination"); } if (!SAML2Utils - .verifyDestination(data.getAuthnRequest().getDestination(), endPoint.getLocation())) { + .verifyDestination(data.getAuthnRequest().getDestination(), endPoint.getValue().getLocation())) { SAML2Utils.debug .error("{} authn request destination verification failed for IdpEntity: {} MetaAlias: {} Destination: {} Location: {}", classMethod, data.getIdpEntityID(), data.getIdpMetaAlias(), - data.getAuthnRequest().getDestination(), endPoint.getLocation()); + data.getAuthnRequest().getDestination(), endPoint.getValue().getLocation()); throw new ClientFaultException(data.getIdpAdapter(), "invalidDestination"); } } diff --git a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/plugins/ValidRelayStateExtractor.java b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/plugins/ValidRelayStateExtractor.java index 5ddde6ac68..110b74b5fe 100644 --- a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/plugins/ValidRelayStateExtractor.java +++ b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/plugins/ValidRelayStateExtractor.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC */ package org.forgerock.openam.saml2.plugins; @@ -42,9 +43,9 @@ public Collection extractValidDomains(final SAMLEntityInfo entityInfo) { final SAML2MetaManager metaManager = new SAML2MetaManager(); if (SAML2Constants.SP_ROLE.equalsIgnoreCase(entityInfo.role)) { - config = metaManager.getSPSSOConfig(entityInfo.realm, entityInfo.entityID); + config = metaManager.getSPSSOConfig(entityInfo.realm, entityInfo.entityID).getValue(); } else { - config = metaManager.getIDPSSOConfig(entityInfo.realm, entityInfo.entityID); + config = metaManager.getIDPSSOConfig(entityInfo.realm, entityInfo.entityID).getValue(); } if (config == null) { diff --git a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/key/KeyUtilTest.java b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/key/KeyUtilTest.java index 913739420c..f3769d4e01 100644 --- a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/key/KeyUtilTest.java +++ b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/key/KeyUtilTest.java @@ -12,6 +12,8 @@ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". + * + * Portions copyright 2026 3A Systems LLC */ package com.sun.identity.saml2.key; @@ -22,10 +24,12 @@ import com.sun.identity.saml2.jaxb.metadata.*; import com.sun.identity.shared.xml.XMLUtils; import java.util.List; + +import jakarta.xml.bind.JAXBElement; import org.testng.Assert; import org.testng.annotations.Test; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; public class KeyUtilTest { @@ -43,10 +47,10 @@ public void testNoUseKeyDescriptorEntityDescriptor() throws SAML2MetaException, XMLUtils.toDOMDocument(ClassLoader.getSystemResourceAsStream(XML_DOCUMENT_TO_LOAD), SAML2Utils.debug), "UTF-8"); EntityDescriptorElement element = SAML2MetaUtils.getEntityDescriptorElement(idpMetadata); - List descriptors = element.getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); - for (Object descriptor : descriptors) { - if (descriptor instanceof IDPSSODescriptorElement) { - KeyDescriptorType type = KeyUtil.getKeyDescriptor((IDPSSODescriptorElement)descriptor, "signing"); + List> descriptors = element.getValue().getRoleDescriptorOrIDPSSODescriptorOrSPSSODescriptor(); + for (JAXBElement descriptor : descriptors) { + if (descriptor.getValue() instanceof IDPSSODescriptorType) { + KeyDescriptorElement type = KeyUtil.getKeyDescriptor(descriptor.getValue(), "signing"); Assert.assertNotNull(type); break; } diff --git a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/meta/SAML2MetaUtilsTest.java b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/meta/SAML2MetaUtilsTest.java index da389c3515..e6668c07f3 100644 --- a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/meta/SAML2MetaUtilsTest.java +++ b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/meta/SAML2MetaUtilsTest.java @@ -12,17 +12,24 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC. */ package com.sun.identity.saml2.meta; import static org.testng.Assert.*; + +import com.sun.identity.saml2.jaxb.entityconfig.EntityConfigElement; +import com.sun.identity.saml2.jaxb.metadata.EntityDescriptorElement; import org.testng.annotations.Test; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import java.io.IOException; +import java.io.InputStream; + public class SAML2MetaUtilsTest { private static final String PATH_SEPARATOR = "/"; @@ -66,6 +73,21 @@ public void testGetMetaDataByURI_SubRealm() { + PATH_SEPARATOR + TEST_ENTITY; final String result = SAML2MetaUtils.getMetaAliasByUri(uri); assertEquals(result, PATH_SEPARATOR + TEST_SUB_REALM + PATH_SEPARATOR + TEST_ENTITY); - } + } + + @Test + public void convertInputStreamToJaxbTest() throws Exception { + try(InputStream is = getClass().getClassLoader().getResourceAsStream("idp-extended.xml")) { + Object jaxb = SAML2MetaUtils.convertInputStreamToJAXB(is); + assertNotNull(jaxb); + assertTrue(jaxb instanceof EntityConfigElement); + } + + try(InputStream is = getClass().getClassLoader().getResourceAsStream("idp-metadata.xml")) { + Object jaxb = SAML2MetaUtils.convertInputStreamToJAXB(is); + assertNotNull(jaxb); + assertTrue(jaxb instanceof EntityDescriptorElement); + } + } } diff --git a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java index 872080cea3..5b479c38ed 100644 --- a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java +++ b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java @@ -12,12 +12,13 @@ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". + * + * Portions copyright 2026 3A Systems LLC */ package com.sun.identity.saml2.profile; import static com.sun.identity.saml2.common.SAML2Constants.*; import com.sun.identity.saml2.jaxb.metadata.SingleLogoutServiceElement; -import com.sun.identity.saml2.jaxb.metadata.impl.SingleLogoutServiceElementImpl; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.*; @@ -32,11 +33,11 @@ public void sameBindingReturnedWhenAvailable() { endpoints.add(endpointFor(HTTP_POST, "post")); endpoints.add(endpointFor(SOAP, "soap")); SingleLogoutServiceElement result = LogoutUtil.getMostAppropriateSLOServiceLocation(endpoints, HTTP_REDIRECT); - assertThat(result.getBinding()).isEqualTo(HTTP_REDIRECT); + assertThat(result.getValue().getBinding()).isEqualTo(HTTP_REDIRECT); result = LogoutUtil.getMostAppropriateSLOServiceLocation(endpoints, HTTP_POST); - assertThat(result.getBinding()).isEqualTo(HTTP_POST); + assertThat(result.getValue().getBinding()).isEqualTo(HTTP_POST); result = LogoutUtil.getMostAppropriateSLOServiceLocation(endpoints, SOAP); - assertThat(result.getBinding()).isEqualTo(SOAP); + assertThat(result.getValue().getBinding()).isEqualTo(SOAP); } public void asynchronousBindingIsPreferredOverSynchronous() { @@ -44,10 +45,10 @@ public void asynchronousBindingIsPreferredOverSynchronous() { endpoints.add(endpointFor(HTTP_POST, "post")); endpoints.add(endpointFor(SOAP, "soap")); SingleLogoutServiceElement result = LogoutUtil.getMostAppropriateSLOServiceLocation(endpoints, HTTP_REDIRECT); - assertThat(result.getBinding()).isEqualTo(HTTP_POST); + assertThat(result.getValue().getBinding()).isEqualTo(HTTP_POST); endpoints.set(0, endpointFor(HTTP_REDIRECT, "redirect")); result = LogoutUtil.getMostAppropriateSLOServiceLocation(endpoints, HTTP_POST); - assertThat(result.getBinding()).isEqualTo(HTTP_REDIRECT); + assertThat(result.getValue().getBinding()).isEqualTo(HTTP_REDIRECT); } public void asynchronousBindingsAreNotReturnedWhenRequestingSynchronous() { @@ -72,15 +73,19 @@ public void synchronousBindingReturnedIfNoAsynchronousAvailable() { List endpoints = new ArrayList(); endpoints.add(endpointFor(SOAP, "soap")); SingleLogoutServiceElement result = LogoutUtil.getMostAppropriateSLOServiceLocation(endpoints, HTTP_REDIRECT); - assertThat(result.getBinding()).isEqualTo(SOAP); + assertThat(result.getValue().getBinding()).isEqualTo(SOAP); result = LogoutUtil.getMostAppropriateSLOServiceLocation(endpoints, HTTP_POST); - assertThat(result.getBinding()).isEqualTo(SOAP); + assertThat(result.getValue().getBinding()).isEqualTo(SOAP); } private SingleLogoutServiceElement endpointFor(String binding, String location) { - SingleLogoutServiceElement ret = new SingleLogoutServiceElementImpl(); - ret.setBinding(binding); - ret.setLocation(location); + + com.sun.identity.saml2.jaxb.metadata.ObjectFactory of + = new com.sun.identity.saml2.jaxb.metadata.ObjectFactory(); + + SingleLogoutServiceElement ret = of.createSingleLogoutServiceElement(of.createAttributeServiceType()); + ret.getValue().setBinding(binding); + ret.getValue().setLocation(location); return ret; } } diff --git a/openam-federation/openam-federation-library/src/test/resources/idp-extended.xml b/openam-federation/openam-federation-library/src/test/resources/idp-extended.xml new file mode 100644 index 0000000000..43fac0cd99 --- /dev/null +++ b/openam-federation/openam-federation-library/src/test/resources/idp-extended.xml @@ -0,0 +1,111 @@ + + + + + + + + test + + + + + + false + + + + + + + + + false + + + + + + 600 + + + com.sun.identity.saml2.plugins.DefaultIDPAuthnContextMapper + + + urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport|0||default + + + com.sun.identity.saml2.plugins.DefaultIDPAccountMapper + + + false + + + com.sun.identity.saml2.plugins.DefaultIDPAttributeMapper + + + com.sun.identity.saml2.plugins.DefaultAssertionIDRequestMapper + + + urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress=mail + urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName= + urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName= + urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos= + urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified= + + + com.sun.identity.saml2.plugins.DefaultIDPECPSessionMapper + + + uid=uid + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + + 600 + + + + + http://openam.example.org:8080/openam/idpsaehandler/metaAlias/idp + + + + + + + + + false + + + + + diff --git a/openam-federation/openam-federation-library/src/test/resources/idp-metadata.xml b/openam-federation/openam-federation-library/src/test/resources/idp-metadata.xml new file mode 100644 index 0000000000..ff6be7af7f --- /dev/null +++ b/openam-federation/openam-federation-library/src/test/resources/idp-metadata.xml @@ -0,0 +1,97 @@ + + + + + + + MIIDaDCCAlCgAwIBAgIDcB/YMA0GCSqGSIb3DQEBCwUAMGUxCzAJBgNVBAYTAlVLMRAwDgYDVQQI + EwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRIwEAYDVQQKEwlGb3JnZVJvY2sxDzANBgNVBAsT + Bk9wZW5BTTENMAsGA1UEAxMEdGVzdDAeFw0xNjAzMTgxMTU2MjhaFw0yNjAzMTYxMTU2MjhaMGUx + CzAJBgNVBAYTAlVLMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRIwEAYDVQQK + EwlGb3JnZVJvY2sxDzANBgNVBAsTBk9wZW5BTTENMAsGA1UEAxMEdGVzdDCCASIwDQYJKoZIhvcN + AQEBBQADggEPADCCAQoCggEBAKNbl89eP6B8kZATNSPe3+OZ3esLx31hjX+dakHtPwXCAaCKqJFw + jwKdxyRuPdsVG+8Dbk3PGhk26aJrSE93EpxeqmQqxNPMeD+N0/8pjkuVYWwPIQ/ts2iTiWOVn7wz + lE4ASfvupqOR5pjuYMWNo/pd4L7QNjUCKoAt9H11HMyiP+6roo/EYgX4AH7OAhfUMncYsopWhkW/ + ze9z8wTXc8BAEgDmt8zFCez1CtqJB/MlSBUGDgk8oHYDsHKmx05baBaOBQ8LRGP5SULSbRtu34eL + FootBIn0FvUZSnwTiSpbaHHRgWrMOVm07oSLWBuO3h/bj38zBuuqqVsAK8YuyoECAwEAAaMhMB8w + HQYDVR0OBBYEFHxfAbr6PQ5Xgc+jVx+AGTPnnpWZMA0GCSqGSIb3DQEBCwUAA4IBAQAZBMJ29/2i + dv1ztC6ArHtB4kw/nHHwthXFwtWAN7sRPB8tLW7fD8aJ43RQr5107Bg1Lgkmt+FZxpafqUC/mukj + IzGzbW0COMSOTcWUGss+HxK6M6Fl9aOzKJMct1uOSpPFgjItcGqydGZXR2FH93vXWoAotUwtZ119 + IixIdxpOJwYJg0HFn+GEfpU1PmiLfq2/uwqJ0hGCNfNcm9puagzhQrcDFOnolxjnYPSfSkU5wxlG + o99yE5eJwoHXXU7csaZVttmx7sPj1lUENogXUM6JMqzSyEIm1XCOCL8rZJkZ781W5CwZhuJTNzV3 + 1sBREs8FaaCeksu7Y48BmkUqw6E9 + + + + + + + + + + + + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + + + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress + + + urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified + + + urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName + + + urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos + + + urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName + + + + + + + + + diff --git a/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java b/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java index 0c3c4417be..ad9dae22bd 100644 --- a/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java +++ b/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.oauth2.saml2.core; @@ -179,7 +179,7 @@ private void validateAssertion(Assertion assertion, ClientRegistration clientReg final Set verificationCerts; SAML2MetaManager metaManager = new SAML2MetaManager(); final IDPSSODescriptorElement idpSsoDescriptor = metaManager.getIDPSSODescriptor(realm, idpEntityID); - verificationCerts = KeyUtil.getVerificationCerts(idpSsoDescriptor, idpEntityID, SAML2Constants.IDP_ROLE); + verificationCerts = KeyUtil.getVerificationCerts(idpSsoDescriptor.getValue(), idpEntityID, SAML2Constants.IDP_ROLE); // The Assertion MUST be digitally signed or have a Message Authentication Code (MAC) applied by the issuer. diff --git a/openam-schema/openam-liberty-schema/pom.xml b/openam-schema/openam-liberty-schema/pom.xml index 119c843ceb..765290dff2 100644 --- a/openam-schema/openam-liberty-schema/pom.xml +++ b/openam-schema/openam-liberty-schema/pom.xml @@ -13,6 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC --> 4.0.0 @@ -33,6 +34,38 @@ + + org.jvnet.jaxb + jaxb-maven-plugin + + + + generate + + + + + src/main/xsd + + lib-id-sis-pp.xsd + lib-arch-metadata.xsd + idff-entity-config-schema.xsd + lib-arch-disco-svc.xsd + lib-arch-interact-svc.xsd + lib-arch-paos.xsd + lib-arch-soap-binding.xsd + lib-arch-security-fmwk.xsd + secext.xsd + discoentry.xsd + ppextension.xsd + lib-idwsf-authn-svc.xsd + liberty-idwsf-disco-svc-v1.1.xsd + liberty-idwsf-soap-binding-v1.1.xsd + + src/main/xjb + true + + - + + + + + + + @@ -69,6 +84,22 @@ + + + + + + + + + + + + + + + + @@ -96,6 +127,26 @@ + + + + + + + + + + + + + + + + @@ -110,6 +161,12 @@ + + + + + + @@ -124,6 +181,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -138,6 +217,12 @@ + + + + + + @@ -222,6 +307,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -291,6 +500,12 @@ + + + + + + @@ -305,6 +520,9 @@ + + + diff --git a/openam-schema/openam-liberty-schema/src/main/xsd/idff-entity-config-schema.xsd b/openam-schema/openam-liberty-schema/src/main/xsd/idff-entity-config-schema.xsd index 23ce5e318e..7b30080046 100644 --- a/openam-schema/openam-liberty-schema/src/main/xsd/idff-entity-config-schema.xsd +++ b/openam-schema/openam-liberty-schema/src/main/xsd/idff-entity-config-schema.xsd @@ -23,6 +23,8 @@ your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" + Portions Copyrighted 2026 3A Systems LLC + $Id: idff-entity-config-schema.xsd,v 1.2 2008/06/25 05:48:40 qcheng Exp $ --> @@ -58,7 +60,7 @@ - + diff --git a/openam-schema/openam-saml2-schema/pom.xml b/openam-schema/openam-saml2-schema/pom.xml index 1fe96d3067..960be9a052 100644 --- a/openam-schema/openam-saml2-schema/pom.xml +++ b/openam-schema/openam-saml2-schema/pom.xml @@ -13,6 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC --> 4.0.0 @@ -33,6 +34,34 @@ + + org.jvnet.jaxb + jaxb-maven-plugin + + + xjc-saml2 + + generate + + + + + src/main/xsd + + entity-config-schema.xsd + saml-schema-assertion-2.0.xsd + saml-schema-metadata-2.0.xsd + schema.xsd + sstc-saml-metadata-ext-query.xsd + sstc-saml-metadata-x509-query.xsd + sstc-metadata-attr.xsd + sstc-saml-attribute-ext.xsd + sstc-saml-idp-discovery.xsd + + src/main/xjb + true + + - + + + + + + + + @@ -45,6 +61,9 @@ + + + @@ -58,6 +77,12 @@ + + + + + + @@ -71,6 +96,12 @@ + + + + + + @@ -84,6 +115,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,6 +190,9 @@ + + + @@ -123,6 +219,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -136,6 +262,10 @@ + + + + diff --git a/openam-schema/openam-saml2-schema/src/main/xsd/entity-config-schema.xsd b/openam-schema/openam-saml2-schema/src/main/xsd/entity-config-schema.xsd index 935b5f54fa..bf94af3aa1 100644 --- a/openam-schema/openam-saml2-schema/src/main/xsd/entity-config-schema.xsd +++ b/openam-schema/openam-saml2-schema/src/main/xsd/entity-config-schema.xsd @@ -23,6 +23,8 @@ your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" + Portions copyright 2026 3A Systems LLC + $Id: entity-config-schema.xsd,v 1.4 2008/06/25 05:48:43 qcheng Exp $ --> @@ -70,7 +72,7 @@ - + diff --git a/openam-schema/openam-saml2-schema/src/main/xsd/schema.xsd b/openam-schema/openam-saml2-schema/src/main/xsd/schema.xsd index 6702c7d90f..db956f8d09 100644 --- a/openam-schema/openam-saml2-schema/src/main/xsd/schema.xsd +++ b/openam-schema/openam-saml2-schema/src/main/xsd/schema.xsd @@ -1,6 +1,6 @@ +xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" +jaxb:version="3.0"> diff --git a/openam-schema/openam-wsfederation-schema/pom.xml b/openam-schema/openam-wsfederation-schema/pom.xml index 75f346a9b4..dc9f03a83f 100644 --- a/openam-schema/openam-wsfederation-schema/pom.xml +++ b/openam-schema/openam-wsfederation-schema/pom.xml @@ -13,6 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC --> 4.0.0 @@ -33,6 +34,23 @@ + + org.jvnet.jaxb + jaxb-maven-plugin + + + xjc-wsfederation + + generate + + + + + src/main/xsd + src/main/xjb + true + + - + + + + + + + + + + + @@ -40,6 +62,12 @@ + + + + + + @@ -66,6 +94,9 @@ + + + @@ -79,6 +110,9 @@ + + + @@ -92,6 +126,12 @@ + + + + + + @@ -105,6 +145,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,6 +228,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -131,5 +265,19 @@ + + + + + + + + + + + + + + diff --git a/openam-schema/openam-wsfederation-schema/src/main/xsd/entity-config-schema.xsd b/openam-schema/openam-wsfederation-schema/src/main/xsd/entity-config-schema.xsd index fe8c842755..1367a57a4e 100644 --- a/openam-schema/openam-wsfederation-schema/src/main/xsd/entity-config-schema.xsd +++ b/openam-schema/openam-wsfederation-schema/src/main/xsd/entity-config-schema.xsd @@ -25,6 +25,8 @@ $Id: entity-config-schema.xsd,v 1.3 2009/05/04 18:21:06 exu Exp $ + Portions Copyrighted 2026 3A Systems LLC + --> @@ -56,7 +58,7 @@ - + diff --git a/openam-schema/openam-xacml3-schema/pom.xml b/openam-schema/openam-xacml3-schema/pom.xml index d13cc7250a..e3911da9a1 100644 --- a/openam-schema/openam-xacml3-schema/pom.xml +++ b/openam-schema/openam-xacml3-schema/pom.xml @@ -13,6 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC --> 4.0.0 @@ -79,17 +80,5 @@ wsit-impl - - javax.xml.bind - jaxb-api - - - com.sun.xml.bind - jaxb-core - - - com.sun.xml.bind - jaxb-impl - diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Advice.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Advice.java index 4b9b48d785..3e98e2d15b 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Advice.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Advice.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,12 +38,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpression.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpression.java index 44c44f87d0..db93135cbe 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpression.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpression.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC * */ @@ -37,12 +39,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpressions.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpressions.java index 2955399c9b..ddad13ef7a 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpressions.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AdviceExpressions.java @@ -21,11 +21,13 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2013.01.21 at 10:40:04 AM PST @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AllOf.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AllOf.java index 2547193520..4835def894 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AllOf.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AllOf.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,10 +39,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AnyOf.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AnyOf.java index 97d02eaa9c..271cbb8464 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AnyOf.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AnyOf.java @@ -21,11 +21,13 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2013.01.21 at 10:40:04 AM PST @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Apply.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Apply.java index b4c267cd9a..9bccffebeb 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Apply.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Apply.java @@ -21,11 +21,13 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2013.01.21 at 10:40:04 AM PST @@ -36,14 +38,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AssociatedAdvice.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AssociatedAdvice.java index 408a24f76b..ea09df598f 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AssociatedAdvice.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AssociatedAdvice.java @@ -21,11 +21,13 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2013.01.21 at 10:40:04 AM PST @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attribute.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attribute.java index 7022e6564a..8c273cd5f6 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attribute.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attribute.java @@ -21,11 +21,13 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2013.01.21 at 10:40:04 AM PST @@ -36,12 +38,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignment.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignment.java index 4aad62ec6f..f3e5f4f33f 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignment.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignment.java @@ -21,11 +21,13 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2013.01.21 at 10:40:04 AM PST @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignmentExpression.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignmentExpression.java index 7de4b3b651..bd3bddbd5e 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignmentExpression.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeAssignmentExpression.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,13 +36,13 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeDesignator.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeDesignator.java index ca0a6fdadb..0c1d829bba 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeDesignator.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeDesignator.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeSelector.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeSelector.java index 3c849b5d2f..3b4c9394c7 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeSelector.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeSelector.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeValue.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeValue.java index 0eace49675..abda552e62 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeValue.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributeValue.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -38,15 +40,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attributes.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attributes.java index 86e49e39dc..5c16ee461e 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attributes.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Attributes.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,15 +38,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributesReference.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributesReference.java index 7fb459a578..a8d50073df 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributesReference.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/AttributesReference.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,12 +36,12 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlIDREF; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameter.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameter.java index 4d191c6313..72afddde98 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameter.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameter.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameters.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameters.java index 79744578f5..fd698ea366 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameters.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/CombinerParameters.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,11 +38,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Condition.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Condition.java index 6dee7f7cbf..96f6aa8df1 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Condition.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Condition.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Content.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Content.java index e04b6f0bd0..bec02efffb 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Content.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Content.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,11 +38,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/DecisionType.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/DecisionType.java index cb03bcdbda..e20417fe31 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/DecisionType.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/DecisionType.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,9 +36,9 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Defaults.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Defaults.java index 3020893d27..5bc0e406f3 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Defaults.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Defaults.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/EffectType.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/EffectType.java index 40726636f1..f75bbeef26 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/EffectType.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/EffectType.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,9 +36,9 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Expression.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Expression.java index 3622178b13..3994771939 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Expression.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Expression.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,10 +36,10 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Function.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Function.java index 9cddb0d935..8181bebf2d 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Function.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Function.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/IdReference.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/IdReference.java index 694f8e2a06..dc14e55012 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/IdReference.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/IdReference.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,12 +36,12 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Match.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Match.java index 3c2d94ee6b..ae6e3a351a 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Match.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Match.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,12 +36,12 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MissingAttributeDetail.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MissingAttributeDetail.java index 8624bc0760..0631206ef8 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MissingAttributeDetail.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MissingAttributeDetail.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,12 +38,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MultiRequests.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MultiRequests.java index a92ce0f7f0..77e2d9efa7 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MultiRequests.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/MultiRequests.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObjectFactory.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObjectFactory.java index fbc445ed9c..8e593b7072 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObjectFactory.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObjectFactory.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,9 +36,9 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligation.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligation.java index 57c7e2a8c1..e611dbdb3e 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligation.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligation.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,12 +38,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpression.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpression.java index 7884ef6c73..b7d5df149b 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpression.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpression.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,12 +38,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpressions.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpressions.java index eb9d6444d3..991a73be43 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpressions.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/ObligationExpressions.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligations.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligations.java index 767d233fa8..1df9c9a3a9 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligations.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Obligations.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Policy.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Policy.java index 3ac168245f..260d752158 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Policy.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Policy.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,13 +39,13 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyCombinerParameters.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyCombinerParameters.java index 8fab7e56fb..6afae2d3ea 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyCombinerParameters.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyCombinerParameters.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIdentifierList.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIdentifierList.java index d999fd3d92..68fcb536c9 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIdentifierList.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIdentifierList.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,12 +38,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIssuer.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIssuer.java index 5b8a6295c4..9fb7261666 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIssuer.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicyIssuer.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySet.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySet.java index 091352db6e..406421fab9 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySet.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySet.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,15 +39,15 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySetCombinerParameters.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySetCombinerParameters.java index 8ff4518082..a0c63cb129 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySetCombinerParameters.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/PolicySetCombinerParameters.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Request.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Request.java index f6bc63462a..7235767102 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Request.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Request.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,17 +39,17 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestDefaults.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestDefaults.java index fa56490c38..dc755a9fe6 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestDefaults.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestDefaults.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestReference.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestReference.java index f2ef9d8adf..9b2743da32 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestReference.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RequestReference.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Response.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Response.java index 406a73aa6e..a2a6710e49 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Response.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Response.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,7 +39,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Result.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Result.java index 22bfec4eff..d2057eaa04 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Result.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Result.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,10 +39,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Rule.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Rule.java index 365dca527d..5bf67abcc1 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Rule.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Rule.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,11 +36,11 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RuleCombinerParameters.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RuleCombinerParameters.java index 030321816e..c407f9e11c 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RuleCombinerParameters.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/RuleCombinerParameters.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,10 +36,10 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Status.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Status.java index 794285a14a..e016f23dda 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Status.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Status.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,10 +36,10 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusCode.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusCode.java index 60759ece91..f492107c1c 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusCode.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusCode.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,12 +36,12 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusDetail.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusDetail.java index fb062b9fac..ab506eb80d 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusDetail.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/StatusDetail.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -37,10 +39,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Target.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Target.java index 1c390bb578..52f352a529 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Target.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Target.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -36,10 +38,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableDefinition.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableDefinition.java index be7adea39d..45771b8519 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableDefinition.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableDefinition.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,12 +36,12 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableReference.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableReference.java index 671814730f..462cbceaa1 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableReference.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VariableReference.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,10 +36,10 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Version.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Version.java index 7c0abb6b87..7a71723176 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Version.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/Version.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,10 +36,10 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VersionMatch.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VersionMatch.java index 2d83c12efd..2e8a1b5096 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VersionMatch.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/VersionMatch.java @@ -21,6 +21,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -34,10 +36,10 @@ package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/package-info.java b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/package-info.java index 03436e8ad7..caacc49003 100644 --- a/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/package-info.java +++ b/openam-schema/openam-xacml3-schema/src/main/java/com/sun/identity/entitlement/xacml3/core/package-info.java @@ -21,6 +21,7 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" + * Portions Copyrighted 2026 3A Systems LLC. * */ @@ -31,18 +32,18 @@ // Generated on: 2013.01.21 at 10:40:04 AM PST // -@javax.xml.bind.annotation.XmlSchema( namespace = "urn:oasis:names:tc:xacml:3.0:core:schema:wd-17", +@jakarta.xml.bind.annotation.XmlSchema( namespace = "urn:oasis:names:tc:xacml:3.0:core:schema:wd-17", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "xacml", + @jakarta.xml.bind.annotation.XmlNs(prefix = "xacml", namespaceURI = "classpath:xsd/xacml-core-v3-schema-wd-17.xsd"), - @javax.xml.bind.annotation.XmlNs(prefix = "xacml3", + @jakarta.xml.bind.annotation.XmlNs(prefix = "xacml3", namespaceURI = "classpath:xsd/xacml-core-v3-schema-wd-17.xsd"), - @javax.xml.bind.annotation.XmlNs(prefix = "xacml-context", + @jakarta.xml.bind.annotation.XmlNs(prefix = "xacml-context", namespaceURI = "classpath:xsd/xacml-core-v3-schema-wd-17.xsd"), - @javax.xml.bind.annotation.XmlNs(prefix = "xacml-ctx", + @jakarta.xml.bind.annotation.XmlNs(prefix = "xacml-ctx", namespaceURI = "classpath:xsd/xacml-core-v3-schema-wd-17.xsd") }, elementFormDefault = XmlNsForm.QUALIFIED) package com.sun.identity.entitlement.xacml3.core; -import javax.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlNsForm; diff --git a/openam-server-only/src/main/webapp/saml2/jsp/SA_IDP.jsp b/openam-server-only/src/main/webapp/saml2/jsp/SA_IDP.jsp index 19209a6a49..0b7824bfe3 100644 --- a/openam-server-only/src/main/webapp/saml2/jsp/SA_IDP.jsp +++ b/openam-server-only/src/main/webapp/saml2/jsp/SA_IDP.jsp @@ -25,6 +25,7 @@ $Id: SA_IDP.jsp,v 1.10 2009/06/24 00:22:44 sean_brydon Exp $ Portions Copyrighted 2013-2015 ForgeRock AS. + Portions Copyrighted 2026 3A Systems LLC. --%> <%@ page language="java" @@ -77,11 +78,11 @@ org.owasp.esapi.ESAPI" SPSSODescriptorElement spDesc = mm.getSPSSODescriptor(realm, tempspId); Iterator acsIter = - spDesc.getAssertionConsumerService().iterator(); + spDesc.getValue().getAssertionConsumerService().iterator(); while (acsIter.hasNext()) { AssertionConsumerServiceElement acs = (AssertionConsumerServiceElement) acsIter.next(); - if (acs.getLocation().indexOf(targetHost) != -1) { + if (acs.getValue().getLocation().indexOf(targetHost) != -1) { return tempspId; } } diff --git a/openam-server-only/src/main/webapp/saml2/jsp/SA_SP.jsp b/openam-server-only/src/main/webapp/saml2/jsp/SA_SP.jsp index 51f7504b9d..eb5b04d30c 100644 --- a/openam-server-only/src/main/webapp/saml2/jsp/SA_SP.jsp +++ b/openam-server-only/src/main/webapp/saml2/jsp/SA_SP.jsp @@ -25,6 +25,7 @@ $Id: SA_SP.jsp,v 1.8 2009/02/26 23:57:19 exu Exp $ Portions Copyrighted 2013 ForgeRock AS + Portions Copyrighted 2026 3A Systems LLC. --%> <%@ page language="java" @@ -163,7 +164,7 @@ org.owasp.esapi.ESAPI" // get attr list from configuration SPSSOConfigElement spConfig = mm.getSPSSOConfig(realm, spEntityId); if (spConfig != null) { - Map attrs = SAML2MetaUtils.getAttributes(spConfig); + Map attrs = SAML2MetaUtils.getAttributes(spConfig.getValue()); if (attrs != null) { List value = (List) attrs.get(SAML2Constants.ATTRIBUTE_MAP); if (value != null && !value.isEmpty()) { diff --git a/openam-server-only/src/main/webapp/saml2/jsp/spSingleLogoutInit.jsp b/openam-server-only/src/main/webapp/saml2/jsp/spSingleLogoutInit.jsp index f7838f80ee..a0a69a85ae 100644 --- a/openam-server-only/src/main/webapp/saml2/jsp/spSingleLogoutInit.jsp +++ b/openam-server-only/src/main/webapp/saml2/jsp/spSingleLogoutInit.jsp @@ -25,6 +25,7 @@ $Id: spSingleLogoutInit.jsp,v 1.13 2009/10/15 00:01:11 exu Exp $ Portions Copyrighted 2012-2016 ForgeRock AS. + Portions Copyrighted 2026 3A Systems LLC. --%> <%@ page import="com.sun.identity.plugin.session.SessionManager" %> @@ -150,7 +151,7 @@ SPSSOConfigElement spConfig = manager.getSPSSOConfig("/", spEntityID); if (spConfig != null) { - metaAlias = spConfig.getMetaAlias(); + metaAlias = spConfig.getValue().getMetaAlias(); } } } diff --git a/openam-server-only/src/main/webapp/wsfederation/jsp/realmSelection.jsp b/openam-server-only/src/main/webapp/wsfederation/jsp/realmSelection.jsp index cf6f48eb55..3b1e84ef88 100644 --- a/openam-server-only/src/main/webapp/wsfederation/jsp/realmSelection.jsp +++ b/openam-server-only/src/main/webapp/wsfederation/jsp/realmSelection.jsp @@ -25,6 +25,8 @@ $Id: realmSelection.jsp,v 1.10 2009/10/29 00:00:00 exu Exp $ Portions Copyrighted 2013-2016 ForgeRock AS. + Portions Copyrighted 2026 3A Systems LLC. + --%> <%@page @@ -71,7 +73,7 @@ String spRealm = WSFederationMetaUtils.getRealmByMetaAlias(spMetaAlias); Map> spConfig = WSFederationMetaUtils.getAttributes( - metaManager.getSPSSOConfig(spRealm,spEntityId)); + metaManager.getSPSSOConfig(spRealm,spEntityId).getValue()); String accountRealmCookieName = spConfig.get(WSFederationConstants.ACCOUNT_REALM_COOKIE_NAME).get(0); @@ -225,7 +227,7 @@ getTokenIssuerName(idp); String displayName = - WSFederationMetaUtils.getAttribute(idpconfig, + WSFederationMetaUtils.getAttribute(idpconfig.getValue(), WSFederationConstants.DISPLAY_NAME); if (debug.messageEnabled()) { diff --git a/openam-shared/pom.xml b/openam-shared/pom.xml index 44e348dfb0..088a913786 100755 --- a/openam-shared/pom.xml +++ b/openam-shared/pom.xml @@ -138,6 +138,16 @@ joda-time + + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.glassfish.jaxb + jaxb-runtime + + org.openidentityplatform.commons test-utils diff --git a/openam-shared/src/main/java/com/sun/identity/shared/xml/XMLUtils.java b/openam-shared/src/main/java/com/sun/identity/shared/xml/XMLUtils.java index 06207cb04e..602c0964c3 100644 --- a/openam-shared/src/main/java/com/sun/identity/shared/xml/XMLUtils.java +++ b/openam-shared/src/main/java/com/sun/identity/shared/xml/XMLUtils.java @@ -25,7 +25,7 @@ * $Id: XMLUtils.java,v 1.15 2009/10/19 18:19:20 asyhuang Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.shared.xml; @@ -47,7 +47,7 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; diff --git a/openam-shared/src/main/java/org/forgerock/openam/utils/Time.java b/openam-shared/src/main/java/org/forgerock/openam/utils/Time.java index aa950d3578..906048e054 100644 --- a/openam-shared/src/main/java/org/forgerock/openam/utils/Time.java +++ b/openam-shared/src/main/java/org/forgerock/openam/utils/Time.java @@ -12,12 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems LLC. */ package org.forgerock.openam.utils; import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.Iterator; import java.util.Locale; import java.util.ServiceLoader; @@ -27,6 +29,10 @@ import org.joda.time.DateTimeUtils; import org.slf4j.LoggerFactory; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + /** * The source of all time-based information in OpenAM. *

@@ -149,4 +155,24 @@ private static Calendar setCalendarTime(Calendar calendar) { calendar.setTimeInMillis(currentTimeMillis()); return calendar; } + + public static XMLGregorianCalendar getXMLGregorianCalendarInstance() throws DatatypeConfigurationException { + + Calendar calendar = getCalendarInstance(); + + GregorianCalendar gCalendar = new GregorianCalendar(); + gCalendar.setTime(calendar.getTime()); + gCalendar.setTimeZone(calendar.getTimeZone()); + + return DatatypeFactory.newInstance() + .newXMLGregorianCalendar(gCalendar); + } + + public static XMLGregorianCalendar getXMLGregorianCalendarInstance(Date date) throws DatatypeConfigurationException { + GregorianCalendar gCalendar = new GregorianCalendar(); + gCalendar.setTime(date); + + return DatatypeFactory.newInstance() + .newXMLGregorianCalendar(gCalendar); + } } diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/CTSTokenIdGeneratorImpl.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/CTSTokenIdGeneratorImpl.java index 33e2db7bca..a0f849cbd8 100644 --- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/CTSTokenIdGeneratorImpl.java +++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/CTSTokenIdGeneratorImpl.java @@ -12,7 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems, LLC. + * Portions Copyrighted 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.sts.token; @@ -27,7 +27,7 @@ import org.w3c.dom.NodeList; import jakarta.inject.Inject; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/pom.xml b/pom.xml index f787311334..04461d5194 100644 --- a/pom.xml +++ b/pom.xml @@ -1820,6 +1820,16 @@ netty-tcnative-boringssl-static ${netty-tcnative-boringssl.version} + + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 + + + org.glassfish.jaxb + jaxb-runtime + 3.0.2 + @@ -2235,6 +2245,11 @@ jaxb2-maven-plugin 3.2.0 + + org.jvnet.jaxb + jaxb-maven-plugin + 3.0.2 + org.codehaus.mojo build-helper-maven-plugin From 80f2d773a6faf7a3fa6b09f9b07460efe0312e59 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Wed, 20 May 2026 14:06:51 +0300 Subject: [PATCH 02/15] fix liberty errors --- .../service/model/SMDiscoEntryData.java | 2 +- .../service/model/SMDiscoveryServiceData.java | 2 +- .../plugins/DiscoEntryHandlerImplUtils.java | 49 +++++++++---------- .../plugins/GlobalDiscoEntryHandler.java | 10 ++-- .../disco/plugins/UserDiscoEntryHandler.java | 10 ++-- .../identity/wss/policy/WSSPolicyUtils.java | 2 +- .../federation/meta/IDFFMetaUtils.java | 2 +- .../services/FSDiscoveryBootStrap.java | 4 +- .../liberty/ws/authnsvc/AuthnSvcUtils.java | 2 +- .../liberty/ws/disco/DiscoveryService.java | 24 ++++++--- .../liberty/ws/disco/common/DiscoUtils.java | 31 ++++++------ .../ws/disco/plugins/DiscoEntryHandler.java | 7 ++- .../liberty/ws/idpp/PPRequestHandler.java | 4 +- .../liberty/ws/soapbinding/Utils.java | 4 +- .../saml2/profile/DiscoveryBootstrap.java | 2 +- .../meta/WSFederationMetaUtils.java | 2 +- .../src/main/xjb/liberty.xjb | 6 +++ 17 files changed, 93 insertions(+), 70 deletions(-) diff --git a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java index 7c83b6f010..4ae5072646 100644 --- a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java +++ b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoEntryData.java @@ -140,7 +140,7 @@ public void setDiscoStr(boolean isUserView) } DiscoEntryElement de = entryFac.createDiscoEntryElement(new InsertEntryType()); - de.getValue().setResourceOffering(res); + de.getValue().setResourceOffering(DiscoUtils.getDiscoFactory().createResourceOfferingElement(res)); createDirectivesEntry(de, descriptionTypeList); String str = convertDiscoEntryToXmlStr(de); diff --git a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java index c06fccfa41..4a43311aa0 100644 --- a/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java +++ b/openam-console/src/main/java/com/sun/identity/console/service/model/SMDiscoveryServiceData.java @@ -330,7 +330,7 @@ private static void setDiscoEntryData( DiscoEntryElement entry, SMDiscoEntryData smDisco) { - ResourceOfferingType resOff = entry.getValue().getResourceOffering(); + ResourceOfferingType resOff = entry.getValue().getResourceOffering().getValue(); ResourceIDType resourceIdType = resOff.getResourceID(); ServiceInstanceType serviceInstance = resOff.getServiceInstance(); String providerID = serviceInstance.getProviderID(); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java index 7b0e516f84..a6b4e4d325 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandlerImplUtils.java @@ -43,9 +43,7 @@ import java.util.Map; import java.util.Set; -import javax.xml.transform.stream.StreamSource; -import jakarta.xml.bind.JAXBException; - +import com.sun.identity.liberty.ws.disco.jaxb.QueryType; import com.sun.identity.shared.debug.Debug; import com.sun.identity.liberty.ws.disco.common.DiscoConstants; import com.sun.identity.liberty.ws.disco.common.DiscoServiceManager; @@ -64,7 +62,6 @@ import com.sun.identity.plugin.datastore.DataStoreProvider; import com.sun.identity.saml.common.SAMLUtils; import com.sun.identity.idm.AMIdentity; -import com.sun.identity.liberty.ws.interfaces.ResourceIDMapper; import com.sun.identity.shared.xml.XMLUtils; import org.xml.sax.InputSource; @@ -89,12 +86,12 @@ public static boolean getUserDiscoEntries( DataStoreProvider store, String userID, String attrName, - Map discoEntries) + Map discoEntries) throws Exception { boolean needStore = false; - Set attr = store.getAttribute(userID, attrName); - Iterator i = attr.iterator(); + Set attr = store.getAttribute(userID, attrName); + Iterator i = attr.iterator(); DiscoEntryElement entry = null; String entryID = null; String entryStr = null; @@ -104,10 +101,10 @@ public static boolean getUserDiscoEntries( entry = (DiscoEntryElement) DiscoUtils.getDiscoUnmarshaller().unmarshal( XMLUtils.createSAXSource(new InputSource(new StringReader(entryStr)))); - entryID = entry.getValue().getResourceOffering().getEntryID(); + entryID = entry.getValue().getResourceOffering().getValue().getEntryID(); if ((entryID == null) || (entryID.length() == 0)) { entryID = SAMLUtils.generateID(); - entry.getValue().getResourceOffering().setEntryID(entryID); + entry.getValue().getResourceOffering().getValue().setEntryID(entryID); needStore = true; } discoEntries.put(entryID, entry); @@ -173,11 +170,11 @@ public static boolean setUserDiscoEntries( * @return Map of matching discovery entries. In this map, * key is entryId, value is DiscoEntryElement. */ - public static Map getQueryResults( - Map discoEntries, - List reqServiceTypes) + public static Map getQueryResults( + Map discoEntries, + List reqServiceTypes) { - Map results = null; + Map results = null; if ((reqServiceTypes == null) || (reqServiceTypes.size() == 0)) { if (debug.messageEnabled()) { debug.message("DiscoEntryHandlerImplUtils.getQueryResults: " @@ -185,30 +182,30 @@ public static Map getQueryResults( } results = discoEntries; } else { - results = new HashMap(); - Iterator i = discoEntries.keySet().iterator(); + results = new HashMap<>(); + Iterator i = discoEntries.keySet().iterator(); while (i.hasNext()) { - String curKey = (String) i.next(); + String curKey = i.next(); DiscoEntryElement cur = - (DiscoEntryElement) discoEntries.get(curKey); - ResourceOfferingType offering = cur.getValue().getResourceOffering(); + discoEntries.get(curKey); + ResourceOfferingType offering = cur.getValue().getResourceOffering().getValue(); String serviceType = offering.getServiceInstance().getServiceType(); - List options = null; + List options = null; if (offering.getOptions() != null) { options = offering.getOptions().getOption(); } - Iterator j = reqServiceTypes.iterator(); + Iterator j = reqServiceTypes.iterator(); while (j.hasNext()) { RequestedServiceType curReqType = - (RequestedServiceType)j.next(); + j.next(); String requestedServiceType = curReqType.getServiceType(); if (!requestedServiceType.equals(serviceType)) { continue; } - List queryOptions = null; + List queryOptions = null; if (curReqType.getOptions() != null) { queryOptions = curReqType.getOptions().getOption(); } @@ -327,7 +324,7 @@ public static Map handleInserts(Set discoEntries, List inserts) { insertEntry = (InsertEntryType) i.next(); de = DiscoUtils.getDiscoEntryFactory(). createDiscoEntryElement(new InsertEntryType()); - resOff = insertEntry.getResourceOffering(); + resOff = insertEntry.getResourceOffering().getValue(); String newEntryID = SAMLUtils.generateID(); if (debug.messageEnabled()) { debug.message( @@ -335,7 +332,7 @@ public static Map handleInserts(Set discoEntries, List inserts) { } resOff.setEntryID(newEntryID); newEntryIDs.add(newEntryID); - de.getValue().setResourceOffering(resOff); + de.getValue().setResourceOffering(DiscoUtils.getDiscoFactory().createResourceOfferingElement(resOff)); List dirs = insertEntry.getAny(); if ((dirs != null) && !dirs.isEmpty()) { @@ -440,7 +437,7 @@ public static void getGlobalDiscoEntries(AMIdentity amIdentity, entry = (DiscoEntryElement) DiscoUtils.getDiscoUnmarshaller().unmarshal( XMLUtils.createSAXSource(new InputSource(new StringReader(entryStr)))); - resOff = entry.getValue().getResourceOffering(); + resOff = entry.getValue().getResourceOffering().getValue(); entryID = resOff.getEntryID(); if(entryID == null) { entryID = SAMLUtils.generateID(); @@ -456,7 +453,7 @@ public static void getGlobalDiscoEntries(AMIdentity amIdentity, resID.setValue(DiscoConstants.IMPLIED_RESOURCE); resOff.setResourceID(resID); } - entry.getValue().setResourceOffering(resOff); + entry.getValue().setResourceOffering(DiscoUtils.getDiscoFactory().createResourceOfferingElement(resOff)); discoEntries.put(entryID, entry); } catch (Exception e) { debug.error("DiscoEntryHandlerImplUtils.getServiceDiscoEntries:" diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/GlobalDiscoEntryHandler.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/GlobalDiscoEntryHandler.java index c67c38784c..12b34a6f04 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/GlobalDiscoEntryHandler.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/GlobalDiscoEntryHandler.java @@ -24,6 +24,8 @@ * * $Id: GlobalDiscoEntryHandler.java,v 1.2 2008/06/25 05:49:56 qcheng Exp $ * + * Portions Copyrighted 2026 3A Systems LLC. + * */ package com.sun.identity.liberty.ws.disco.plugins; @@ -36,15 +38,15 @@ import com.iplanet.sso.SSOToken; import com.iplanet.sso.SSOException; -import com.iplanet.am.util.SystemProperties; import com.sun.identity.idm.AMIdentity; import com.sun.identity.idm.AMIdentityRepository; import com.sun.identity.idm.IdRepoException; import com.sun.identity.liberty.ws.disco.common.DiscoConstants; import com.sun.identity.liberty.ws.disco.common.DiscoUtils; import com.sun.identity.liberty.ws.disco.DiscoveryException; +import com.sun.identity.liberty.ws.disco.jaxb.QueryType; +import com.sun.identity.liberty.ws.disco.plugins.jaxb.DiscoEntryElement; import com.sun.identity.security.AdminTokenAction; -import com.sun.identity.common.SystemConfigurationUtil; /* * The class GlobalDiscoEntryHandler provides an @@ -128,9 +130,9 @@ private static void registerDiscoveryService() * for this user. For each DiscoEntry element in the List, * the entryId attribute of ResourceOffering need to be set. */ - public Map getDiscoEntries(String userID, List reqServiceTypes) { + public Map getDiscoEntries(String userID, List reqServiceTypes) { DiscoUtils.debug.message("in GlobalDiscoEntryHandler.getDiscoEntries"); - Map results = new HashMap(); + Map results = new HashMap<>(); try { DiscoEntryHandlerImplUtils.getGlobalDiscoEntries( getRealmIdentity(), DYNAMIC_ATTR_NAME, results, userID); diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/UserDiscoEntryHandler.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/UserDiscoEntryHandler.java index 597f89b9e1..81101c2b6f 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/UserDiscoEntryHandler.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/UserDiscoEntryHandler.java @@ -24,6 +24,8 @@ * * $Id: UserDiscoEntryHandler.java,v 1.2 2008/06/25 05:49:56 qcheng Exp $ * + * Portions Copyrighted 2026 3A Systems LLC. + * */ package com.sun.identity.liberty.ws.disco.plugins; @@ -34,6 +36,8 @@ import java.util.Map; import java.util.Set; import com.sun.identity.liberty.ws.disco.common.DiscoConstants; +import com.sun.identity.liberty.ws.disco.jaxb.QueryType; +import com.sun.identity.liberty.ws.disco.plugins.jaxb.DiscoEntryElement; import com.sun.identity.plugin.datastore.DataStoreProvider; import com.sun.identity.plugin.datastore.DataStoreProviderManager; @@ -69,16 +73,16 @@ public UserDiscoEntryHandler() { * List, the entryId attribute of ResourceOffering need to * be set. */ - public Map getDiscoEntries(String userID, List reqServiceTypes) { + public Map getDiscoEntries(String userID, List reqServiceTypes) { DiscoEntryHandlerImplUtils.debug.message( "in UserDiscoEntryHandler.getDiscoEntries"); - Map results = new HashMap(); + Map results = new HashMap<>(); try { DataStoreProvider store = DataStoreProviderManager.getInstance(). getDataStoreProvider(DISCO); if (DiscoEntryHandlerImplUtils.getUserDiscoEntries( - store, userID, USER_ATTR_NAME,results)) + store, userID, USER_ATTR_NAME, results)) { // this is the case when the DiscoEntry is set through console // or amadmin, and entryID was not set diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java index d95764d34f..4d929e1dc4 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/policy/WSSPolicyUtils.java @@ -51,7 +51,7 @@ public class WSSPolicyUtils { private static final String PROP_JAXB_FORMATTED_OUTPUT = "jaxb.formatted.output"; private static final String PROP_NAMESPACE_PREFIX_MAPPER = - "com.sun.xml.bind.namespacePrefixMapper"; + "org.glassfish.jaxb.namespacePrefixMapper"; private static NamespacePrefixMapperImpl nsPrefixMapper = new NamespacePrefixMapperImpl(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java index 21f17c441a..31aa814b41 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFMetaUtils.java @@ -92,7 +92,7 @@ public class IDFFMetaUtils { private static final String PROP_JAXB_FORMATTED_OUTPUT = "jaxb.formatted.output"; private static final String PROP_NAMESPACE_PREFIX_MAPPER = - "com.sun.xml.bind.namespacePrefixMapper"; + "org.glassfish.jaxb.namespacePrefixMapper"; private static NamespacePrefixMapperImpl nsPrefixMapper = new NamespacePrefixMapperImpl(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java index a083934737..487a73cfb1 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSDiscoveryBootStrap.java @@ -142,7 +142,7 @@ private Document getResourceOffering( } try { - ResourceOfferingType offering = discoEntry.getValue().getResourceOffering(); + ResourceOfferingType offering = discoEntry.getValue().getResourceOffering().getValue(); ServiceInstanceType serviceInstance = offering.getServiceInstance(); String providerID = serviceInstance.getProviderID(); if (!DiscoServiceManager.useImpliedResource()) { @@ -171,7 +171,7 @@ private Document getResourceOffering( offering.setResourceID(resourceID); } - List discoEntryList = new ArrayList(); + List discoEntryList = new ArrayList<>(); discoEntryList.add(discoEntry); SessionSubject sessionSubject = null; if (DiscoServiceManager.encryptNIinSessionContext()) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java index 4748d19c48..dae5bac073 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/AuthnSvcUtils.java @@ -119,7 +119,7 @@ public static boolean setResourceOfferingAndCredentials( try { DiscoEntryElement discoEntry = (DiscoEntryElement) DiscoServiceManager.getBootstrappingDiscoEntry(); - ResourceOfferingType offering = discoEntry.getValue().getResourceOffering(); + ResourceOfferingType offering = discoEntry.getValue().getResourceOffering().getValue(); if (!DiscoServiceManager.useImpliedResource()) { ServiceInstanceType serviceInstance = offering.getServiceInstance(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java index d353682643..a6381d86fc 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/DiscoveryService.java @@ -39,6 +39,8 @@ import java.util.Collection; import java.util.logging.Level; +import com.sun.identity.liberty.ws.disco.plugins.jaxb.DiscoEntryElement; +import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import org.w3c.dom.*; @@ -147,12 +149,18 @@ public Message processRequest(Message request) throws Exception { } Object body = bodies.iterator().next(); - if (body instanceof QueryType) { + if(!(body instanceof JAXBElement)) { + DiscoUtils.debug.error("DiscoService.processRequest: SOAPBody " + + "is not a Disco message."); + throw new Exception(DiscoUtils.bundle.getString("bodyNotDisco")); + } + JAXBElement jaxbElement = (JAXBElement)body; + if (jaxbElement.getValue() instanceof QueryType) { message.setSOAPBody( - lookup((QueryType) body, request)); - } else if (body instanceof ModifyType) { + lookup((QueryType) jaxbElement.getValue(), request)); + } else if (jaxbElement.getValue() instanceof ModifyType) { message.setSOAPBody( - Utils.convertJAXBToElement(update((ModifyType) body,request))); + Utils.convertJAXBToElement(update((ModifyType) jaxbElement.getValue(),request))); } else { DiscoUtils.debug.error("DiscoService.processRequest: SOAPBody " + "is not a Disco message."); @@ -188,7 +196,7 @@ private org.w3c.dom.Element lookup( String resourceID = null; ResourceIDType resID = query.getResourceID(); if (resID == null) { - resourceID = getResourceID(query.getEncryptedResourceID(), + resourceID = getResourceID(query.getEncryptedResourceID().getValue(), providerID); } else { resourceID = resID.getValue(); @@ -241,9 +249,9 @@ private org.w3c.dom.Element lookup( resp.toString(), null).getDocumentElement(); } - Map discoEntriesMap = entryHandler.getDiscoEntries(userDN, + Map discoEntriesMap = entryHandler.getDiscoEntries(userDN, query.getRequestedServiceType()); - Collection results = discoEntriesMap.values(); + Collection results = discoEntriesMap.values(); Map returnMap = null; if (results.size() == 0) { @@ -330,7 +338,7 @@ private com.sun.identity.liberty.ws.disco.jaxb.ModifyResponseElement update( String resourceID = null; ResourceIDType resID = modify.getResourceID(); if (resID == null) { - resourceID = getResourceID(modify.getEncryptedResourceID(), + resourceID = getResourceID(modify.getEncryptedResourceID().getValue(), providerID); } else { resourceID = resID.getValue(); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java index 8d982e4b74..ffaf7ba866 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/common/DiscoUtils.java @@ -42,6 +42,7 @@ import java.util.BitSet; import com.sun.identity.liberty.ws.disco.jaxb11.GenerateBearerTokenElement; +import com.sun.identity.liberty.ws.disco.plugins.jaxb.DiscoEntryElement; import com.sun.identity.saml.assertion.NameIdentifier; import com.sun.identity.saml.assertion.Statement; import com.sun.identity.liberty.ws.disco.EncryptedResourceID; @@ -59,6 +60,7 @@ import com.sun.identity.liberty.ws.util.ProviderUtil; import com.sun.identity.federation.message.common.EncryptedNameIdentifier; import com.sun.identity.federation.message.common.IDPProvidedNameIdentifier; +import jakarta.xml.bind.JAXBElement; /** * Provides utility methods to discovery service. @@ -90,23 +92,23 @@ private DiscoUtils() { * Value: List of credentials (Assertions) * */ - public static Map checkPolicyAndHandleDirectives( - String userDN, Message message, - Collection results, Authorizer authorizer, - SessionContext invoSession, String wscID, - Object token) + public static Map checkPolicyAndHandleDirectives( + String userDN, Message message, + Collection results, Authorizer authorizer, + SessionContext invoSession, String wscID, + Object token) { DiscoUtils.debug.message("DiscoService.checkPolicyAndHandleDirectives"); - List offerings = new LinkedList(); + List offerings = new LinkedList<>(); List credentials = new LinkedList(); - Map env = null; - Iterator k = results.iterator(); + Map env = null; + Iterator k = results.iterator(); while (k.hasNext()) { - InsertEntryType entry = (InsertEntryType) k.next(); + InsertEntryType entry = k.next().getValue(); if (authorizer != null) { if (env == null) { - env = new HashMap(); + env = new HashMap<>(); env.put(Authorizer.USER_ID, userDN); env.put(Authorizer.AUTH_TYPE, message.getAuthenticationMechanism()); @@ -132,7 +134,7 @@ public static Map checkPolicyAndHandleDirectives( ex); continue; } - List directives = entry.getAny(); + List directives = entry.getAny(); if ((directives == null) || directives.isEmpty()) { DiscoUtils.debug.message("DiscoService: no directives."); offerings.add(current); @@ -143,7 +145,7 @@ public static Map checkPolicyAndHandleDirectives( } } - Map returnMap = new HashMap(); + Map returnMap = new HashMap(); returnMap.put(OFFERINGS, offerings); returnMap.put(CREDENTIALS, credentials); return returnMap; @@ -176,9 +178,8 @@ private static void handleDirectives(ResourceOffering current, } Iterator iter0 = directives.iterator(); while(iter0.hasNext()) { - Object directive = iter0.next(); - List descIDRefs = - ((DirectiveType) directive).getDescriptionIDRefs(); + JAXBElement directive =(JAXBElement) iter0.next(); + List descIDRefs = directive.getValue().getDescriptionIDRefs(); if (directive instanceof EncryptResourceIDElement) { debug.message("DiscoService: has encrypt D"); current = doEncryption(current); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandler.java index 086f72103d..40f36c3fb4 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DiscoEntryHandler.java @@ -24,11 +24,16 @@ * * $Id: DiscoEntryHandler.java,v 1.2 2008/06/25 05:47:12 qcheng Exp $ * + * Portions Copyrighted 2026 3A Systems LLC. + * */ package com.sun.identity.liberty.ws.disco.plugins; +import com.sun.identity.liberty.ws.disco.jaxb.QueryType; +import com.sun.identity.liberty.ws.disco.plugins.jaxb.DiscoEntryElement; + import java.util.Map; import java.util.List; @@ -70,7 +75,7 @@ public interface DiscoEntryHandler { * in the List, the entryId attribute of * ResourceOffering should be set. */ - public Map getDiscoEntries(String userID, List reqServiceTypes); + public Map getDiscoEntries(String userID, List reqServiceTypes); /** diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java index 4ccfe4b088..dc18e8677c 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPRequestHandler.java @@ -137,7 +137,7 @@ public Object processDSTRequest( QueryElement query = (QueryElement)request; Document doc = IDPPUtils.getDocumentBuilder().newDocument(); IDPPUtils.getMarshaller().setProperty( - "com.sun.xml.bind.namespacePrefixMapper", + "org.glassfish.jaxb.namespacePrefixMapper", new NamespacePrefixMapperImpl()); IDPPUtils.getMarshaller().marshal(query, doc); return processQueryRequest(query, providerID, requestMsg, doc); @@ -145,7 +145,7 @@ public Object processDSTRequest( ModifyElement modify = (ModifyElement)request; Document doc = IDPPUtils.getDocumentBuilder().newDocument(); IDPPUtils.getMarshaller().setProperty( - "com.sun.xml.bind.namespacePrefixMapper", + "org.glassfish.jaxb.namespacePrefixMapper", new NamespacePrefixMapperImpl()); IDPPUtils.getMarshaller().marshal(modify, doc); return processModifyRequest(modify, providerID, requestMsg, doc); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java index f6511c26c4..2823bc3bce 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/Utils.java @@ -326,7 +326,7 @@ public static Element convertJAXBToElement(Object jaxbObj) throws JAXBException { Marshaller m = jc.createMarshaller(); try { - m.setProperty("com.sun.xml.bind.namespacePrefixMapper", + m.setProperty("org.glassfish.jaxb.namespacePrefixMapper", new NamespacePrefixMapperImpl()); } catch(PropertyException ex) { debug.error("Utils.convertJAXBToElement", ex); @@ -353,7 +353,7 @@ public static Element convertJAXBToElement(Object jaxbObj, boolean checkIdref) throws JAXBException { Marshaller m = jc.createMarshaller(); try { - m.setProperty("com.sun.xml.bind.namespacePrefixMapper", + m.setProperty("org.glassfish.jaxb.namespacePrefixMapper", new NamespacePrefixMapperImpl()); } catch(PropertyException ex) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java index 443351167b..3f99d1f115 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/DiscoveryBootstrap.java @@ -165,7 +165,7 @@ private String getResourceOffering(String authnContextClassRef, String univID = values[0]; try { - ResourceOfferingType offering = discoEntry.getValue().getResourceOffering(); + ResourceOfferingType offering = discoEntry.getValue().getResourceOffering().getValue(); ServiceInstanceType serviceInstance = offering.getServiceInstance(); String providerID = serviceInstance.getProviderID(); if (!DiscoServiceManager.useImpliedResource()) { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java index f53d4ae020..399f187cef 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationMetaUtils.java @@ -93,7 +93,7 @@ public final class WSFederationMetaUtils { private static final String PROP_JAXB_FORMATTED_OUTPUT = "jaxb.formatted.output"; private static final String PROP_NAMESPACE_PREFIX_MAPPER = - "com.sun.xml.bind.namespacePrefixMapper"; + "org.glassfish.jaxb.namespacePrefixMapper"; private static NamespacePrefixMapperImpl nsPrefixMapper = new NamespacePrefixMapperImpl(); diff --git a/openam-schema/openam-liberty-schema/src/main/xjb/liberty.xjb b/openam-schema/openam-liberty-schema/src/main/xjb/liberty.xjb index 45017cae31..d47f9ffffc 100644 --- a/openam-schema/openam-liberty-schema/src/main/xjb/liberty.xjb +++ b/openam-schema/openam-liberty-schema/src/main/xjb/liberty.xjb @@ -147,6 +147,12 @@ --> + + + + + + From 815f1a777510e82fa3c1b2ccf043a31383917a82 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 21 May 2026 11:30:25 +0300 Subject: [PATCH 03/15] REST SAML STS E2E test --- e2e/sts/rest-sts-test.spec.mjs | 175 +++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 e2e/sts/rest-sts-test.spec.mjs diff --git a/e2e/sts/rest-sts-test.spec.mjs b/e2e/sts/rest-sts-test.spec.mjs new file mode 100644 index 0000000000..3f72461ce5 --- /dev/null +++ b/e2e/sts/rest-sts-test.spec.mjs @@ -0,0 +1,175 @@ +/* + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. + * + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. + * + * When distributing Covered Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions copyright [year] [name of copyright owner]". + * + * Copyright 2026 3A Systems, LLC. + */ + +import { test, expect } from "@playwright/test"; +import { resolve } from "path"; +import { fileURLToPath } from "url"; + +// ─── Configuration ──────────────────────────────────────────────────────────── +const BASE_URL = process.env.OPENAM_BASE_URL ?? "http://openam.example.org:8080/openam"; +const ADMIN_USER = process.env.OPENAM_ADMIN_USER ?? "amadmin"; +const ADMIN_PASS = process.env.OPENAM_ADMIN_PASS ?? "ampassword"; + +const STS_INSTANCE_NAME = "openam-to-saml-sts"; +const SP_ENTITY_ID = "https://sp.example.com"; +const SP_ACS_URL = "https://sp.example.com/acs"; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = resolve(__filename, ".."); + +// Get admin token +async function getAuthToken(request, username, password) { + const resp = await request.post(`${BASE_URL}/json/authenticate`, { + headers: { + "Content-Type": "application/json", + "X-OpenAM-Username": username, + "X-OpenAM-Password": password, + "Content-Type": "application/json", + "Accept-API-Version": "resource=2.0, protocol=1.0", + } + }); + const json = await resp.json(); + return json.tokenId; +} + +async function setupSts(request) { + +} + +// ─── Tests ──────────────────────────────────────────────────────────────────── +test.describe("REST STS - OpenAM Token → SAML2", () => { + + let adminToken; + + + async function stsExists(request) { + const response = await request.get(`${BASE_URL}/sts-publish/rest`, { + headers: { + "Content-Type": "application/json", + "iPlanetDirectoryPro": adminToken + }, + }); + + if(!response.ok()) { + return false; + } + const json = await response.json(); + return !!json[STS_INSTANCE_NAME] + } + + async function setupSts(request) { + const payload = { + invocation_context: "invocation_context_client_sdk", + instance_state: { + "deployment-config": { + "deployment-url-element": STS_INSTANCE_NAME, + "deployment-realm": "/", + "deployment-auth-target-mappings": {} + }, + "saml2-config": { + "issuer-name": `${BASE_URL}`, + "saml2-sp-entity-id": SP_ENTITY_ID, + "saml2-sp-acs-url": SP_ACS_URL, + "saml2-signature-key-alias": "test", + "saml2-sign-assertion": "false", + "saml2-encrypt-assertion": "false", + "saml2-encrypt-attributes": "false", + "saml2-encrypt-nameid": "false", + "saml2-name-id-format": "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", + "saml2-token-lifetime-seconds": "600", + "saml2-encryption-algorithm-strength": "128", + "saml2-attribute-map": { + "email": "mail" + } + }, + "persist-issued-tokens-in-cts": "false", + "supported-token-transforms": [ + { + "inputTokenType": "OPENAM", + "outputTokenType": "SAML2", + "invalidateInterimOpenAMSession": false + } + ], + "token-lifetime": 600 + } + }; + + const response = await request.post(`${BASE_URL}/sts-publish/rest?_action=create`, { + headers: { + "Content-Type": "application/json", + "iPlanetDirectoryPro": adminToken + }, + data: payload + }); + + expect(response.ok()).toBeTruthy(); + const body = await response.json(); + console.log("REST STS instance created:", body); + expect(body).toHaveProperty("_id"); + } + + test.beforeAll(async ({ request }) => { + adminToken = await getAuthToken(request, ADMIN_USER, ADMIN_PASS); + expect(adminToken).toBeTruthy(); + console.log(`Admin token obtained: ${adminToken.slice(0, 20)}...`); + const haveSts = await stsExists(request) + if(!haveSts) { + await setupSts(request); + } + }); + + + test("should translate OpenAM token to SAML2 assertion", async ({ request }) => { + + const userSession = await getAuthToken(request, "demo", "changeit"); + + const translatePayload = { + input_token_state: { + token_type: "OPENAM", + session_id: userSession + }, + output_token_state: { + token_type: "SAML2", + subject_confirmation: "BEARER" + } + }; + + const response = await request.post( + `${BASE_URL}/rest-sts/${STS_INSTANCE_NAME}?_action=translate`, + { + headers: { + "Content-Type": "application/json", + "iPlanetDirectoryPro": userSession + }, + data: translatePayload + } + ); + + expect(response.ok()).toBeTruthy(); + const result = await response.json(); + + expect(result).toHaveProperty("issued_token"); + const assertion = result.issued_token; + + console.log(`SAML Assertion received: ${assertion.substring(0, 300)}...`,); + + // Basic XML validation + expect(assertion).toContain("${BASE_URL}`); + expect(assertion).toContain(SP_ENTITY_ID); + }); + +}); \ No newline at end of file From dac13f3c06940c940d77a99d6ffd0a53e2df525b Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:56:40 +0300 Subject: [PATCH 04/15] Fix ClassCastException in WSFederationCOTUtils.removeFromEntityConfig after JAXB3 migration getIDPSSOConfigOrSPSSOConfig() now returns List>, but removeFromEntityConfig still cast elements directly to BaseConfigType / AttributeType. Unwrap via getValue(), mirroring addToEntityConfig. --- .../wsfederation/meta/WSFederationCOTUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java index df539b5181..f76b77348e 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/meta/WSFederationCOTUtils.java @@ -197,13 +197,13 @@ public void removeFromEntityConfig(String realm, String name, FederationConfigElement eConfig = metaManager.getEntityConfig(realm, entityId); if (eConfig != null) { - List elist = eConfig.getValue(). + List> elist = eConfig.getValue(). getIDPSSOConfigOrSPSSOConfig(); - for (Iterator iter = elist.iterator(); iter.hasNext();) { - BaseConfigType bConfig = (BaseConfigType)iter.next(); - List list = bConfig.getAttribute(); - for (Iterator iter2 = list.iterator(); iter2.hasNext();) { - AttributeType avp = (AttributeType)iter2.next(); + for (Iterator> iter = elist.iterator(); iter.hasNext();) { + BaseConfigType bConfig = iter.next().getValue(); + List list = bConfig.getAttribute(); + for (Iterator iter2 = list.iterator(); iter2.hasNext();) { + AttributeType avp = iter2.next().getValue(); if (avp.getName().trim().equalsIgnoreCase( SAML2Constants.COT_LIST)) { List avpl = avp.getValue(); From 9e8cad2dd553cda338a3bda58dbeb2203f6f4f6c Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:56:40 +0300 Subject: [PATCH 05/15] Fix ClassCastException in multi-protocol SOAP single logout after JAXB3 migration getSingleLogoutService() returns List (JAXBElement wrappers); unwrap to List before LogoutUtil.doLogout(). --- .../identity/multiprotocol/SAML2SingleLogoutHandler.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java index aaf763e30b..3007d758fa 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/SAML2SingleLogoutHandler.java @@ -38,6 +38,7 @@ import com.sun.identity.saml2.common.SAML2Utils; import com.sun.identity.saml2.jaxb.entityconfig.IDPSSOConfigElement; import com.sun.identity.saml2.jaxb.entityconfig.SPSSOConfigElement; +import com.sun.identity.saml2.jaxb.metadata.EndpointType; import com.sun.identity.saml2.jaxb.metadata.SPSSODescriptorElement; import com.sun.identity.saml2.meta.SAML2MetaManager; import com.sun.identity.saml2.meta.SAML2MetaUtils; @@ -51,6 +52,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; +import jakarta.xml.bind.JAXBElement; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -342,8 +345,9 @@ private int handleSOAPInitiatedSingleLogout(Set userSession, String userID, SPSSODescriptorElement sp = null; sp = SAML2Utils.getSAML2MetaManager(). getSPSSODescriptor(realm, spEntityID); - List slosList = sp.getValue().getSingleLogoutService(); - + List slosList = sp.getValue().getSingleLogoutService().stream() + .map(JAXBElement::getValue).collect(Collectors.toList()); + // get IDP entity config for basic auth info SPSSOConfigElement spConfig = SAML2Utils. getSAML2MetaManager().getSPSSOConfig(realm, spEntityID); From ea473f7fc0218c1ef516e21542c1a7c2f0bb035d Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:56:40 +0300 Subject: [PATCH 06/15] Fix ClassCastException in SP single logout after JAXB3 migration Unwrap the SingleLogoutService wrapper list to List before LogoutUtil.doLogout(). The wrapper-expecting getSLOServiceLocation() path is left unchanged. --- .../java/com/sun/identity/saml2/profile/SPSingleLogout.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java index 2d8cbed654..d87daac62e 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/SPSingleLogout.java @@ -48,6 +48,7 @@ import com.sun.identity.saml2.common.SAML2Utils; import com.sun.identity.saml2.jaxb.entityconfig.BaseConfigType; import com.sun.identity.saml2.jaxb.entityconfig.IDPSSOConfigElement; +import com.sun.identity.saml2.jaxb.metadata.EndpointType; import com.sun.identity.saml2.jaxb.metadata.IDPSSODescriptorElement; import com.sun.identity.saml2.jaxb.metadata.SPSSODescriptorElement; import com.sun.identity.saml2.logging.LogUtil; @@ -69,6 +70,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; +import java.util.stream.Collectors; +import jakarta.xml.bind.JAXBElement; import java.util.Map; import java.util.StringTokenizer; import java.util.logging.Level; @@ -447,7 +450,8 @@ private static String prepareForLogout(String realm, SAML2Utils.bundle.getString("metaDataError")); } - List slosList = idpsso.getValue().getSingleLogoutService(); + List slosList = idpsso.getValue().getSingleLogoutService().stream() + .map(JAXBElement::getValue).collect(Collectors.toList()); if (slosList == null) { String[] data = {nameIdInfoKey.getRemoteEntityID()}; LogUtil.error(Level.INFO,LogUtil.SLO_NOT_FOUND,data, From 6a4d81419b8cd0178ed1b378bea10a2dc9a5af73 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:56:41 +0300 Subject: [PATCH 07/15] Fix ClassCastException in SAML2 attribute query value conversion after JAXB3 migration convertAttributes() added the AttributeValueElement wrapper instead of its content to the list passed to setAttributeValueString(), which casts each element to String. Add the unwrapped value. --- .../com/sun/identity/saml2/profile/AttributeQueryUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java index 4ad178e8a7..e0dfd949bb 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AttributeQueryUtil.java @@ -878,12 +878,12 @@ private static List convertAttributes(List jaxbAttr List jaxbValues = jaxbAttr.getValue().getAttributeValue(); if ((jaxbValues != null) && (!jaxbValues.isEmpty())) { - List newValues = new ArrayList<>(); + List newValues = new ArrayList<>(); for(Iterator iterV = jaxbValues.iterator(); iterV.hasNext();) { AttributeValueElement jaxbValeu = iterV.next(); Object content = jaxbValeu.getValue(); if (content != null) { - newValues.add(jaxbValeu); + newValues.add(content); } } if (!newValues.isEmpty()) { From 3435063154f223ed28d6e0b0e0e72a261d5bbf31 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:56:41 +0300 Subject: [PATCH 08/15] Fix ClassCastException reading hosted entity config in OpenFM workflows after JAXB3 migration getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig() returns List>; unwrap via getValue() before use. --- .../java/com/sun/identity/workflow/GetCircleOfTrusts.java | 7 ++++--- .../com/sun/identity/workflow/ImportSAML2MetaData.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java index 55e0111085..86763e91a7 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/GetCircleOfTrusts.java @@ -37,6 +37,7 @@ import com.sun.identity.cot.COTException; import com.sun.identity.saml2.meta.SAML2MetaUtils; import com.sun.identity.saml2.jaxb.entityconfig.BaseConfigType; +import jakarta.xml.bind.JAXBElement; import com.sun.identity.saml2.jaxb.entityconfig.EntityConfigElement; import java.io.UnsupportedEncodingException; import java.util.Iterator; @@ -113,11 +114,11 @@ private String getRealmFromExtData(String xml) (obj instanceof EntityConfigElement) ? (EntityConfigElement)obj : null; if (configElt != null && configElt.getValue().isHosted()) { - List config = + List> config = configElt.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); if (!config.isEmpty()) { - BaseConfigType bConfig = (BaseConfigType) - config.iterator().next(); + BaseConfigType bConfig = + config.iterator().next().getValue(); realm = SAML2MetaUtils.getRealmByMetaAlias( bConfig.getMetaAlias()); } diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java index b840c76a97..5d2de5a412 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ImportSAML2MetaData.java @@ -37,6 +37,7 @@ import com.sun.identity.shared.debug.Debug; import com.sun.identity.shared.xml.XMLUtils; import java.util.List; +import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import org.w3c.dom.Document; @@ -74,11 +75,11 @@ public static String[] importData( configElt = (obj instanceof EntityConfigElement) ? (EntityConfigElement)obj : null; if (configElt != null && configElt.getValue().isHosted()) { - List config = + List> config = configElt.getValue().getIDPSSOConfigOrSPSSOConfigOrAuthnAuthorityConfig(); if (!config.isEmpty()) { - BaseConfigType bConfig = (BaseConfigType) - config.iterator().next(); + BaseConfigType bConfig = + config.iterator().next().getValue(); realm = SAML2MetaUtils.getRealmByMetaAlias( bConfig.getMetaAlias()); } From 271ad112359c58d2e9872597f22a486ac836e017 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:56:49 +0300 Subject: [PATCH 09/15] Fix NullPointerException on KeyDescriptor without "use" in console after JAXB3 migration getUse() returns null when the optional use attribute is absent (one key for both signing and encryption); guard before calling value(). --- .../sun/identity/console/federation/model/SAMLv2ModelImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java index 3a10d477dc..fb9de66ca8 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java @@ -1716,7 +1716,8 @@ private void getKeyandAlgorithm( for (int i=0; i Date: Sat, 20 Jun 2026 12:56:49 +0300 Subject: [PATCH 10/15] Fix invalid SAML2 metadata endpoints generated by console after JAXB3 migration SingleLogoutService / NameIDMappingService / AuthnQueryService / AssertionIDRequestService endpoints were created with createAttributeServiceType(), which injects a spurious xsi:type="AttributeServiceType" on marshal. Use createEndpointType(). --- .../federation/model/SAMLv2ModelImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java index fb9de66ca8..ca8fffb158 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/SAMLv2ModelImpl.java @@ -1152,7 +1152,7 @@ public void setIDPStdAttributeValues( if (nameIDmappingList.isEmpty()) { namidElem1 = - objFact.createNameIDMappingServiceElement(objFact.createAttributeServiceType()); + objFact.createNameIDMappingServiceElement(objFact.createEndpointType()); namidElem1.getValue().setBinding(soapBinding); idpssoDescriptor.getValue().getNameIDMappingService(). add(namidElem1); @@ -2894,9 +2894,9 @@ public void setStdAttributeAuthorityValues( String uriLocation = getResult( attrAuthValues, ASSERTION_ID_URI_LOC); AssertionIDRequestServiceElement elem1 = - objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); + objFact.createAssertionIDRequestServiceElement(objFact.createEndpointType()); AssertionIDRequestServiceElement elem2 = - objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); + objFact.createAssertionIDRequestServiceElement(objFact.createEndpointType()); elem1.getValue().setBinding(soapBinding); elem2.getValue().setBinding(uriBinding); @@ -3041,7 +3041,7 @@ public void setStdAuthnAuthorityValues( authnauthDescriptor.getValue().getAuthnQueryService().clear(); } AuthnQueryServiceElement key = - objFact.createAuthnQueryServiceElement(objFact.createAttributeServiceType()); + objFact.createAuthnQueryServiceElement(objFact.createEndpointType()); key.getValue().setBinding(soapBinding); key.getValue().setLocation(queryService); authnauthDescriptor.getValue().getAuthnQueryService().add(key); @@ -3057,10 +3057,10 @@ public void setStdAuthnAuthorityValues( assertionIDReqList.clear(); } AssertionIDRequestServiceElement elem1 = - objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); + objFact.createAssertionIDRequestServiceElement(objFact.createEndpointType()); elem1.getValue().setBinding(soapBinding); AssertionIDRequestServiceElement elem2 = - objFact.createAssertionIDRequestServiceElement(objFact.createAttributeServiceType()); + objFact.createAssertionIDRequestServiceElement(objFact.createEndpointType()); elem2.getValue().setBinding(uriBinding); if (soapLocation != null) { @@ -3469,7 +3469,7 @@ private void savehttpRedLogout ( ) throws JAXBException { if (lohttpLocation != null && lohttpLocation.length() > 0) { SingleLogoutServiceElement slsElemRed = - objFact.createSingleLogoutServiceElement(objFact.createAttributeServiceType()); + objFact.createSingleLogoutServiceElement(objFact.createEndpointType()); slsElemRed.getValue().setBinding(httpRedirectBinding); slsElemRed.getValue().setLocation(lohttpLocation); slsElemRed.getValue().setResponseLocation(lohttpRespLocation); @@ -3494,7 +3494,7 @@ private void savepostLogout( ) throws JAXBException { if (postLocation != null && postLocation.length() > 0) { SingleLogoutServiceElement slsElemPost = - objFact.createSingleLogoutServiceElement(objFact.createAttributeServiceType()); + objFact.createSingleLogoutServiceElement(objFact.createEndpointType()); slsElemPost.getValue().setBinding(httpPostBinding); slsElemPost.getValue().setLocation(postLocation); slsElemPost.getValue().setResponseLocation(postRespLocation); From d9d4b8e13ea7340bd4dafd0a38e0da736391aadd Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:57:09 +0300 Subject: [PATCH 11/15] Fix NullPointerException for entities without affiliation config in IDFFCOTUtils after JAXB3 migration getAffiliationDescriptorConfig() is null for ordinary SP/IDP entities; guard the wrapper before getValue() in add/remove EntityConfig. --- .../com/sun/identity/federation/meta/IDFFCOTUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java index 039890cb53..36cfcaaae3 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/meta/IDFFCOTUtils.java @@ -130,8 +130,9 @@ public void updateEntityConfig(String realm, String cotName,String entityID) updateCOTAttrInConfig( realm, idpConfigList,cotName,entityConfig,objFactory, idffMetaMgr); - BaseConfigType affiConfig = - entityConfig.getValue().getAffiliationDescriptorConfig().getValue(); + BaseConfigType affiConfig = + (entityConfig.getValue().getAffiliationDescriptorConfig() == null) ? null + : entityConfig.getValue().getAffiliationDescriptorConfig().getValue(); if (affiConfig != null) { List affiConfigList = new ArrayList(); affiConfigList.add(affiConfig); @@ -175,8 +176,9 @@ public void removeFromEntityConfig( entityConfig,idffMetaMgr); removeCOTNameFromConfig(realm, idpConfigList,cotName, entityConfig,idffMetaMgr); - BaseConfigType affiConfig = - entityConfig.getValue().getAffiliationDescriptorConfig().getValue(); + BaseConfigType affiConfig = + (entityConfig.getValue().getAffiliationDescriptorConfig() == null) ? null + : entityConfig.getValue().getAffiliationDescriptorConfig().getValue(); if (affiConfig != null) { List affiConfigList = new ArrayList(); affiConfigList.add(affiConfig); From 5aa4d1c5e3344294e54cd598151edfea01ca01ce Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:57:09 +0300 Subject: [PATCH 12/15] Fix NullPointerException reading optional Liberty Personal Profile elements after JAXB3 migration Optional JAXB elements are now possibly-null JAXBElement wrappers. Add a null-safe jaxbValue() helper in IDPPBaseContainer and use it across the IDPP container read-back methods. --- .../ws/idpp/container/IDPPAddressCard.java | 2 +- .../ws/idpp/container/IDPPBaseContainer.java | 21 +++++++++++++++---- .../ws/idpp/container/IDPPCommonName.java | 2 +- .../ws/idpp/container/IDPPDemographics.java | 6 +++--- .../container/IDPPEmploymentIdentity.java | 4 ++-- .../liberty/ws/idpp/container/IDPPFacade.java | 10 ++++----- .../ws/idpp/container/IDPPLegalIdentity.java | 8 +++---- 7 files changed, 33 insertions(+), 20 deletions(-) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java index eb23d28696..5dd2726998 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPAddressCard.java @@ -422,7 +422,7 @@ private String createAddressCard(AddressCardElement ace, StringBuffer sb = new StringBuffer(); sb.append("AddrType").append("=").append(addressType).append("|"); - AddressType ae = ace.getValue().getAddress().getValue(); + AddressType ae = jaxbValue(ace.getValue().getAddress()); if(ae == null) { IDPPUtils.debug.error("IDPPAddressContainer.createAddressCard:" + "Address Element is null"); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java index fd2c9ca20d..cd0cbc0a95 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPBaseContainer.java @@ -33,6 +33,7 @@ import static org.forgerock.openam.utils.Time.*; import com.sun.identity.shared.datastruct.CollectionHelper; +import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; @@ -421,10 +422,10 @@ protected Map getAnalyzedNameMap(Object obj, Map map) throws IDPPException{ if(obj != null) { if(obj instanceof AnalyzedNameType) { AnalyzedNameType analyzedName = (AnalyzedNameType)obj; - fn = analyzedName.getFN().getValue(); - sn = analyzedName.getSN().getValue(); - mn = analyzedName.getMN().getValue(); - pt = analyzedName.getPersonalTitle().getValue(); + fn = jaxbValue(analyzedName.getFN()); + sn = jaxbValue(analyzedName.getSN()); + mn = jaxbValue(analyzedName.getMN()); + pt = jaxbValue(analyzedName.getPersonalTitle()); } else { throw new IDPPException( IDPPUtils.bundle.getString("invalid Element")); @@ -441,6 +442,18 @@ protected Map getAnalyzedNameMap(Object obj, Map map) throws IDPPException{ getAttributeMap(IDPPConstants.PT_ELEMENT, pt, map); return map; } + + /** + * Returns the value wrapped by a JAXB element, or null if the + * element itself is absent. Under JAXB 3 optional global elements are + * exposed as possibly-null {@link JAXBElement} wrappers, so callers must + * guard against a null wrapper before unwrapping. + * @param element the JAXB element wrapper, may be null + * @return the wrapped value, or null if the wrapper is null + */ + protected static T jaxbValue(JAXBElement element) { + return (element == null) ? null : element.getValue(); + } /** * Gets Attribute Mapper diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java index b0d4026bb2..6f7959a047 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPCommonName.java @@ -264,7 +264,7 @@ private Map getCommonNameMap(Object obj, Map map) if(obj instanceof CommonNameType) { CommonNameType cnType = (CommonNameType)obj; analyzedName = cnType.getAnalyzedName(); - cn = cnType.getCN().getValue(); + cn = jaxbValue(cnType.getCN()); altCNs = cnType.getAltCN(); } else { throw new IDPPException( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java index 6641b155fb..d2be5ff614 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPDemographics.java @@ -276,9 +276,9 @@ private Map getDemographicsMap(Object obj, Map map) if(obj != null) { if(obj instanceof DemographicsType) { DemographicsType demoGraphs = (DemographicsType)obj; - displayLang = demoGraphs.getDisplayLanguage().getValue(); - age = demoGraphs.getAge().getValue(); - birthDay = demoGraphs.getBirthday().getValue(); + displayLang = jaxbValue(demoGraphs.getDisplayLanguage()); + age = jaxbValue(demoGraphs.getAge()); + birthDay = jaxbValue(demoGraphs.getBirthday()); languages = demoGraphs.getLanguage(); timeZone = demoGraphs.getTimeZone(); } else { diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java index 2e7358011b..3499ee0f3f 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPEmploymentIdentity.java @@ -208,8 +208,8 @@ private Map getEmploymentIdentityMap(Object obj, Map map) if(obj != null) { if(obj instanceof EmploymentIdentityType) { EmploymentIdentityType eiType = (EmploymentIdentityType)obj; - jobTitle = eiType.getJobTitle().getValue(); - org = eiType.getO().getValue(); + jobTitle = jaxbValue(eiType.getJobTitle()); + org = jaxbValue(eiType.getO()); altO = eiType.getAltO(); } else { throw new IDPPException( diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java index 8778811418..f0512673a1 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPFacade.java @@ -256,11 +256,11 @@ private Map getFacadeMap(Object obj, Map map) { DSTURI greetMeSound = null; if(obj != null) { FacadeElement fe = (FacadeElement)obj; - mugShot = fe.getValue().getMugShot().getValue(); - webSite = fe.getValue().getWebSite().getValue(); - namePronounced = fe.getValue().getNamePronounced().getValue(); - greetSound = fe.getValue().getGreetSound().getValue(); - greetMeSound = fe.getValue().getGreetMeSound().getValue(); + mugShot = jaxbValue(fe.getValue().getMugShot()); + webSite = jaxbValue(fe.getValue().getWebSite()); + namePronounced = jaxbValue(fe.getValue().getNamePronounced()); + greetSound = jaxbValue(fe.getValue().getGreetSound()); + greetMeSound = jaxbValue(fe.getValue().getGreetMeSound()); } getAttributeMap(IDPPConstants.MUGSHOT_ELEMENT, mugShot, map); getAttributeMap(IDPPConstants.WEBSITE_ELEMENT, webSite, map); diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java index dadcd1b7f5..fa64a37a97 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/container/IDPPLegalIdentity.java @@ -452,10 +452,10 @@ private Map getLegalIdentityMap(Object obj, Map map) analyzedName = lType.getAnalyzedName(); vat = lType.getVAT(); altIDs = lType.getAltID(); - dob = lType.getDOB().getValue(); - mStatus = lType.getMaritalStatus().getValue(); - gender = lType.getGender().getValue(); - lName = lType.getLegalName().getValue(); + dob = jaxbValue(lType.getDOB()); + mStatus = jaxbValue(lType.getMaritalStatus()); + gender = jaxbValue(lType.getGender()); + lName = jaxbValue(lType.getLegalName()); } else { throw new IDPPException( IDPPUtils.bundle.getString("invalid Element")); From f77dbb76bdfd99ad5d7fcde22512d3dfa4fdffc8 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:57:09 +0300 Subject: [PATCH 13/15] Fix NullPointerException on unknown issuer in OAuth2 SAML2 bearer grant after JAXB3 migration getIDPSSODescriptor() can return null for an unknown issuer; reject with InvalidGrantException instead of dereferencing the null wrapper. --- .../openam/oauth2/saml2/core/Saml2GrantTypeHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java b/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java index ad9dae22bd..4163be4cfe 100644 --- a/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java +++ b/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/Saml2GrantTypeHandler.java @@ -179,6 +179,10 @@ private void validateAssertion(Assertion assertion, ClientRegistration clientReg final Set verificationCerts; SAML2MetaManager metaManager = new SAML2MetaManager(); final IDPSSODescriptorElement idpSsoDescriptor = metaManager.getIDPSSODescriptor(realm, idpEntityID); + if (idpSsoDescriptor == null) { + logger.error("Saml2GrantTypeHandler.isValidAssertion(): No IDP descriptor found for issuer {}", idpEntityID); + throw new InvalidGrantException("Unknown assertion issuer"); + } verificationCerts = KeyUtil.getVerificationCerts(idpSsoDescriptor.getValue(), idpEntityID, SAML2Constants.IDP_ROLE); From f168117cc6e38e8cc3a1b7007a05d02b42379d01 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 12:57:09 +0300 Subject: [PATCH 14/15] Fix IDP proxy authn-context matching after JAXB3 migration AttributeValueElement.getValue() returns the scalar content (not a List) for string-valued attributes, so the "instanceof List" guard silently skipped context matching. Normalize scalar and list content to restore the previous getContent() behaviour. --- .../sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java index 3b17958208..03f849d848 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java @@ -366,11 +366,14 @@ private String selectIDPBasedOnLOA(List idpList, String realm, AuthnRequ Iterator avI = av.iterator(); while (avI.hasNext()) { AttributeValueElement ave = avI.next(); - if (ave != null && ave.getValue() instanceof List) { - List contentL = (List)ave.getValue(); + if (ave != null && ave.getValue() != null) { + Object content = ave.getValue(); + List contentL = (content instanceof List) + ? (List) content + : java.util.Collections.singletonList(content); debugMessage(classMethod, "Attribute Value Elements found for idp: " + idp + "-->" + contentL); - if (contentL != null || !contentL.isEmpty()) { + if (!contentL.isEmpty()) { Set idpContextSet = trimmedListToSet(contentL); debugMessage(classMethod, "idpContextSet = " + idpContextSet); idpContextSet.retainAll(authnRequestContextSet); From 07b3fe23b8f15b638bc093d195b570f8c7f72575 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 20 Jun 2026 14:13:46 +0300 Subject: [PATCH 15/15] Remove leftover Git conflict markers in comment headers - RestAuthNameValueOutputCallbackHandler.java: keep correct NameValueOutputCallback Javadoc - ResourceOwnerSessionValidator.java: merge copyright attributions --- .../RestAuthNameValueOutputCallbackHandler.java | 4 ---- .../oauth2/core/ResourceOwnerSessionValidator.java | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameValueOutputCallbackHandler.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameValueOutputCallbackHandler.java index b5cffa02ea..5a71fce1e5 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameValueOutputCallbackHandler.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameValueOutputCallbackHandler.java @@ -28,11 +28,7 @@ import jakarta.servlet.http.HttpServletResponse; /** -<<<<<<< HEAD * Defines methods to convert a NameValueOutputCallback to a JSON representation. -======= - * Defines methods to convert a TextOutputCallback to a JSON representation. ->>>>>>> upstream/master */ public class RestAuthNameValueOutputCallbackHandler extends AbstractRestAuthCallbackHandler { diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerSessionValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerSessionValidator.java index 32bffaceeb..34a74f1a5e 100644 --- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerSessionValidator.java +++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerSessionValidator.java @@ -11,13 +11,9 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * -<<<<<<< HEAD * Copyright 2014-2016 ForgeRock AS. -======= - * Copyright 2014 ForgeRock AS. * Portions Copyrighted 2019 Open Source Solution Technology Corporation ->>>>>>> 675e7a8ddd... Issue #42 acr_values not working if the user is login in more than one chain (#101) -* Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025 3A Systems LLC. */ package org.forgerock.oauth2.core;