From 53906619a3c5d244dd82cd32efbf9848292db32d Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 13 Jul 2026 10:43:58 +0300 Subject: [PATCH 1/2] Enable Javadoc doclint (all,-missing) with failOnWarnings on JDK 11 and JDK 26 - pom: doclint=all,-missing via inherited property; failOnWarnings=true; maven-javadoc-plugin 3.11.2 -> 3.12.0; source 8 -> 11 with --add-exports for the sun.* internal APIs a few legacy classes use (keeps JDK 26 free of [removal] warnings without touching AccessController usages) - Remove per-module javadoc skips so docs build everywhere; keep openam-mcp-server skipped (Java 17 records cannot be processed on the JDK 11 doc baseline) - .gitattributes: check out *.html with LF so JDK 25/26 doclint does not treat CR as part of a multi-line tag name - Fix every doclint error/warning across all modules: authored real @param/@return/ @throws descriptions, HTML/entity/self-closing/{@link} fixes, JAXB schema sanitize --- .gitattributes | 3 + .../context/AMExecutorServiceFactory.java | 5 +- .../context/ConfigurableExecutorService.java | 3 +- .../context/TransactionIdConfiguration.java | 3 +- .../openam/audit/AuditEventPublisher.java | 3 +- .../AMAuditServiceConfiguration.java | 3 +- .../modules/application/Application.java | 10 +- ...thLoginModulePostAuthenticationPlugin.java | 4 +- .../common/mapping/AttributeMapper.java | 3 +- .../modules/fr/oath/OATHPrincipal.java | 9 +- .../modules/fr/oath/TOTPAlgorithm.java | 9 +- .../modules/hotp/HOTPPrincipal.java | 5 +- .../modules/hotp/SMSGateway.java | 3 +- .../modules/jdbc/ClearTextTransform.java | 5 +- .../authentication/modules/jdbc/JDBC.java | 7 +- .../jdbc/JDBCPasswordSyntaxTransform.java | 3 +- .../modules/jdbc/MD5Transform.java | 8 +- .../modules/ldap/LDAPCallbacks.java | 18 +- .../modules/membership/Membership.java | 5 +- .../authentication/modules/msisdn/MSISDN.java | 8 +- .../modules/msisdn/MSISDNValidation.java | 6 +- .../authentication/modules/oath/OATH.java | 11 +- .../modules/oath/OATHPrincipal.java | 9 +- .../modules/oath/TOTPAlgorithm.java | 10 +- .../oauth2/DefaultEmailGatewayImpl.java | 2 +- .../modules/oauth2/EmailGateway.java | 2 +- .../modules/oauth2/OAuth2PostAuthnPlugin.java | 4 +- .../modules/oidc/JwtHandler.java | 17 +- .../PersistentCookieAuthModule.java | 6 +- ...kieAuthModulePostAuthenticationPlugin.java | 6 +- .../modules/radius/RADIUSPrincipal.java | 9 +- .../modules/securid/SecurIDPrincipal.java | 5 +- .../windowsdesktopsso/WindowsDesktopSSO.java | 14 +- .../WindowsDesktopSSOConfig.java | 9 +- .../identity/security/cert/AMCRLStore.java | 29 +- .../identity/security/cert/AMCertPath.java | 8 +- .../identity/security/cert/AMCertStore.java | 57 +-- .../cert/AMLDAPCertStoreParameters.java | 5 +- .../com/sun/identity/cli/AttributeValues.java | 5 +- .../java/com/sun/identity/cli/Debugger.java | 3 +- .../java/com/sun/identity/cli/SubCommand.java | 5 +- .../sun/identity/cli/record/StartRecord.java | 3 +- .../sun/identity/cli/record/StatusRecord.java | 3 +- .../sun/identity/cli/record/StopRecord.java | 3 +- .../sun/identity/cli/rest/RestCommand.java | 27 +- openam-console/pom.xml | 8 - .../agentconfig/AgentProfileViewBean.java | 4 +- .../console/agentconfig/AgentsViewBean.java | 7 +- .../agentconfig/model/AgentsModel.java | 4 +- .../agentconfig/model/AgentsModelImpl.java | 5 +- .../authentication/EditAuthTypeViewBean.java | 4 +- .../identity/console/base/AMViewBeanBase.java | 4 +- .../console/base/ConsoleServletBase.java | 10 +- .../console/base/model/AMFormatUtils.java | 3 +- .../console/base/model/AMModelBase.java | 4 +- .../console/base/model/SubConfigMeta.java | 3 +- .../federation/ImportEntityViewBean.java | 4 +- .../federation/SAMLPropertyXMLBuilder.java | 3 +- .../federation/model/FSAuthDomainsModel.java | 12 +- .../model/FSAuthDomainsModelImpl.java | 8 +- .../federation/model/IDFFModelImpl.java | 8 +- .../console/realm/RMRealmViewBeanBase.java | 2 +- .../console/realm/model/RMRealmModelImpl.java | 6 +- .../console/session/model/SMSessionData.java | 11 +- .../callbackhandlers/JsonCallbackParser.java | 3 +- ...estAuthNameValueOutputCallbackHandler.java | 6 +- .../wrappers/AuthContextLocalWrapper.java | 3 +- .../rest/dashboard/DashboardResource.java | 5 +- .../rest/devices/TwoFADevicesResource.java | 3 +- .../openam/core/rest/docs/api/ApiService.java | 14 +- .../core/rest/record/DebugRecorder.java | 7 +- .../rest/record/DefaultDebugRecorder.java | 4 +- .../openam/core/rest/record/Record.java | 15 +- .../core/rest/record/RecordException.java | 9 +- .../core/rest/record/RecordProperties.java | 33 +- .../openam/core/rest/record/RecordReport.java | 15 +- .../core/rest/record/RecordResource.java | 8 +- .../rest/server/ServerVersionResource.java | 3 +- .../AuthenticationModuleRealmSmsHandler.java | 4 +- .../core/rest/sms/SmsCollectionProvider.java | 7 +- .../rest/sms/SmsConsoleServiceNameFilter.java | 7 +- .../core/rest/sms/SmsSingletonProvider.java | 6 +- .../com/iplanet/am/sdk/AMAttributeSchema.java | 4 +- .../java/com/iplanet/am/sdk/AMCallBack.java | 14 +- .../com/iplanet/am/sdk/AMCommonUtils.java | 5 +- .../java/com/iplanet/am/sdk/AMEntityType.java | 2 +- .../main/java/com/iplanet/am/sdk/AMEvent.java | 2 +- .../java/com/iplanet/am/sdk/AMObjectImpl.java | 9 +- .../com/iplanet/am/sdk/AMOrganization.java | 17 +- .../iplanet/am/sdk/AMOrganizationImpl.java | 5 +- .../am/sdk/AMOrganizationalUnitImpl.java | 5 +- .../iplanet/am/sdk/AMPeopleContainerImpl.java | 5 +- .../com/iplanet/am/sdk/AMStoreConnection.java | 6 +- .../java/com/iplanet/am/sdk/AMTemplate.java | 2 + .../iplanet/am/sdk/common/CacheBlockBase.java | 4 +- .../am/sdk/common/IComplianceServices.java | 3 +- .../am/sdk/common/IDirectoryServices.java | 12 +- .../com/iplanet/am/sdk/common/MiscUtils.java | 5 +- .../iplanet/am/sdk/ldap/ACIEventListener.java | 2 +- .../sdk/ldap/CachedDirectoryServicesImpl.java | 4 +- .../iplanet/am/sdk/ldap/CallBackHelper.java | 5 +- .../com/iplanet/am/sdk/ldap/CommonUtils.java | 3 +- .../am/sdk/ldap/ComplianceServicesImpl.java | 3 +- .../am/sdk/ldap/DCTreeServicesImpl.java | 2 + .../am/sdk/ldap/DirectoryServicesImpl.java | 11 +- .../am/sdk/ldap/EmailNotificationHelper.java | 18 +- .../com/iplanet/am/sdk/ldap/EventManager.java | 2 +- .../sdk/remote/CachedRemoteServicesImpl.java | 4 +- .../iplanet/am/sdk/remote/EventListener.java | 4 +- .../am/sdk/remote/RemoteServicesImpl.java | 10 +- .../main/java/com/iplanet/am/util/Misc.java | 3 +- .../java/com/iplanet/am/util/QCharset.java | 3 +- .../com/iplanet/am/util/SystemProperties.java | 8 +- .../java/com/iplanet/am/util/ThreadPool.java | 5 +- .../session/ClientSdkSessionRequests.java | 3 +- .../com/iplanet/dpro/session/Session.java | 6 +- .../com/iplanet/dpro/session/SessionID.java | 8 +- .../ClientSdkSessionOperationStrategy.java | 3 +- .../strategies/ClientSdkOperations.java | 4 +- .../strategies/LocalOperations.java | 6 +- .../dpro/session/service/InternalSession.java | 10 +- .../session/service/SessionConstraint.java | 3 +- .../dpro/session/service/SessionMaxStats.java | 6 +- .../dpro/session/service/SessionService.java | 29 +- .../service/cluster/ClusterMonitor.java | 3 +- .../service/cluster/ClusterStateService.java | 8 +- .../cluster/MultiServerClusterMonitor.java | 4 +- .../dpro/session/share/SessionEncodeURL.java | 11 +- .../session/share/SessionNotification.java | 7 +- .../dpro/session/share/SessionRequest.java | 4 +- .../session/share/SessionRequestParser.java | 3 +- .../dpro/session/share/SessionResponse.java | 8 +- .../session/utils/SessionInfoFactory.java | 4 +- .../java/com/iplanet/services/cdm/Client.java | 2 +- .../iplanet/services/cdm/ClientsManager.java | 2 +- .../cdm/DefaultClientTypesManager.java | 41 +- .../iplanet/services/cdm/G11NSettings.java | 5 +- .../cdm/clientschema/AMClientCapData.java | 5 +- .../comm/client/PLLNotificationServlet.java | 2 +- .../services/comm/server/PLLAuditor.java | 12 +- .../comm/server/PLLRequestServlet.java | 2 +- .../services/comm/server/RequestHandler.java | 6 +- .../services/comm/share/NotificationSet.java | 7 +- .../services/comm/share/RequestSet.java | 7 +- .../services/comm/share/ResponseSet.java | 7 +- .../iplanet/services/ldap/DSConfigMgr.java | 3 +- .../com/iplanet/services/ldap/ModSet.java | 5 +- .../iplanet/services/ldap/ServerInstance.java | 3 +- .../services/naming/SessionIDCorrector.java | 5 +- .../iplanet/services/naming/WebtopNaming.java | 3 +- .../services/naming/share/NamingRequest.java | 6 +- .../services/naming/share/NamingResponse.java | 6 +- .../java/com/iplanet/services/util/I18n.java | 5 +- .../iplanet/services/util/ParseOutput.java | 2 +- .../com/iplanet/services/util/XMLParser.java | 5 +- .../java/com/iplanet/sso/SSOTokenManager.java | 6 +- .../sso/providers/dpro/SSOPrincipal.java | 5 +- .../sso/providers/dpro/SSOProviderImpl.java | 8 +- .../sso/providers/dpro/SSOTokenIDImpl.java | 3 +- .../com/iplanet/ums/ConfigManagerUMS.java | 25 +- .../main/java/com/iplanet/ums/DataLayer.java | 7 +- .../main/java/com/iplanet/ums/ISearch.java | 11 +- .../java/com/iplanet/ums/Organization.java | 14 +- .../java/com/iplanet/ums/PCMappingTable.java | 7 +- .../java/com/iplanet/ums/PeopleContainer.java | 9 +- .../com/iplanet/ums/PersistentObject.java | 54 +-- .../java/com/iplanet/ums/SchemaManager.java | 2 +- .../java/com/iplanet/ums/SearchTemplate.java | 4 +- .../java/com/iplanet/ums/StaticGroup.java | 43 +-- .../main/java/com/iplanet/ums/Template.java | 2 +- .../java/com/iplanet/ums/TemplateManager.java | 2 +- .../java/com/iplanet/ums/UMSException.java | 7 +- .../main/java/com/iplanet/ums/UMSObject.java | 2 +- .../ums/dctree/DomainComponentTree.java | 3 +- .../identity/authentication/AuthContext.java | 4 +- .../authentication/UI/LoginLogoutMapping.java | 14 +- .../AbstractAuthenticationEventAuditor.java | 7 +- .../AuthenticationProcessEventAuditor.java | 4 +- .../client/AuthClientUtils.java | 6 +- .../config/AMAuthConfigUtils.java | 19 +- .../config/AMAuthLevelManager.java | 27 +- .../config/AMAuthenticationSchema.java | 3 +- .../config/AMSDKEventListener.java | 3 +- .../config/AuthConfigurationEntry.java | 3 +- .../authentication/internal/AuthContext.java | 15 +- .../internal/server/AuthSPrincipal.java | 7 +- .../authentication/jaas/LoginContext.java | 17 +- .../authentication/server/AuthXMLRequest.java | 6 +- .../authentication/service/AuthD.java | 8 +- .../authentication/service/AuthLevel.java | 3 +- .../service/AuthThreadManager.java | 3 +- .../authentication/service/AuthUtils.java | 6 +- .../service/CompositeAdvices.java | 3 +- .../authentication/service/LoginState.java | 30 +- .../service/PagePropertiesCallback.java | 15 +- .../service/StreamSubstituter.java | 5 +- .../authentication/share/AuthXMLUtils.java | 4 +- .../authentication/spi/AMAuthCallBack.java | 2 +- .../authentication/spi/AMLoginModule.java | 11 +- .../spi/AMPostAuthProcessInterface.java | 6 +- .../spi/AuthLoginException.java | 5 +- .../authentication/spi/HttpCallback.java | 8 +- .../spi/SetNextModuleException.java | 3 +- .../authentication/util/AMAuthUtils.java | 3 +- .../authentication/util/ISValidation.java | 5 +- .../AMUserPasswordValidationPlugin.java | 5 +- .../sun/identity/common/ISLocaleContext.java | 5 +- .../sun/identity/common/ISResourceBundle.java | 3 +- .../sun/identity/common/L10NMessageImpl.java | 3 +- .../sun/identity/common/ResourceLookup.java | 12 +- .../configuration/AgentConfiguration.java | 2 +- .../configuration/ListValueValidator.java | 299 +++++++------- .../configuration/MapValueValidator.java | 7 +- .../configuration/ServerConfiguration.java | 2 +- .../java/com/sun/identity/config/Options.java | 3 +- .../com/sun/identity/config/wizard/Step3.java | 2 +- .../coretoken/spi/OpenSSOCoreTokenStore.java | 36 +- .../delegation/DelegationManager.java | 3 +- .../identity/delegation/DelegationUtils.java | 3 +- .../plugins/DelegationPolicyImpl.java | 5 - .../entitlement/ConditionDecision.java | 9 +- .../sun/identity/entitlement/Entitlement.java | 3 +- .../entitlement/EntitlementCombiner.java | 5 +- .../entitlement/EntitlementSubject.java | 13 +- .../sun/identity/entitlement/OrCondition.java | 3 +- .../entitlement/ReferralPrivilege.java | 3 +- .../entitlement/ResourceSearchIndexes.java | 3 +- .../SubjectAttributesCollector.java | 5 +- .../entitlement/SubjectAttributesManager.java | 11 +- .../sun/identity/entitlement/ThreadPool.java | 3 +- .../interfaces/IDebugProvider.java | 2 +- .../identity/entitlement/opensso/Cache.java | 21 +- .../opensso/PolicyResponseProvider.java | 5 +- .../entitlement/opensso/PrivilegeUtils.java | 3 +- .../com/sun/identity/entity/EntityObject.java | 5 +- .../sun/identity/entity/EntityObjectIF.java | 3 +- .../sun/identity/entity/EntityObjectImpl.java | 9 +- .../java/com/sun/identity/idm/AMIdentity.java | 9 +- .../identity/idm/AMIdentityRepository.java | 3 +- .../java/com/sun/identity/idm/IdRepo.java | 8 +- .../com/sun/identity/idm/IdRepoListener.java | 3 +- .../java/com/sun/identity/idm/IdUtils.java | 5 +- .../plugins/database/JdbcSimpleUserDao.java | 5 +- .../idm/remote/IdRemoteEventListener.java | 4 +- .../idm/server/IdRepoJAXRPCObjectImpl.java | 3 +- .../idsvcs/opensso/IdentityServicesImpl.java | 5 +- .../com/sun/identity/jaxrpc/SOAPClient.java | 6 +- .../com/sun/identity/log/LogConstants.java | 3 +- .../java/com/sun/identity/log/LogManager.java | 5 +- .../sun/identity/log/cli/ISArchiveVerify.java | 3 +- .../identity/log/handlers/DBFormatter.java | 3 +- .../identity/log/handlers/ELFFormatter.java | 12 +- .../identity/log/handlers/FileHandler.java | 16 +- .../log/handlers/RemoteFormatter.java | 3 + .../log/handlers/SecureELFFormatter.java | 7 +- .../log/handlers/SecureFileHandler.java | 17 +- .../identity/log/s1is/LogConfigReader.java | 9 +- .../sun/identity/log/service/LogService.java | 10 +- .../com/sun/identity/monitoring/Agent.java | 5 +- .../identity/monitoring/MonitoringUtil.java | 3 +- .../identity/password/ui/PWResetServlet.java | 12 +- .../password/ui/model/PWResetModel.java | 2 +- .../sun/identity/policy/ActionDecision.java | 5 +- .../com/sun/identity/policy/Conditions.java | 3 +- .../java/com/sun/identity/policy/Policy.java | 16 +- .../com/sun/identity/policy/PolicyCache.java | 3 +- .../com/sun/identity/policy/PolicyConfig.java | 5 +- .../sun/identity/policy/PolicyDecision.java | 11 +- .../sun/identity/policy/PolicyEvaluator.java | 3 +- .../identity/policy/PolicyLockFactory.java | 3 +- .../sun/identity/policy/PolicyManager.java | 5 +- .../policy/PolicySSOTokenListener.java | 3 +- .../com/sun/identity/policy/PolicyUtils.java | 6 +- .../com/sun/identity/policy/Referrals.java | 9 +- .../com/sun/identity/policy/Subjects.java | 11 +- .../policy/client/ResultsCacheUtil.java | 5 +- .../identity/policy/interfaces/Condition.java | 7 +- .../identity/policy/interfaces/Referral.java | 17 +- .../policy/interfaces/ResponseProvider.java | 7 +- .../identity/policy/interfaces/Subject.java | 5 +- .../policy/interfaces/package-info.java | 3 +- .../identity/policy/jaas/ISPermission.java | 13 +- .../policy/jaas/ISPermissionCollection.java | 7 +- .../AMIdentityMembershipCondition.java | 11 +- .../policy/plugins/AMIdentitySubject.java | 13 +- .../policy/plugins/AuthLevelCondition.java | 5 +- .../policy/plugins/AuthRoleCondition.java | 5 +- .../policy/plugins/AuthSchemeCondition.java | 11 +- .../plugins/AuthenticateToRealmCondition.java | 3 +- .../AuthenticateToServiceCondition.java | 3 +- .../AuthenticatedSharedAgentsCondition.java | 3 +- .../policy/plugins/AuthenticatedUsers.java | 3 +- .../identity/policy/plugins/DSAMERole.java | 5 +- .../policy/plugins/HttpURLResourceName.java | 3 +- .../plugins/IDRepoResponseProvider.java | 5 +- .../identity/policy/plugins/IPCondition.java | 14 +- .../policy/plugins/LDAPFilterCondition.java | 5 +- .../identity/policy/plugins/LDAPGroups.java | 3 +- .../identity/policy/plugins/LDAPRoles.java | 7 +- .../policy/plugins/LEAuthLevelCondition.java | 7 +- .../identity/policy/plugins/OrgReferral.java | 13 +- .../policy/plugins/PeerOrgReferral.java | 7 +- .../plugins/ResourceEnvIPCondition.java | 5 +- .../policy/plugins/SessionCondition.java | 5 +- .../plugins/SessionPropertyCondition.java | 5 +- .../policy/plugins/SimpleTimeCondition.java | 7 +- .../policy/plugins/SubOrgReferral.java | 5 +- .../plugins/UserSelfCheckCondition.java | 3 +- .../remote/AdvicesHandleableByAMRequest.java | 7 +- .../remote/AdvicesHandleableByAMResponse.java | 5 +- .../remote/PolicyChangeNotification.java | 9 +- .../policy/remote/PolicyListenerRequest.java | 8 +- .../policy/remote/PolicyNotification.java | 7 +- .../identity/policy/remote/PolicyRequest.java | 7 +- .../policy/remote/PolicyRequestHandler.java | 8 +- .../policy/remote/PolicyResponse.java | 7 +- .../identity/policy/remote/PolicyService.java | 6 +- .../policy/remote/RemoveListenerRequest.java | 9 +- .../policy/remote/ResourceResultRequest.java | 7 +- .../policy/util/AuthServiceConfigInfo.java | 3 +- .../sun/identity/protocol/https/Handler.java | 5 +- .../identity/security/AdminTokenAction.java | 2 +- .../identity/session/util/SessionUtils.java | 10 +- .../sun/identity/setup/EmbeddedOpenDS.java | 16 +- .../sun/identity/setup/SetupConstants.java | 2 +- .../com/sun/identity/sm/CachedSMSEntry.java | 3 +- .../com/sun/identity/sm/CachedSubEntries.java | 49 +-- .../sm/OrganizationConfigManager.java | 6 +- .../com/sun/identity/sm/PluginConfig.java | 13 +- .../identity/sm/SMSEventListenerManager.java | 5 +- .../com/sun/identity/sm/SMSException.java | 2 +- .../identity/sm/SMSNotificationManager.java | 3 +- .../identity/sm/SMSPropertiesObserver.java | 3 +- .../java/com/sun/identity/sm/SMSSchema.java | 13 +- .../java/com/sun/identity/sm/SMSUtils.java | 3 +- .../sm/ServiceAttributeValidator.java | 2 +- .../com/sun/identity/sm/ServiceManager.java | 3 +- .../sun/identity/sm/ServiceSchemaManager.java | 5 +- .../flatfile/SMSEnhancedFlatFileObject.java | 3 +- .../sm/flatfile/SMSFlatFileObject.java | 5 +- .../sm/flatfile/SMSFlatFileTreeNode.java | 3 +- .../sm/jaxrpc/SMSJAXRPCObjectImpl.java | 5 +- .../sun/identity/sm/ldap/CTSDataLayer.java | 9 +- .../identity/sm/ldap/LDAPEventManager.java | 5 +- .../sm/ldap/SearchResultIterator.java | 3 +- .../com/sun/identity/sm/ldap/Statistics.java | 9 +- .../AMSessionRepositoryDeferredOperation.java | 5 +- .../openam/auditors/ConfigAuditor.java | 7 +- .../openam/auditors/RepoAuditor.java | 8 +- .../callbacks/PollingWaitCallback.java | 3 +- .../service/AuthSessionFactory.java | 5 +- .../service/protocol/RemoteCookie.java | 4 +- .../service/protocol/RemoteSession.java | 4 +- .../blacklist/BloomFilterBlacklist.java | 3 +- .../openam/blacklist/CTSBlacklist.java | 6 +- .../org/forgerock/openam/core/DNWrapper.java | 3 +- .../openam/core/realms/RealmLookup.java | 3 +- .../openam/cts/adapters/OAuthAdapter.java | 6 +- .../cts/api/fields/CoreTokenFieldTypes.java | 5 +- .../cts/impl/SAML2CTSPersistentStore.java | 3 +- .../cts/impl/queue/AsyncResultHandler.java | 5 +- .../queue/DeleteOnQueryResultHandler.java | 4 +- .../CTSConnectionMonitoringStore.java | 3 +- .../CTSOperationsMonitoringStore.java | 25 +- .../impl/operations/OperationMonitor.java | 3 +- .../impl/operations/OperationStore.java | 5 +- .../impl/operations/TokenOperationsStore.java | 24 +- .../CtsPersistenceOperationsDelegate.java | 6 +- .../queue/DefaultMonitoringResultHandler.java | 3 +- .../queue/TokenMonitoringResultHandler.java | 3 +- .../monitoring/impl/reaper/ReaperMonitor.java | 5 +- ...etupInternalNotificationSubscriptions.java | 4 +- .../monitoring/EvaluationMonitoringStore.java | 4 +- .../entitlement/utils/EntitlementUtils.java | 3 +- .../forgerock/openam/ldap/LDAPAuthUtils.java | 14 +- .../cts/CtsCRUDOperationsEntryImpl.java | 3 +- ...tsCRUDOperationsPerTokenTypeEntryImpl.java | 3 +- .../openam/network/ipv4/IPv4Condition.java | 5 +- .../openam/network/ipv6/IPv6Condition.java | 5 +- .../openam/oauth2/OAuth2Constants.java | 9 +- .../services/cdm/BasicClientTypesManager.java | 5 +- .../openam/session/SessionCuller.java | 8 +- .../openam/session/SessionPollerPool.java | 4 +- .../session/SessionServiceURLService.java | 8 +- .../forgerock/openam/session/SessionURL.java | 15 +- .../SessionChangeAuthorizer.java | 6 +- .../openam/session/model/AMRootEntity.java | 3 +- .../openam/session/model/DBStatistics.java | 5 +- .../ServicesClusterMonitorHandler.java | 4 +- .../session/service/SessionAccessManager.java | 4 +- .../service/access/SessionQueryManager.java | 8 +- .../persistence/InternalSessionStore.java | 2 +- .../persistence/InternalSessionStoreStep.java | 2 +- .../persistence/SessionPersistenceStore.java | 4 +- .../openam/sm/config/ConfigTransformer.java | 3 +- .../sm/config/ConsoleConfigBuilder.java | 3 +- .../sm/config/DefaultConfigTransformer.java | 4 +- .../sm/datalayer/api/ConnectionFactory.java | 3 +- .../CTSDJLDAPv3PersistentSearchBuilder.java | 3 +- .../impl/tasks/PartialQueryTask.java | 3 +- .../LdapConnectionFactoryProvider.java | 8 +- .../providers/stateless/JwtSessionMapper.java | 3 +- .../stateless/StatelessSessionManager.java | 4 +- .../openam/utils/RealmNormaliser.java | 4 +- .../openam/utils/RecoveryCodeGenerator.java | 22 +- .../openam/click/ActionEventDispatcher.java | 13 +- .../openam/click/ActionListener.java | 9 +- .../openam/click/ActionResult.java | 37 +- .../openam/click/Behavior.java | 11 +- .../openam/click/ClickRequestWrapper.java | 15 +- .../openam/click/ClickServlet.java | 129 ++++--- .../openam/click/Context.java | 82 ++-- .../openam/click/Control.java | 125 +++--- .../openam/click/ControlRegistry.java | 15 +- .../openam/click/Page.java | 246 ++++++------ .../openam/click/PageInterceptor.java | 33 +- .../openam/click/ajax/AjaxBehavior.java | 17 +- .../click/control/AbstractContainer.java | 35 +- .../openam/click/control/AbstractControl.java | 92 ++--- .../openam/click/control/AbstractLink.java | 89 ++--- .../openam/click/control/ActionLink.java | 44 ++- .../openam/click/control/Button.java | 22 +- .../openam/click/control/Column.java | 162 ++++---- .../openam/click/control/Container.java | 7 +- .../openam/click/control/Decorator.java | 3 +- .../openam/click/control/Field.java | 161 ++++---- .../openam/click/control/FileField.java | 28 +- .../openam/click/control/Form.java | 365 +++++++++--------- .../openam/click/control/HiddenField.java | 11 +- .../openam/click/control/Label.java | 11 +- .../openam/click/control/Radio.java | 30 +- .../openam/click/control/RadioGroup.java | 33 +- .../openam/click/control/Renderable.java | 3 +- .../openam/click/control/Table.java | 216 ++++++----- .../openam/click/control/TablePaginator.java | 8 +- .../openam/click/control/TextArea.java | 22 +- .../openam/click/control/TextField.java | 34 +- .../openam/click/element/CssImport.java | 65 ++-- .../openam/click/element/CssStyle.java | 39 +- .../openam/click/element/Element.java | 13 +- .../openam/click/element/JsImport.java | 65 ++-- .../openam/click/element/JsScript.java | 59 +-- .../openam/click/element/ResourceElement.java | 69 ++-- .../click/service/ClickResourceService.java | 13 +- .../openam/click/service/ConfigService.java | 53 +-- .../click/service/ConsoleLogService.java | 9 +- .../click/service/FileUploadService.java | 5 +- .../openam/click/service/LogService.java | 11 +- .../click/service/MessagesMapService.java | 13 +- .../openam/click/service/ResourceService.java | 9 +- .../openam/click/service/TemplateService.java | 11 +- .../service/VelocityTemplateService.java | 83 ++-- .../click/service/XmlConfigService.java | 91 ++--- .../openam/click/util/ClickUtils.java | 281 +++++++------- .../openam/click/util/ContainerUtils.java | 103 ++--- .../openam/click/util/ErrorPage.java | 21 +- .../openam/click/util/HtmlStringBuffer.java | 79 ++-- .../openam/click/util/PageImports.java | 13 +- .../openam/click/util/SessionMap.java | 9 +- .../coretoken/spi/CoreTokenStore.java | 4 +- .../openam/idrepo/ldap/DJLDAPv3Repo.java | 2 +- .../openam-doc-log-message-ref/pom.xml | 8 - .../openam/docs/ssoadm/SsoadmAP.java | 11 +- .../entitlement/AnonymousESubject.java | 4 +- .../entitlement/AttributeSubject.java | 4 +- .../entitlement/ExactMatchResourceName.java | 3 +- .../identity/entitlement/GroupSubject.java | 4 +- .../sun/identity/entitlement/UserSubject.java | 4 +- .../opensso/OpenSSOGroupSubject.java | 4 +- .../OpenSSOSubjectAttributesCollector.java | 3 +- .../xacml3/SearchFilterFactory.java | 5 +- .../xacml3/XACMLPrivilegeUtils.java | 3 +- .../entitlement/xacml3/XACMLReaderWriter.java | 7 +- .../xacml3/validation/RealmValidator.java | 5 +- .../environment/AuthLevelCondition.java | 6 +- .../environment/ConditionConstants.java | 16 +- .../environment/SimpleTimeCondition.java | 7 +- .../configuration/SmsQueryFilterVisitor.java | 3 +- .../constraints/ConstraintValidator.java | 3 +- .../entitlement/indextree/TreeSaveIndex.java | 3 +- .../indextree/TreeSearchIndexDelegate.java | 4 +- .../indextree/events/IndexChangeObserver.java | 3 +- .../entitlement/rest/ApplicationV1Filter.java | 4 +- .../rest/ApplicationsResource.java | 4 +- .../rest/ConditionTypesResource.java | 6 +- .../rest/DecisionCombinersResource.java | 6 +- .../entitlement/rest/PolicyResource.java | 4 +- .../rest/SubjectTypesResource.java | 6 +- .../rest/wrappers/JsonResourceType.java | 3 +- .../rest/wrappers/ReferralWrapper.java | 3 +- .../utils/indextree/SimpleReferenceTree.java | 11 +- .../utils/indextree/treenodes/RootNode.java | 3 +- .../utils/indextree/treenodes/TreeNode.java | 7 +- .../forgerock/openam/xacml/v3/ImportStep.java | 3 +- .../openam/xacml/v3/model/CommonType.java | 2 +- .../openam/xacml/v3/model/ContentType.java | 9 +- .../v3/resources/XACML3HomeResource.java | 36 +- .../xacml/v3/resources/XACML3Resource.java | 3 +- .../clientsdk/idrepo/IdRepoSample.java | 2 +- .../idrepo/IdRepoSampleCreateId.java | 2 +- .../idrepo/IdRepoSampleDeleteId.java | 2 +- .../idrepo/IdRepoSampleGetSpecialIds.java | 2 +- .../idrepo/IdRepoSampleSearchIds.java | 2 +- .../idrepo/IdRepoSampleSubRealm.java | 2 +- .../clientsdk/idrepo/IdRepoSampleUtils.java | 2 +- .../clientsdk/logging/LogSampleUtils.java | 2 +- .../federation/FederationPrincipal.java | 9 +- .../modules/sae/SAEPrincipal.java | 9 +- .../disco/plugins/DefaultDiscoAuthorizer.java | 4 +- .../ws/idpp/plugin/IDPPAuthorizer.java | 4 +- .../saml/plugins/DefaultActionMapper.java | 3 +- .../plugins/DefaultSiteAttributeMapper.java | 4 +- .../plugins/NameIDPartnerAccountMapper.java | 2 +- .../identity/wss/policy/WSSPolicyManager.java | 17 +- .../sun/identity/wss/provider/STSConfig.java | 3 +- .../wss/provider/TrustAuthorityConfig.java | 4 +- .../wss/security/BinarySecurityToken.java | 4 +- .../wss/security/FAMSecurityToken.java | 7 +- .../wss/security/KerberosConfiguration.java | 11 +- .../wss/security/SecurityMechanism.java | 5 +- .../identity/wss/security/UserNameToken.java | 3 +- .../sun/identity/wss/security/WSSUtils.java | 4 +- .../security/handler/SOAPRequestHandler.java | 7 +- .../handler/SOAPRequestHandlerInterface.java | 7 +- .../security/handler/SecureSOAPMessage.java | 6 +- .../sun/identity/wss/sts/ClientUserToken.java | 14 +- .../sun/identity/wss/trust/BinarySecret.java | 7 +- .../com/sun/identity/wss/trust/ClaimType.java | 4 +- .../wss/trust/RequestSecurityToken.java | 7 +- .../trust/RequestSecurityTokenResponse.java | 4 +- ...equestSecurityTokenResponseCollection.java | 11 +- .../wss/trust/RequestedProofToken.java | 7 +- .../identity/wss/trust/WSTrustFactory.java | 12 +- .../wss/trust/wst10/BinarySecret_Impl.java | 7 +- .../wss/trust/wst13/BinarySecret_Impl.java | 7 +- .../wss/xmlsig/WSSSignatureProvider.java | 18 +- .../identity/cot/CircleOfTrustManager.java | 3 +- .../accountmgmt/FSAccountManager.java | 23 +- .../federation/accountmgmt/package-info.java | 3 +- .../federation/common/FSException.java | 15 +- .../common/FSRedirectException.java | 11 +- .../identity/federation/common/FSUtils.java | 6 +- .../federation/common/package-info.java | 3 +- .../federation/message/FSAssertion.java | 5 +- .../message/FSAssertionArtifact.java | 5 +- .../message/FSAuthenticationStatement.java | 3 +- .../federation/message/FSAuthnRequest.java | 18 +- .../message/FSAuthnRequestEnvelope.java | 7 +- .../federation/message/FSAuthnResponse.java | 3 +- .../message/FSAuthnResponseEnvelope.java | 5 +- .../FSFederationTerminationNotification.java | 6 +- .../federation/message/FSLogoutResponse.java | 12 +- .../FSNameIdentifierMappingRequest.java | 7 +- .../message/FSNameRegistrationRequest.java | 6 +- .../message/FSNameRegistrationResponse.java | 6 +- .../federation/message/FSRequest.java | 17 +- .../federation/message/FSResponse.java | 3 +- .../federation/message/FSScoping.java | 3 +- .../common/EncryptableNameIdentifier.java | 9 +- .../federation/message/common/Extension.java | 4 +- .../federation/message/common/IDPEntry.java | 7 +- .../common/IDPProvidedNameIdentifier.java | 9 +- .../common/OldProvidedNameIdentifier.java | 13 +- .../message/common/RequestAuthnContext.java | 6 +- .../common/SPProvidedNameIdentifier.java | 7 +- .../message/common/package-info.java | 3 +- .../federation/message/package-info.java | 3 +- .../federation/meta/IDFFCOTUtils.java | 5 +- .../federation/meta/IDFFMetaUtils.java | 5 +- .../federation/plugins/package-info.java | 3 +- .../services/FSAssertionManager.java | 7 +- .../services/FSAssertionManagerClient.java | 5 +- .../services/FSAssertionManagerIF.java | 12 +- .../services/FSAssertionManagerImpl.java | 5 +- .../services/FSAttributeMapper.java | 2 +- .../services/FSAttributePlugin.java | 4 +- .../services/FSDefaultAttributePlugin.java | 5 +- .../FSDefaultRealmAttributePlugin.java | 3 +- .../services/FSLoginHelperException.java | 3 +- .../services/FSRealmAttributeMapper.java | 2 +- .../services/FSRealmAttributePlugin.java | 4 +- .../federation/services/FSSOAPReceiver.java | 10 +- .../federation/services/FSSOAPService.java | 8 +- .../FSSPAuthenticationContextInfo.java | 5 +- .../fednsso/FSAssertionConsumerService.java | 8 +- .../services/fednsso/FSIDPFinderService.java | 8 +- .../fednsso/FSIntersiteTransferService.java | 8 +- .../services/fednsso/FSSSOAndFedService.java | 8 +- .../logout/FSProcessLogoutServlet.java | 5 +- .../logout/FSReturnLogoutServlet.java | 5 +- .../logout/FSReturnSessionManager.java | 3 +- .../logout/FSSingleLogoutHandler.java | 5 +- .../namemapping/FSNameMappingHandler.java | 8 +- .../federation/services/package-info.java | 3 +- .../FSNameRegistrationHandler.java | 5 +- .../FSRegistrationInitiationServlet.java | 5 +- .../FSRegistrationRequestServlet.java | 5 +- .../FSRegistrationReturnServlet.java | 5 +- .../FSTerminationInitiationServlet.java | 5 +- .../FSTerminationRequestServlet.java | 5 +- .../services/util/FSServiceUtils.java | 5 +- .../ws/authnsvc/mechanism/package-info.java | 3 +- .../liberty/ws/authnsvc/package-info.java | 3 +- .../ws/authnsvc/protocol/package-info.java | 3 +- .../identity/liberty/ws/common/Status.java | 25 +- .../ws/common/wsse/BinarySecurityToken.java | 48 +-- .../liberty/ws/disco/Description.java | 32 +- .../identity/liberty/ws/disco/Directive.java | 15 +- .../liberty/ws/disco/EncryptedResourceID.java | 24 +- .../liberty/ws/disco/InsertEntry.java | 24 +- .../sun/identity/liberty/ws/disco/Modify.java | 27 +- .../liberty/ws/disco/ModifyResponse.java | 32 +- .../sun/identity/liberty/ws/disco/Query.java | 47 +-- .../liberty/ws/disco/QueryResponse.java | 45 +-- .../liberty/ws/disco/RemoveEntry.java | 18 +- .../liberty/ws/disco/RequestedService.java | 25 +- .../identity/liberty/ws/disco/ResourceID.java | 17 +- .../liberty/ws/disco/ResourceOffering.java | 78 ++-- .../liberty/ws/disco/ServiceInstance.java | 26 +- .../liberty/ws/disco/common/DiscoUtils.java | 8 +- .../plugins/IDFFNameIdentifierMapper.java | 2 +- .../disco/plugins/NameIdentifierMapper.java | 2 +- .../identity/liberty/ws/dst/DSTClient.java | 6 +- .../sun/identity/liberty/ws/dst/DSTData.java | 25 +- .../liberty/ws/dst/DSTModification.java | 48 +-- .../identity/liberty/ws/dst/DSTModify.java | 75 ++-- .../liberty/ws/dst/DSTModifyResponse.java | 29 +- .../sun/identity/liberty/ws/dst/DSTQuery.java | 58 +-- .../identity/liberty/ws/dst/DSTQueryItem.java | 33 +- .../liberty/ws/dst/DSTQueryResponse.java | 55 +-- .../ws/dst/service/DSTRequestHandler.java | 3 +- .../liberty/ws/idpp/PPInteractionHelper.java | 5 +- .../liberty/ws/idpp/PPRequestHandler.java | 16 +- .../liberty/ws/idpp/PersonalProfile.java | 6 +- .../ws/idpp/container/IDPPAddressCard.java | 7 +- .../ws/idpp/container/IDPPBaseContainer.java | 5 +- .../ws/idpp/container/IDPPCommonName.java | 7 +- .../ws/idpp/container/IDPPDemographics.java | 9 +- .../idpp/container/IDPPEmergencyContact.java | 5 +- .../container/IDPPEmploymentIdentity.java | 7 +- .../ws/idpp/container/IDPPEncryptKey.java | 5 +- .../container/IDPPExtensionContainer.java | 7 +- .../liberty/ws/idpp/container/IDPPFacade.java | 5 +- .../ws/idpp/container/IDPPInformalName.java | 5 +- .../ws/idpp/container/IDPPLegalIdentity.java | 11 +- .../ws/idpp/container/IDPPMsgContact.java | 7 +- .../ws/idpp/container/IDPPSignKey.java | 5 +- .../liberty/ws/idpp/plugin/IDPPContainer.java | 5 +- .../liberty/ws/idpp/plugin/IDPPExtension.java | 3 +- .../ws/interaction/InteractionManager.java | 6 +- .../liberty/ws/interfaces/Authorizer.java | 3 +- .../identity/liberty/ws/paos/PAOSRequest.java | 3 +- .../liberty/ws/paos/PAOSResponse.java | 3 +- .../ws/security/LibSecurityTokenProvider.java | 2 +- .../ws/security/SecurityAssertion.java | 5 +- .../ws/security/SecurityTokenManagerImpl.java | 3 +- .../ws/security/SecurityTokenProvider.java | 11 +- .../liberty/ws/security/SessionSubject.java | 3 +- .../liberty/ws/soapbinding/ConsentHeader.java | 5 +- .../liberty/ws/soapbinding/SOAPReceiver.java | 3 +- .../liberty/ws/util/ProviderUtil.java | 3 +- .../multiprotocol/MultiProtocolUtils.java | 4 +- .../plugin/datastore/DataStoreProvider.java | 3 +- .../plugin/monitoring/MonitorManager.java | 2 +- .../plugin/session/SessionProvider.java | 4 +- .../com/sun/identity/sae/api/SecureAttrs.java | 15 +- .../com/sun/identity/saml/SAMLClient.java | 6 +- .../identity/saml/assertion/Attribute.java | 7 +- .../sun/identity/saml/assertion/Evidence.java | 3 +- .../identity/saml/assertion/EvidenceBase.java | 3 +- .../saml/assertion/SubjectConfirmation.java | 3 +- .../saml/assertion/SubjectLocality.java | 3 +- .../identity/saml/common/SAMLConstants.java | 22 +- .../saml/common/SAMLServiceManager.java | 5 +- .../sun/identity/saml/common/SAMLUtils.java | 8 +- .../saml/plugins/DefaultAttributeMapper.java | 4 +- .../saml/plugins/PartnerAccountMapper.java | 3 +- .../saml/protocol/AttributeQuery.java | 9 +- .../saml/protocol/AuthenticationQuery.java | 7 +- .../sun/identity/saml/protocol/Request.java | 3 +- .../sun/identity/saml/protocol/Status.java | 5 +- .../saml/servlet/SAMLAwareServlet.java | 14 +- .../saml/servlet/SAMLPOSTProfileServlet.java | 6 +- .../saml/servlet/SAMLSOAPReceiver.java | 3 +- .../saml/xmlsig/AMSignatureProvider.java | 6 +- .../identity/saml/xmlsig/JKSKeyProvider.java | 2 +- .../identity/saml/xmlsig/OfflineResolver.java | 11 +- .../saml/xmlsig/SignatureProvider.java | 5 +- .../saml/xmlsig/XMLSignatureManager.java | 6 +- .../sun/identity/saml2/assertion/Action.java | 16 +- .../saml2/assertion/AssertionIDRef.java | 4 +- .../identity/saml2/assertion/Attribute.java | 26 +- .../saml2/assertion/AttributeStatement.java | 22 +- .../saml2/assertion/AuthnContext.java | 46 +-- .../saml2/assertion/AuthnStatement.java | 28 +- .../assertion/AuthzDecisionStatement.java | 26 +- .../saml2/assertion/EncryptedAttribute.java | 4 +- .../identity/saml2/assertion/Evidence.java | 26 +- .../identity/saml2/assertion/Statement.java | 14 +- .../saml2/assertion/SubjectLocality.java | 18 +- .../saml2/assertion/impl/ActionImpl.java | 16 +- .../saml2/assertion/impl/AdviceImpl.java | 5 +- .../assertion/impl/AssertionIDRefImpl.java | 4 +- .../saml2/assertion/impl/AttributeImpl.java | 26 +- .../impl/AttributeStatementImpl.java | 22 +- .../assertion/impl/AuthnContextImpl.java | 56 +-- .../assertion/impl/AuthnStatementImpl.java | 28 +- .../impl/EncryptedAttributeImpl.java | 4 +- .../assertion/impl/EncryptedElementImpl.java | 22 +- .../saml2/assertion/impl/EncryptedIDImpl.java | 4 +- .../impl/KeyInfoConfirmationDataImpl.java | 3 +- .../assertion/impl/SubjectLocalityImpl.java | 18 +- .../identity/saml2/common/AccountUtils.java | 3 +- .../sun/identity/saml2/common/NameIDInfo.java | 27 +- .../identity/saml2/common/NameIDInfoKey.java | 12 +- .../sun/identity/saml2/common/SAML2Utils.java | 14 +- .../saml2/common/SOAPCommunicator.java | 8 +- .../saml2/ecp/impl/ECPRelayStateImpl.java | 3 +- .../saml2/ecp/impl/ECPRequestImpl.java | 3 +- .../saml2/ecp/impl/ECPResponseImpl.java | 3 +- .../identity/saml2/meta/SAML2MetaManager.java | 3 +- .../saml2/meta/SAML2MetaSecurityUtils.java | 45 ++- .../identity/saml2/meta/SAML2MetaUtils.java | 5 +- .../saml2/plugins/DefaultAttributeMapper.java | 3 +- .../saml2/plugins/IDPAccountMapper.java | 3 +- .../saml2/plugins/IDPAuthnContextMapper.java | 3 +- .../saml2/profile/AssertionIDRequestUtil.java | 4 +- .../saml2/profile/DiscoveryBootstrap.java | 3 +- .../identity/saml2/profile/IDPSSOUtil.java | 2 +- .../saml2/profile/IDPSingleLogout.java | 4 +- .../identity/saml2/profile/NameIDMapping.java | 3 +- .../identity/saml2/profile/SPACSUtils.java | 7 +- .../identity/saml2/profile/SPSSOFederate.java | 20 +- .../sun/identity/saml2/protocol/Artifact.java | 4 +- .../saml2/protocol/ArtifactResolve.java | 20 +- .../saml2/protocol/ArtifactResponse.java | 20 +- .../saml2/protocol/AssertionIDRequest.java | 20 +- .../saml2/protocol/AttributeQuery.java | 20 +- .../identity/saml2/protocol/AuthnQuery.java | 22 +- .../identity/saml2/protocol/AuthnRequest.java | 5 +- .../saml2/protocol/LogoutRequest.java | 35 +- .../saml2/protocol/LogoutResponse.java | 3 +- .../saml2/protocol/ManageNameIDRequest.java | 36 +- .../saml2/protocol/ManageNameIDResponse.java | 4 +- .../saml2/protocol/NameIDMappingRequest.java | 36 +- .../saml2/protocol/NameIDMappingResponse.java | 22 +- .../saml2/protocol/NewEncryptedID.java | 4 +- .../saml2/protocol/ProtocolFactory.java | 49 +-- .../saml2/protocol/RequestedAuthnContext.java | 4 +- .../identity/saml2/protocol/RequesterID.java | 3 +- .../sun/identity/saml2/protocol/Response.java | 22 +- .../identity/saml2/protocol/SessionIndex.java | 3 +- .../sun/identity/saml2/protocol/Status.java | 23 +- .../identity/saml2/protocol/StatusCode.java | 21 +- .../identity/saml2/protocol/StatusDetail.java | 19 +- .../saml2/protocol/StatusMessage.java | 3 +- .../saml2/protocol/StatusResponse.java | 37 +- .../saml2/protocol/SubjectQueryAbstract.java | 20 +- .../saml2/protocol/impl/ArtifactImpl.java | 2 +- .../protocol/impl/ArtifactResolveImpl.java | 20 +- .../protocol/impl/ArtifactResponseImpl.java | 20 +- .../protocol/impl/AssertionIDRequestImpl.java | 4 +- .../saml2/protocol/impl/AuthnRequestImpl.java | 11 +- .../saml2/protocol/impl/GetCompleteImpl.java | 5 +- .../saml2/protocol/impl/IDPEntryImpl.java | 9 +- .../saml2/protocol/impl/IDPListImpl.java | 7 +- .../impl/ManageNameIDRequestImpl.java | 17 +- .../impl/ManageNameIDResponseImpl.java | 18 +- .../impl/NameIDMappingRequestImpl.java | 9 +- .../impl/NameIDMappingResponseImpl.java | 9 +- .../saml2/protocol/impl/NameIDPolicyImpl.java | 7 +- .../protocol/impl/NewEncryptedIDImpl.java | 16 +- .../saml2/protocol/impl/NewIDImpl.java | 7 +- .../protocol/impl/RequestAbstractImpl.java | 2 +- .../impl/RequestedAuthnContextImpl.java | 34 +- .../saml2/protocol/impl/RequesterIDImpl.java | 7 +- .../saml2/protocol/impl/ResponseImpl.java | 22 +- .../saml2/protocol/impl/ScopingImpl.java | 5 +- .../saml2/soapbinding/QueryClient.java | 26 +- .../soapbinding/QueryHandlerServlet.java | 12 +- .../client/WSFederationClient.java | 6 +- .../wsfederation/common/AccountUtils.java | 3 +- .../meta/WSFederationMetaManager.java | 3 +- .../meta/WSFederationMetaSecurityUtils.java | 17 +- .../plugins/DefaultAccountMapper.java | 3 +- .../plugins/DefaultAttributeMapper.java | 3 +- .../IDPAuthenticationMethodMapper.java | 3 +- .../servlet/RPSigninResponse.java | 4 +- .../servlet/WSFederationService.java | 5 +- .../servlet/WSFederationServlet.java | 9 +- .../xacml/client/XACMLRequestProcessor.java | 3 +- .../sun/identity/xacml/context/Action.java | 14 +- .../sun/identity/xacml/context/Attribute.java | 24 +- .../sun/identity/xacml/context/Decision.java | 19 +- .../identity/xacml/context/Environment.java | 14 +- .../sun/identity/xacml/context/Request.java | 20 +- .../sun/identity/xacml/context/Resource.java | 16 +- .../xacml/context/ResourceContent.java | 14 +- .../sun/identity/xacml/context/Response.java | 12 +- .../sun/identity/xacml/context/Result.java | 18 +- .../sun/identity/xacml/context/Status.java | 17 +- .../identity/xacml/context/StatusCode.java | 16 +- .../identity/xacml/context/StatusDetail.java | 17 +- .../identity/xacml/context/StatusMessage.java | 4 +- .../sun/identity/xacml/context/Subject.java | 14 +- .../xacml/context/impl/ActionImpl.java | 14 +- .../xacml/context/impl/AttributeImpl.java | 28 +- .../xacml/context/impl/DecisionImpl.java | 19 +- .../xacml/context/impl/EnvironmentImpl.java | 14 +- .../xacml/context/impl/RequestImpl.java | 22 +- .../xacml/context/impl/ResourceImpl.java | 18 +- .../xacml/context/impl/ResponseImpl.java | 19 +- .../xacml/context/impl/ResultImpl.java | 23 +- .../xacml/context/impl/StatusCodeImpl.java | 20 +- .../xacml/context/impl/StatusDetailImpl.java | 21 +- .../xacml/context/impl/StatusImpl.java | 21 +- .../xacml/context/impl/StatusMessageImpl.java | 8 +- .../xacml/context/impl/SubjectImpl.java | 14 +- .../xacml/policy/impl/ObligationImpl.java | 22 +- .../xacml/policy/impl/ObligationsImpl.java | 3 +- .../xacml/saml2/XACMLAuthzDecisionQuery.java | 59 +-- .../saml2/XACMLAuthzDecisionStatement.java | 47 ++- .../impl/XACMLAuthzDecisionQueryImpl.java | 58 +-- .../impl/XACMLAuthzDecisionStatementImpl.java | 39 +- .../sun/identity/xacml/spi/SubjectMapper.java | 3 +- .../identity/xmlenc/EncryptionException.java | 11 +- .../identity/xmlenc/XMLEncryptionManager.java | 3 +- .../java/com/sun/liberty/LibertyManager.java | 6 +- .../saml2/UtilProxyIDPRequestValidator.java | 4 +- .../saml2/UtilProxySAMLAuthenticator.java | 4 +- .../openam/saml2/audit/SAML2EventLogger.java | 7 +- .../saml2/idpdiscovery/CookieUtils.java | 11 +- .../identity/saml2/idpdiscovery/Debug.java | 13 +- .../client/request/HttpClientRequest.java | 5 +- .../request/HttpClientRequestFactory.java | 3 +- .../request/SimpleHttpClientRequest.java | 3 +- .../client/response/HttpClientResponse.java | 3 +- .../response/SimpleHttpClientResponse.java | 3 +- openam-mcp-server/pom.xml | 5 + .../websocket/NotificationsWebSocket.java | 4 +- .../notifications/NotificationBroker.java | 3 +- .../saml2/core/OAuth2Saml2GrantSPAdapter.java | 20 +- openam-oauth2/pom.xml | 19 - .../AuthorizationCodeRequestValidator.java | 3 +- .../oauth2/core/AuthorizationService.java | 8 +- .../core/AuthorizeRequestValidator.java | 3 +- .../oauth2/core/ClientAuthenticator.java | 4 +- .../ClientCredentialsRequestValidator.java | 3 +- .../oauth2/core/OAuth2ProviderSettings.java | 5 +- .../core/OAuth2ProviderSettingsFactory.java | 4 +- .../forgerock/oauth2/core/OAuth2Request.java | 8 +- .../PasswordCredentialsRequestValidator.java | 3 +- .../core/RealmOAuth2ProviderSettings.java | 4 +- .../core/ResourceOwnerConsentVerifier.java | 3 +- .../oauth2/core/ResponseTypeValidator.java | 11 +- .../forgerock/oauth2/core/ScopeValidator.java | 3 +- .../oauth2/core/TokenInvalidator.java | 6 +- .../org/forgerock/oauth2/core/TokenStore.java | 7 +- .../java/org/forgerock/oauth2/core/Utils.java | 7 +- .../oauth2/restlet/AuthorizeResource.java | 4 +- .../DeviceCodeVerificationResource.java | 2 +- .../oauth2/restlet/ErrorResource.java | 5 +- .../oauth2/restlet/ExceptionHandler.java | 12 +- .../oauth2/restlet/OAuth2Filter.java | 3 +- .../restlet/TokenIntrospectionResource.java | 4 +- .../restlet/ValidationServerResource.java | 4 +- .../forgerock/openam/oauth2/OAuth2Utils.java | 15 +- .../openam/oauth2/OAuthProblemException.java | 13 +- .../openam/oauth2/StatefulTokenStore.java | 4 +- .../ResourceSetRegistrationEndpoint.java | 4 +- .../oauth2/rest/OAuth2UserApplications.java | 4 +- .../org/forgerock/openidconnect/Client.java | 4 +- .../openidconnect/ClientBuilder.java | 3 +- ...penIdConnectClientRegistrationService.java | 4 +- .../OpenIdConnectTokenStore.java | 3 +- .../forgerock/openidconnect/OpenIdPrompt.java | 3 +- .../openidconnect/restlet/WebFinger.java | 3 +- .../push/PushNotificationDelegate.java | 5 +- .../push/PushNotificationService.java | 4 +- .../services/push/sns/SnsMessageResource.java | 4 +- .../push/sns/SnsRegistrationPredicate.java | 3 +- .../sns/utils/SnsPushResponseUpdater.java | 3 +- .../radius/common/AttributeFactory.java | 2 +- .../openam/radius/common/AttributeSet.java | 2 +- .../openam/radius/common/OctetUtils.java | 96 ++--- .../openam/radius/common/PacketType.java | 3 +- .../radius/common/RequestAuthenticator.java | 2 +- .../server/RadiusLifecycleException.java | 3 +- .../radius/server/RadiusRequestListener.java | 2 +- .../server/config/RadiusServerManager.java | 5 +- .../server/spi/AccessRequestHandler.java | 5 +- .../spi/handlers/OpenAMAuthHandler.java | 21 +- .../spi/handlers/amhandler/ContextHolder.java | 2 +- .../com/sun/identity/rest/AuthSPrincipal.java | 25 +- .../openam/authz/PrivilegeAuthzModule.java | 4 +- .../http/authz/HttpPrivilegeAuthzModule.java | 6 +- .../openam/rest/AuthnRequestUtils.java | 4 +- .../rest/LocalSSOTokenSessionModule.java | 6 +- .../org/forgerock/openam/rest/RestUtils.java | 6 +- .../org/forgerock/openam/rest/Routers.java | 9 +- .../openam/rest/SubjectAwareResource.java | 3 +- .../rest/VersionBehaviourConfigListener.java | 4 +- .../AbstractRestletAccessAuditFilter.java | 6 +- .../rest/authz/CrestPrivilegeAuthzModule.java | 4 +- .../openam/rest/resource/SSOTokenContext.java | 6 +- .../rest/router/CTSPersistentStoreProxy.java | 4 +- .../openam/rest/router/package-info.java | 3 +- .../OAuth2ServiceEndpointApplication.java | 7 +- .../rest/service/RestletServiceServlet.java | 10 +- .../service/ServiceEndpointApplication.java | 3 +- .../UMAServiceEndpointApplication.java | 3 +- .../XACMLServiceEndpointApplication.java | 5 +- .../openam/services/RestSecurity.java | 6 +- .../rest/jakarta/servlet/ServerServlet.java | 5 +- openam-schema/openam-dtd-schema/pom.xml | 13 - .../AffiliationDescriptorConfigElement.java | 4 +- .../jaxb/entityconfig/AttributeElement.java | 4 +- .../jaxb/entityconfig/AttributeType.java | 22 +- .../jaxb/entityconfig/BaseConfigType.java | 22 +- .../entityconfig/EntityConfigElement.java | 4 +- .../jaxb/entityconfig/EntityConfigType.java | 42 +- .../IDPDescriptorConfigElement.java | 4 +- .../jaxb/entityconfig/ObjectFactory.java | 27 +- .../SPDescriptorConfigElement.java | 4 +- .../jaxb/entityconfig/ValueElement.java | 4 +- .../impl/runtime/DefaultJAXBContextImpl.java | 9 +- .../impl/runtime/GrammarInfoFacade.java | 3 +- .../impl/runtime/GrammarInfoImpl.java | 3 +- .../impl/runtime/InterleaveDispatcher.java | 4 +- .../impl/runtime/MarshallerImpl.java | 3 +- .../impl/runtime/NamespaceContext2.java | 5 +- .../impl/runtime/SAXMarshaller.java | 5 +- .../impl/runtime/SAXUnmarshallerHandler.java | 3 +- .../runtime/SAXUnmarshallerHandlerImpl.java | 3 +- .../impl/runtime/UnmarshallingContext.java | 3 +- .../impl/runtime/XMLSerializer.java | 5 +- .../liberty/ws/authnsvc/jaxb/EmptyType.java | 14 +- .../ws/authnsvc/jaxb/ExtensionElement.java | 4 +- .../ws/authnsvc/jaxb/ExtensionType.java | 20 +- .../ws/authnsvc/jaxb/ObjectFactory.java | 39 +- .../jaxb/PasswordTransformsElement.java | 64 +-- .../authnsvc/jaxb/PasswordTransformsType.java | 114 +++--- .../ws/authnsvc/jaxb/SASLRequestElement.java | 48 +-- .../ws/authnsvc/jaxb/SASLRequestType.java | 57 ++- .../ws/authnsvc/jaxb/SASLResponseElement.java | 70 ++-- .../ws/authnsvc/jaxb/SASLResponseType.java | 98 +++-- .../ws/authnsvc/jaxb/StatusElement.java | 4 +- .../liberty/ws/authnsvc/jaxb/StatusType.java | 26 +- .../ac/ActivationLimitDurationElement.java | 4 +- .../jaxb/ac/ActivationLimitDurationType.java | 16 +- .../jaxb/ac/ActivationLimitElement.java | 4 +- .../ac/ActivationLimitSessionElement.java | 4 +- .../jaxb/ac/ActivationLimitSessionType.java | 14 +- .../common/jaxb/ac/ActivationLimitType.java | 24 +- .../jaxb/ac/ActivationLimitUsagesElement.java | 4 +- .../jaxb/ac/ActivationLimitUsagesType.java | 16 +- .../common/jaxb/ac/ActivationPinElement.java | 4 +- .../ws/common/jaxb/ac/ActivationPinType.java | 28 +- .../ws/common/jaxb/ac/AlphabetElement.java | 4 +- .../ws/common/jaxb/ac/AlphabetType.java | 20 +- .../jaxb/ac/AsymmetricDecryptionElement.java | 24 +- .../jaxb/ac/AsymmetricDecryptionType.java | 20 +- .../ac/AsymmetricKeyAgreementElement.java | 24 +- .../jaxb/ac/AsymmetricKeyAgreementType.java | 20 +- .../ac/AuthenticatingAuthorityElement.java | 4 +- .../jaxb/ac/AuthenticatingAuthorityType.java | 22 +- ...AuthenticationContextStatementElement.java | 4 +- .../AuthenticationContextStatementType.java | 34 +- .../jaxb/ac/AuthenticationMethodElement.java | 4 +- .../jaxb/ac/AuthenticationMethodType.java | 26 +- .../common/jaxb/ac/AuthenticatorElement.java | 4 +- ...AuthenticatorTransportProtocolElement.java | 4 +- .../AuthenticatorTransportProtocolType.java | 34 +- .../ws/common/jaxb/ac/AuthenticatorType.java | 40 +- .../ac/DeactivationCallCenterElement.java | 24 +- .../jaxb/ac/DeactivationCallCenterType.java | 20 +- .../ws/common/jaxb/ac/DigSigElement.java | 24 +- .../liberty/ws/common/jaxb/ac/DigSigType.java | 20 +- .../liberty/ws/common/jaxb/ac/EmptyType.java | 14 +- .../ws/common/jaxb/ac/ExtensionElement.java | 4 +- .../ws/common/jaxb/ac/ExtensionType.java | 20 +- .../ws/common/jaxb/ac/GenerationElement.java | 34 +- .../ws/common/jaxb/ac/GenerationType.java | 30 +- .../jaxb/ac/GoverningAgreementRefElement.java | 4 +- .../jaxb/ac/GoverningAgreementRefType.java | 16 +- .../jaxb/ac/GoverningAgreementsElement.java | 4 +- .../jaxb/ac/GoverningAgreementsType.java | 20 +- .../ws/common/jaxb/ac/HTTPElement.java | 24 +- .../liberty/ws/common/jaxb/ac/HTTPType.java | 20 +- .../ws/common/jaxb/ac/IPAddressElement.java | 24 +- .../ws/common/jaxb/ac/IPAddressType.java | 20 +- .../ws/common/jaxb/ac/IPSecElement.java | 24 +- .../liberty/ws/common/jaxb/ac/IPSecType.java | 20 +- .../common/jaxb/ac/IdentificationElement.java | 4 +- .../ws/common/jaxb/ac/IdentificationType.java | 42 +- .../common/jaxb/ac/KeyActivationElement.java | 4 +- .../ws/common/jaxb/ac/KeyActivationType.java | 22 +- .../ws/common/jaxb/ac/KeySharingElement.java | 4 +- .../ws/common/jaxb/ac/KeySharingType.java | 16 +- .../ws/common/jaxb/ac/KeyStorageElement.java | 4 +- .../ws/common/jaxb/ac/KeyStorageType.java | 36 +- .../ws/common/jaxb/ac/LengthElement.java | 4 +- .../liberty/ws/common/jaxb/ac/LengthType.java | 18 +- ...obileNetworkEndToEndEncryptionElement.java | 24 +- .../MobileNetworkEndToEndEncryptionType.java | 20 +- .../ac/MobileNetworkNoEncryptionElement.java | 24 +- .../ac/MobileNetworkNoEncryptionType.java | 20 +- .../MobileNetworkRadioEncryptionElement.java | 24 +- .../ac/MobileNetworkRadioEncryptionType.java | 20 +- .../ws/common/jaxb/ac/ObjectFactory.java | 213 +++++----- .../jaxb/ac/OperationalProtectionElement.java | 4 +- .../jaxb/ac/OperationalProtectionType.java | 24 +- .../ws/common/jaxb/ac/PasswordElement.java | 4 +- .../ws/common/jaxb/ac/PasswordType.java | 26 +- .../jaxb/ac/PhysicalVerificationElement.java | 34 +- .../jaxb/ac/PhysicalVerificationType.java | 30 +- .../jaxb/ac/PreviousSessionElement.java | 24 +- .../common/jaxb/ac/PreviousSessionType.java | 20 +- ...incipalAuthenticationMechanismElement.java | 4 +- .../PrincipalAuthenticationMechanismType.java | 28 +- .../jaxb/ac/PrivateKeyProtectionElement.java | 4 +- .../jaxb/ac/PrivateKeyProtectionType.java | 26 +- .../common/jaxb/ac/ResumeSessionElement.java | 24 +- .../ws/common/jaxb/ac/ResumeSessionType.java | 20 +- .../liberty/ws/common/jaxb/ac/SSLElement.java | 24 +- .../liberty/ws/common/jaxb/ac/SSLType.java | 20 +- .../jaxb/ac/SecretKeyProtectionElement.java | 4 +- .../jaxb/ac/SecretKeyProtectionType.java | 24 +- .../common/jaxb/ac/SecurityAuditElement.java | 4 +- .../ws/common/jaxb/ac/SecurityAuditType.java | 22 +- .../SharedSecretChallengeResponseElement.java | 24 +- .../ac/SharedSecretChallengeResponseType.java | 20 +- .../SharedSecretDynamicPlaintextElement.java | 24 +- .../ac/SharedSecretDynamicPlaintextType.java | 20 +- .../ws/common/jaxb/ac/SmartcardElement.java | 24 +- .../ws/common/jaxb/ac/SmartcardType.java | 20 +- .../ws/common/jaxb/ac/StatusElement.java | 4 +- .../liberty/ws/common/jaxb/ac/StatusType.java | 26 +- .../ws/common/jaxb/ac/SwitchAuditElement.java | 24 +- .../ws/common/jaxb/ac/SwitchAuditType.java | 20 +- .../jaxb/ac/TechnicalProtectionElement.java | 4 +- .../jaxb/ac/TechnicalProtectionType.java | 24 +- .../common/jaxb/ac/TimeSyncTokenElement.java | 4 +- .../ws/common/jaxb/ac/TimeSyncTokenType.java | 48 +-- .../ws/common/jaxb/ac/TokenElement.java | 4 +- .../liberty/ws/common/jaxb/ac/TokenType.java | 22 +- .../ws/common/jaxb/ac/WTLSElement.java | 24 +- .../liberty/ws/common/jaxb/ac/WTLSType.java | 20 +- .../common/jaxb/ac/WrittenConsentElement.java | 24 +- .../ws/common/jaxb/ac/WrittenConsentType.java | 20 +- .../common/jaxb/ac/ZeroKnowledgeElement.java | 24 +- .../ws/common/jaxb/ac/ZeroKnowledgeType.java | 20 +- .../common/jaxb/assertion/ActionElement.java | 4 +- .../ws/common/jaxb/assertion/ActionType.java | 16 +- .../common/jaxb/assertion/AdviceElement.java | 4 +- .../ws/common/jaxb/assertion/AdviceType.java | 24 +- .../jaxb/assertion/AssertionElement.java | 4 +- .../AssertionIDReferenceElement.java | 4 +- .../common/jaxb/assertion/AssertionType.java | 48 +-- .../assertion/AttributeDesignatorElement.java | 4 +- .../assertion/AttributeDesignatorType.java | 18 +- .../jaxb/assertion/AttributeElement.java | 4 +- .../assertion/AttributeStatementElement.java | 4 +- .../assertion/AttributeStatementType.java | 20 +- .../common/jaxb/assertion/AttributeType.java | 20 +- .../jaxb/assertion/AttributeValueElement.java | 4 +- .../jaxb/assertion/AudienceElement.java | 4 +- .../AudienceRestrictionConditionElement.java | 4 +- .../AudienceRestrictionConditionType.java | 20 +- .../AuthenticationStatementElement.java | 4 +- .../AuthenticationStatementType.java | 26 +- .../assertion/AuthorityBindingElement.java | 4 +- .../jaxb/assertion/AuthorityBindingType.java | 20 +- ...AuthorizationDecisionStatementElement.java | 4 +- .../AuthorizationDecisionStatementType.java | 26 +- .../jaxb/assertion/ConditionAbstractType.java | 14 +- .../jaxb/assertion/ConditionElement.java | 4 +- .../jaxb/assertion/ConditionsElement.java | 4 +- .../common/jaxb/assertion/ConditionsType.java | 28 +- .../assertion/ConfirmationMethodElement.java | 4 +- .../assertion/DoNotCacheConditionElement.java | 4 +- .../assertion/DoNotCacheConditionType.java | 14 +- .../jaxb/assertion/EvidenceElement.java | 4 +- .../common/jaxb/assertion/EvidenceType.java | 22 +- .../jaxb/assertion/NameIdentifierElement.java | 4 +- .../jaxb/assertion/NameIdentifierType.java | 18 +- .../common/jaxb/assertion/ObjectFactory.java | 103 ++--- .../jaxb/assertion/StatementAbstractType.java | 14 +- .../jaxb/assertion/StatementElement.java | 4 +- .../SubjectConfirmationDataElement.java | 4 +- .../assertion/SubjectConfirmationElement.java | 4 +- .../assertion/SubjectConfirmationType.java | 24 +- .../common/jaxb/assertion/SubjectElement.java | 4 +- .../assertion/SubjectLocalityElement.java | 4 +- .../jaxb/assertion/SubjectLocalityType.java | 18 +- .../SubjectStatementAbstractType.java | 20 +- .../assertion/SubjectStatementElement.java | 4 +- .../ws/common/jaxb/assertion/SubjectType.java | 28 +- .../protocol/AssertionArtifactElement.java | 4 +- .../jaxb/protocol/AttributeQueryElement.java | 4 +- .../jaxb/protocol/AttributeQueryType.java | 22 +- .../protocol/AuthenticationQueryElement.java | 4 +- .../protocol/AuthenticationQueryType.java | 16 +- .../AuthorizationDecisionQueryElement.java | 4 +- .../AuthorizationDecisionQueryType.java | 24 +- .../common/jaxb/protocol/ObjectFactory.java | 63 +-- .../jaxb/protocol/QueryAbstractType.java | 14 +- .../ws/common/jaxb/protocol/QueryElement.java | 4 +- .../jaxb/protocol/RequestAbstractType.java | 30 +- .../common/jaxb/protocol/RequestElement.java | 4 +- .../ws/common/jaxb/protocol/RequestType.java | 32 +- .../jaxb/protocol/RespondWithElement.java | 4 +- .../jaxb/protocol/ResponseAbstractType.java | 32 +- .../common/jaxb/protocol/ResponseElement.java | 4 +- .../ws/common/jaxb/protocol/ResponseType.java | 22 +- .../jaxb/protocol/StatusCodeElement.java | 4 +- .../common/jaxb/protocol/StatusCodeType.java | 22 +- .../jaxb/protocol/StatusDetailElement.java | 4 +- .../jaxb/protocol/StatusDetailType.java | 20 +- .../common/jaxb/protocol/StatusElement.java | 4 +- .../jaxb/protocol/StatusMessageElement.java | 4 +- .../ws/common/jaxb/protocol/StatusType.java | 24 +- .../protocol/SubjectQueryAbstractType.java | 20 +- .../jaxb/protocol/SubjectQueryElement.java | 4 +- .../common/jaxb/ps/AffiliationIDElement.java | 4 +- .../ws/common/jaxb/ps/AssertionElement.java | 4 +- .../ws/common/jaxb/ps/AssertionType.java | 16 +- .../ps/AuthenticationStatementElement.java | 4 +- .../jaxb/ps/AuthenticationStatementType.java | 24 +- .../common/jaxb/ps/AuthnContextElement.java | 32 +- .../ws/common/jaxb/ps/AuthnContextType.java | 28 +- .../common/jaxb/ps/AuthnRequestElement.java | 4 +- .../jaxb/ps/AuthnRequestEnvelopeElement.java | 4 +- .../jaxb/ps/AuthnRequestEnvelopeType.java | 30 +- .../ws/common/jaxb/ps/AuthnRequestType.java | 42 +- .../common/jaxb/ps/AuthnResponseElement.java | 4 +- .../jaxb/ps/AuthnResponseEnvelopeElement.java | 4 +- .../jaxb/ps/AuthnResponseEnvelopeType.java | 22 +- .../ws/common/jaxb/ps/AuthnResponseType.java | 26 +- .../liberty/ws/common/jaxb/ps/EmptyType.java | 14 +- .../ps/EncryptableNameIdentifierElement.java | 4 +- .../ps/EncryptableNameIdentifierType.java | 18 +- .../ps/EncryptedNameIdentifierElement.java | 4 +- .../jaxb/ps/EncryptedNameIdentifierType.java | 22 +- .../ws/common/jaxb/ps/ExtensionElement.java | 4 +- .../ws/common/jaxb/ps/ExtensionType.java | 20 +- ...erationTerminationNotificationElement.java | 4 +- ...FederationTerminationNotificationType.java | 26 +- .../ws/common/jaxb/ps/GetCompleteElement.java | 4 +- .../ws/common/jaxb/ps/IDPEntriesElement.java | 24 +- .../ws/common/jaxb/ps/IDPEntriesType.java | 20 +- .../ws/common/jaxb/ps/IDPEntryElement.java | 28 +- .../ws/common/jaxb/ps/IDPEntryType.java | 24 +- .../ws/common/jaxb/ps/IDPListElement.java | 4 +- .../ws/common/jaxb/ps/IDPListType.java | 22 +- .../ps/IDPProvidedNameIdentifierElement.java | 4 +- .../common/jaxb/ps/LogoutRequestElement.java | 4 +- .../ws/common/jaxb/ps/LogoutRequestType.java | 30 +- .../common/jaxb/ps/LogoutResponseElement.java | 4 +- .../common/jaxb/ps/NameIDPolicyElement.java | 4 +- .../NameIdentifierMappingRequestElement.java | 4 +- .../ps/NameIdentifierMappingRequestType.java | 28 +- .../NameIdentifierMappingResponseElement.java | 4 +- .../ps/NameIdentifierMappingResponseType.java | 26 +- .../ws/common/jaxb/ps/ObjectFactory.java | 137 +++---- .../ps/OldProvidedNameIdentifierElement.java | 4 +- .../jaxb/ps/ProtocolProfileElement.java | 4 +- .../ws/common/jaxb/ps/ProviderIDElement.java | 4 +- .../RegisterNameIdentifierRequestElement.java | 4 +- .../ps/RegisterNameIdentifierRequestType.java | 30 +- ...RegisterNameIdentifierResponseElement.java | 4 +- .../ws/common/jaxb/ps/RelayStateElement.java | 4 +- .../jaxb/ps/RequestAuthnContextElement.java | 32 +- .../jaxb/ps/RequestAuthnContextType.java | 28 +- .../common/jaxb/ps/RequestEnvelopeType.java | 20 +- .../common/jaxb/ps/ResponseEnvelopeType.java | 20 +- .../ps/SPProvidedNameIdentifierElement.java | 4 +- .../ws/common/jaxb/ps/ScopingElement.java | 4 +- .../ws/common/jaxb/ps/ScopingType.java | 22 +- .../ws/common/jaxb/ps/StatusElement.java | 4 +- .../ws/common/jaxb/ps/StatusResponseType.java | 26 +- .../liberty/ws/common/jaxb/ps/StatusType.java | 26 +- .../ws/common/jaxb/ps/SubjectElement.java | 4 +- .../ws/common/jaxb/ps/SubjectType.java | 20 +- .../common/jaxb/secext/AttributedString.java | 16 +- .../secext/BinarySecurityTokenElement.java | 4 +- .../jaxb/secext/BinarySecurityTokenType.java | 16 +- .../common/jaxb/secext/EmbeddedElement.java | 4 +- .../ws/common/jaxb/secext/EmbeddedType.java | 22 +- .../ws/common/jaxb/secext/EncodedString.java | 16 +- .../jaxb/secext/KeyIdentifierElement.java | 4 +- .../common/jaxb/secext/KeyIdentifierType.java | 16 +- .../ws/common/jaxb/secext/NonceElement.java | 4 +- .../ws/common/jaxb/secext/ObjectFactory.java | 45 +-- .../common/jaxb/secext/PasswordElement.java | 4 +- .../ws/common/jaxb/secext/PasswordString.java | 16 +- .../common/jaxb/secext/ReferenceElement.java | 4 +- .../ws/common/jaxb/secext/ReferenceType.java | 18 +- .../common/jaxb/secext/SecurityElement.java | 4 +- .../jaxb/secext/SecurityHeaderType.java | 20 +- .../secext/SecurityTokenReferenceElement.java | 4 +- .../secext/SecurityTokenReferenceType.java | 24 +- .../jaxb/secext/UsernameTokenElement.java | 4 +- .../common/jaxb/secext/UsernameTokenType.java | 24 +- .../MessageAuthenticationElement.java | 4 +- .../common/jaxb/security/ObjectFactory.java | 39 +- .../ProxyInfoConfirmationDataElement.java | 4 +- .../security/ProxyInfoConfirmationType.java | 28 +- .../jaxb/security/ProxySubjectElement.java | 4 +- .../ProxyTransitedStatementElement.java | 4 +- .../RequesterAuthorizationElement.java | 4 +- .../ResourceAccessStatementElement.java | 4 +- .../security/ResourceAccessStatementType.java | 28 +- .../jaxb/security/SessionContextElement.java | 4 +- .../SessionContextStatementElement.java | 4 +- .../security/SessionContextStatementType.java | 22 +- .../jaxb/security/SessionContextType.java | 28 +- .../ValidityRestrictionConditionElement.java | 4 +- .../ValidityRestrictionConditionType.java | 20 +- .../ws/common/jaxb/soap/BodyElement.java | 4 +- .../liberty/ws/common/jaxb/soap/BodyType.java | 20 +- .../liberty/ws/common/jaxb/soap/Detail.java | 20 +- .../ws/common/jaxb/soap/EnvelopeElement.java | 4 +- .../ws/common/jaxb/soap/EnvelopeType.java | 24 +- .../ws/common/jaxb/soap/FaultElement.java | 4 +- .../ws/common/jaxb/soap/FaultType.java | 26 +- .../ws/common/jaxb/soap/HeaderElement.java | 4 +- .../ws/common/jaxb/soap/HeaderType.java | 20 +- .../ws/common/jaxb/soap/ObjectFactory.java | 25 +- .../jaxb/utility/AttributedDateTime.java | 18 +- .../ws/common/jaxb/utility/AttributedURI.java | 16 +- .../common/jaxb/utility/CreatedElement.java | 4 +- .../common/jaxb/utility/ExpiresElement.java | 4 +- .../ws/common/jaxb/utility/ObjectFactory.java | 27 +- .../common/jaxb/utility/ReceivedElement.java | 4 +- .../ws/common/jaxb/utility/ReceivedType.java | 18 +- .../common/jaxb/utility/TimestampElement.java | 4 +- .../jaxb/utility/TimestampTraceElement.java | 4 +- .../jaxb/utility/TimestampTraceType.java | 28 +- .../ws/common/jaxb/utility/TimestampType.java | 30 +- .../jaxb/xmlenc/AgreementMethodElement.java | 4 +- .../jaxb/xmlenc/AgreementMethodType.java | 37 +- .../common/jaxb/xmlenc/CipherDataElement.java | 4 +- .../ws/common/jaxb/xmlenc/CipherDataType.java | 22 +- .../jaxb/xmlenc/CipherReferenceElement.java | 4 +- .../jaxb/xmlenc/CipherReferenceType.java | 22 +- .../jaxb/xmlenc/EncryptedDataElement.java | 4 +- .../common/jaxb/xmlenc/EncryptedDataType.java | 14 +- .../jaxb/xmlenc/EncryptedKeyElement.java | 4 +- .../common/jaxb/xmlenc/EncryptedKeyType.java | 24 +- .../ws/common/jaxb/xmlenc/EncryptedType.java | 34 +- .../jaxb/xmlenc/EncryptionMethodType.java | 32 +- .../xmlenc/EncryptionPropertiesElement.java | 4 +- .../jaxb/xmlenc/EncryptionPropertiesType.java | 22 +- .../xmlenc/EncryptionPropertyElement.java | 4 +- .../jaxb/xmlenc/EncryptionPropertyType.java | 24 +- .../ws/common/jaxb/xmlenc/ObjectFactory.java | 67 ++-- .../jaxb/xmlenc/ReferenceListElement.java | 26 +- .../common/jaxb/xmlenc/ReferenceListType.java | 28 +- .../ws/common/jaxb/xmlenc/ReferenceType.java | 22 +- .../ws/common/jaxb/xmlenc/TransformsType.java | 20 +- .../xmlsig/CanonicalizationMethodElement.java | 4 +- .../xmlsig/CanonicalizationMethodType.java | 22 +- .../jaxb/xmlsig/DSAKeyValueElement.java | 4 +- .../common/jaxb/xmlsig/DSAKeyValueType.java | 40 +- .../jaxb/xmlsig/DigestMethodElement.java | 4 +- .../common/jaxb/xmlsig/DigestMethodType.java | 22 +- .../jaxb/xmlsig/DigestValueElement.java | 4 +- .../ws/common/jaxb/xmlsig/KeyInfoElement.java | 4 +- .../ws/common/jaxb/xmlsig/KeyInfoType.java | 36 +- .../ws/common/jaxb/xmlsig/KeyNameElement.java | 4 +- .../common/jaxb/xmlsig/KeyValueElement.java | 4 +- .../ws/common/jaxb/xmlsig/KeyValueType.java | 24 +- .../common/jaxb/xmlsig/ManifestElement.java | 4 +- .../ws/common/jaxb/xmlsig/ManifestType.java | 22 +- .../common/jaxb/xmlsig/MgmtDataElement.java | 4 +- .../ws/common/jaxb/xmlsig/ObjectElement.java | 4 +- .../ws/common/jaxb/xmlsig/ObjectFactory.java | 135 +++---- .../ws/common/jaxb/xmlsig/ObjectType.java | 26 +- .../ws/common/jaxb/xmlsig/PGPDataElement.java | 4 +- .../ws/common/jaxb/xmlsig/PGPDataType.java | 36 +- .../jaxb/xmlsig/RSAKeyValueElement.java | 4 +- .../common/jaxb/xmlsig/RSAKeyValueType.java | 22 +- .../common/jaxb/xmlsig/ReferenceElement.java | 4 +- .../ws/common/jaxb/xmlsig/ReferenceType.java | 30 +- .../jaxb/xmlsig/RetrievalMethodElement.java | 4 +- .../jaxb/xmlsig/RetrievalMethodType.java | 24 +- .../common/jaxb/xmlsig/SPKIDataElement.java | 4 +- .../ws/common/jaxb/xmlsig/SPKIDataType.java | 25 +- .../common/jaxb/xmlsig/SignatureElement.java | 4 +- .../jaxb/xmlsig/SignatureMethodElement.java | 4 +- .../jaxb/xmlsig/SignatureMethodType.java | 27 +- .../xmlsig/SignaturePropertiesElement.java | 4 +- .../jaxb/xmlsig/SignaturePropertiesType.java | 22 +- .../jaxb/xmlsig/SignaturePropertyElement.java | 4 +- .../jaxb/xmlsig/SignaturePropertyType.java | 24 +- .../ws/common/jaxb/xmlsig/SignatureType.java | 28 +- .../jaxb/xmlsig/SignatureValueElement.java | 4 +- .../jaxb/xmlsig/SignatureValueType.java | 16 +- .../common/jaxb/xmlsig/SignedInfoElement.java | 4 +- .../ws/common/jaxb/xmlsig/SignedInfoType.java | 26 +- .../common/jaxb/xmlsig/TransformElement.java | 4 +- .../ws/common/jaxb/xmlsig/TransformType.java | 27 +- .../common/jaxb/xmlsig/TransformsElement.java | 4 +- .../ws/common/jaxb/xmlsig/TransformsType.java | 20 +- .../common/jaxb/xmlsig/X509DataElement.java | 4 +- .../ws/common/jaxb/xmlsig/X509DataType.java | 49 ++- .../jaxb/xmlsig/X509IssuerSerialType.java | 22 +- .../jaxb/AuthenticateRequesterElement.java | 4 +- .../AuthenticateSessionContextElement.java | 4 +- .../disco/jaxb/AuthorizeRequesterElement.java | 4 +- .../ws/disco/jaxb/DescriptionType.java | 32 +- .../liberty/ws/disco/jaxb/DirectiveType.java | 16 +- .../liberty/ws/disco/jaxb/EmptyType.java | 14 +- .../disco/jaxb/EncryptResourceIDElement.java | 4 +- .../jaxb/EncryptedResourceIDElement.java | 4 +- .../disco/jaxb/EncryptedResourceIDType.java | 22 +- .../ws/disco/jaxb/ExtensionElement.java | 4 +- .../liberty/ws/disco/jaxb/ExtensionType.java | 20 +- .../ws/disco/jaxb/InsertEntryType.java | 22 +- .../liberty/ws/disco/jaxb/ModifyElement.java | 4 +- .../ws/disco/jaxb/ModifyResponseElement.java | 4 +- .../ws/disco/jaxb/ModifyResponseType.java | 34 +- .../liberty/ws/disco/jaxb/ModifyType.java | 26 +- .../liberty/ws/disco/jaxb/ObjectFactory.java | 75 ++-- .../liberty/ws/disco/jaxb/OptionsElement.java | 4 +- .../liberty/ws/disco/jaxb/OptionsType.java | 20 +- .../liberty/ws/disco/jaxb/QueryElement.java | 4 +- .../ws/disco/jaxb/QueryResponseElement.java | 4 +- .../ws/disco/jaxb/QueryResponseType.java | 65 ++-- .../liberty/ws/disco/jaxb/QueryType.java | 67 ++-- .../ws/disco/jaxb/RemoveEntryType.java | 16 +- .../ws/disco/jaxb/ResourceIDElement.java | 4 +- .../liberty/ws/disco/jaxb/ResourceIDType.java | 16 +- .../disco/jaxb/ResourceOfferingElement.java | 4 +- .../ws/disco/jaxb/ResourceOfferingType.java | 28 +- .../ws/disco/jaxb/ServiceInstanceType.java | 24 +- .../ws/disco/jaxb/ServiceTypeElement.java | 4 +- .../liberty/ws/disco/jaxb/StatusElement.java | 4 +- .../liberty/ws/disco/jaxb/StatusType.java | 26 +- .../liberty/ws/disco/jaxb11/EmptyType.java | 14 +- .../ws/disco/jaxb11/ExtensionElement.java | 4 +- .../ws/disco/jaxb11/ExtensionType.java | 20 +- .../jaxb11/GenerateBearerTokenElement.java | 4 +- .../liberty/ws/disco/jaxb11/KeysElement.java | 4 +- .../liberty/ws/disco/jaxb11/KeysType.java | 20 +- .../ws/disco/jaxb11/ObjectFactory.java | 25 +- .../disco/jaxb11/SendSingleLogOutElement.java | 4 +- .../ws/disco/jaxb11/StatusElement.java | 4 +- .../liberty/ws/disco/jaxb11/StatusType.java | 26 +- .../disco/plugins/jaxb/DiscoEntryElement.java | 4 +- .../ws/disco/plugins/jaxb/ObjectFactory.java | 9 +- .../liberty/ws/idpp/jaxb/AddrTypeElement.java | 4 +- .../ws/idpp/jaxb/AddressCardElement.java | 4 +- .../liberty/ws/idpp/jaxb/AddressCardType.java | 32 +- .../liberty/ws/idpp/jaxb/AddressElement.java | 4 +- .../liberty/ws/idpp/jaxb/AddressType.java | 38 +- .../liberty/ws/idpp/jaxb/AgeElement.java | 4 +- .../liberty/ws/idpp/jaxb/AltCNElement.java | 4 +- .../liberty/ws/idpp/jaxb/AltIDElement.java | 4 +- .../liberty/ws/idpp/jaxb/AltIDType.java | 26 +- .../liberty/ws/idpp/jaxb/AltLOElement.java | 4 +- .../liberty/ws/idpp/jaxb/AltOElement.java | 4 +- .../ws/idpp/jaxb/AnalyzedNameElement.java | 4 +- .../ws/idpp/jaxb/AnalyzedNameType.java | 40 +- .../liberty/ws/idpp/jaxb/BirthdayElement.java | 4 +- .../liberty/ws/idpp/jaxb/CElement.java | 4 +- .../liberty/ws/idpp/jaxb/CNElement.java | 4 +- .../ws/idpp/jaxb/CommonNameElement.java | 4 +- .../liberty/ws/idpp/jaxb/CommonNameType.java | 32 +- .../liberty/ws/idpp/jaxb/DOBElement.java | 4 +- .../liberty/ws/idpp/jaxb/DSTDate.java | 16 +- .../liberty/ws/idpp/jaxb/DSTInteger.java | 16 +- .../ws/idpp/jaxb/DSTLocalizedString.java | 16 +- .../liberty/ws/idpp/jaxb/DSTMonthDay.java | 16 +- .../liberty/ws/idpp/jaxb/DSTString.java | 16 +- .../identity/liberty/ws/idpp/jaxb/DSTURI.java | 16 +- .../ws/idpp/jaxb/DemographicsElement.java | 4 +- .../ws/idpp/jaxb/DemographicsType.java | 32 +- .../ws/idpp/jaxb/DisplayLanguageElement.java | 4 +- .../ws/idpp/jaxb/EmergencyContactElement.java | 4 +- .../idpp/jaxb/EmploymentIdentityElement.java | 4 +- .../ws/idpp/jaxb/EmploymentIdentityType.java | 34 +- .../liberty/ws/idpp/jaxb/EmptyType.java | 14 +- .../ws/idpp/jaxb/EncryptKeyElement.java | 4 +- .../idpp/jaxb/EncryptedResourceIDElement.java | 4 +- .../ws/idpp/jaxb/ExtensionElement.java | 4 +- .../liberty/ws/idpp/jaxb/ExtensionType.java | 20 +- .../liberty/ws/idpp/jaxb/FNElement.java | 4 +- .../liberty/ws/idpp/jaxb/FacadeElement.java | 4 +- .../liberty/ws/idpp/jaxb/FacadeType.java | 32 +- .../liberty/ws/idpp/jaxb/GenderElement.java | 4 +- .../ws/idpp/jaxb/GreetMeSoundElement.java | 4 +- .../ws/idpp/jaxb/GreetSoundElement.java | 4 +- .../liberty/ws/idpp/jaxb/IDTypeElement.java | 4 +- .../liberty/ws/idpp/jaxb/IDValueElement.java | 4 +- .../ws/idpp/jaxb/InformalNameElement.java | 4 +- .../liberty/ws/idpp/jaxb/JobTitleElement.java | 4 +- .../liberty/ws/idpp/jaxb/KeyInfoType.java | 22 +- .../liberty/ws/idpp/jaxb/LAltCNElement.java | 4 +- .../liberty/ws/idpp/jaxb/LCNElement.java | 4 +- .../liberty/ws/idpp/jaxb/LCommentElement.java | 4 +- .../liberty/ws/idpp/jaxb/LElement.java | 4 +- .../idpp/jaxb/LEmergencyContactElement.java | 4 +- .../liberty/ws/idpp/jaxb/LFNElement.java | 4 +- .../ws/idpp/jaxb/LInformalNameElement.java | 4 +- .../ws/idpp/jaxb/LJobTitleElement.java | 4 +- .../liberty/ws/idpp/jaxb/LLElement.java | 4 +- .../ws/idpp/jaxb/LLegalNameElement.java | 4 +- .../liberty/ws/idpp/jaxb/LMNElement.java | 4 +- .../liberty/ws/idpp/jaxb/LNickElement.java | 4 +- .../liberty/ws/idpp/jaxb/LOElement.java | 4 +- .../ws/idpp/jaxb/LPersonalTitleElement.java | 4 +- .../ws/idpp/jaxb/LPostalAddressElement.java | 4 +- .../liberty/ws/idpp/jaxb/LSNElement.java | 4 +- .../liberty/ws/idpp/jaxb/LStElement.java | 4 +- .../liberty/ws/idpp/jaxb/LanguageElement.java | 4 +- .../ws/idpp/jaxb/LegalIdentityElement.java | 4 +- .../ws/idpp/jaxb/LegalIdentityType.java | 38 +- .../ws/idpp/jaxb/LegalNameElement.java | 4 +- .../liberty/ws/idpp/jaxb/MNElement.java | 4 +- .../ws/idpp/jaxb/MaritalStatusElement.java | 4 +- .../liberty/ws/idpp/jaxb/ModifyElement.java | 4 +- .../ws/idpp/jaxb/ModifyResponseElement.java | 4 +- .../liberty/ws/idpp/jaxb/ModifyType.java | 142 ++++--- .../ws/idpp/jaxb/MsgAccountElement.java | 4 +- .../ws/idpp/jaxb/MsgContactElement.java | 4 +- .../liberty/ws/idpp/jaxb/MsgContactType.java | 40 +- .../ws/idpp/jaxb/MsgMethodElement.java | 4 +- .../ws/idpp/jaxb/MsgProviderElement.java | 4 +- .../ws/idpp/jaxb/MsgSubaccountElement.java | 4 +- .../ws/idpp/jaxb/MsgTechnologyElement.java | 20 +- .../ws/idpp/jaxb/MsgTechnologyType.java | 16 +- .../liberty/ws/idpp/jaxb/MsgTypeElement.java | 4 +- .../liberty/ws/idpp/jaxb/MugShotElement.java | 4 +- .../ws/idpp/jaxb/NamePronouncedElement.java | 4 +- .../liberty/ws/idpp/jaxb/NickElement.java | 4 +- .../liberty/ws/idpp/jaxb/OElement.java | 4 +- .../liberty/ws/idpp/jaxb/ObjectFactory.java | 227 +++++------ .../liberty/ws/idpp/jaxb/PPElement.java | 4 +- .../identity/liberty/ws/idpp/jaxb/PPType.java | 48 +-- .../ws/idpp/jaxb/PersonalTitleElement.java | 4 +- .../ws/idpp/jaxb/PostalAddressElement.java | 4 +- .../ws/idpp/jaxb/PostalCodeElement.java | 4 +- .../liberty/ws/idpp/jaxb/QueryElement.java | 4 +- .../ws/idpp/jaxb/QueryResponseElement.java | 4 +- .../ws/idpp/jaxb/QueryResponseType.java | 77 ++-- .../liberty/ws/idpp/jaxb/QueryType.java | 83 ++-- .../ws/idpp/jaxb/ResourceIDElement.java | 4 +- .../liberty/ws/idpp/jaxb/ResponseType.java | 28 +- .../liberty/ws/idpp/jaxb/SNElement.java | 4 +- .../liberty/ws/idpp/jaxb/SignKeyElement.java | 4 +- .../liberty/ws/idpp/jaxb/StElement.java | 4 +- .../liberty/ws/idpp/jaxb/StatusElement.java | 4 +- .../liberty/ws/idpp/jaxb/StatusType.java | 26 +- .../liberty/ws/idpp/jaxb/TimeZoneElement.java | 4 +- .../liberty/ws/idpp/jaxb/VATElement.java | 4 +- .../liberty/ws/idpp/jaxb/VATType.java | 26 +- .../liberty/ws/idpp/jaxb/WebSiteElement.java | 4 +- .../ws/idpp/plugin/jaxb/ObjectFactory.java | 11 +- .../plugin/jaxb/PPISExtensionElement.java | 20 +- .../idpp/plugin/jaxb/PPISExtensionType.java | 16 +- .../ws/interaction/jaxb/EmptyType.java | 14 +- .../jaxb/EncryptedResourceIDElement.java | 4 +- .../ws/interaction/jaxb/ExtensionElement.java | 4 +- .../ws/interaction/jaxb/ExtensionType.java | 20 +- .../ws/interaction/jaxb/HelpElement.java | 4 +- .../liberty/ws/interaction/jaxb/HelpType.java | 20 +- .../ws/interaction/jaxb/HintElement.java | 4 +- .../ws/interaction/jaxb/InquiryElement.java | 4 +- .../interaction/jaxb/InquiryElementType.java | 28 +- .../ws/interaction/jaxb/InquiryType.java | 37 +- .../jaxb/InteractionRequestElement.java | 4 +- .../jaxb/InteractionRequestType.java | 32 +- .../jaxb/InteractionResponseElement.java | 4 +- .../jaxb/InteractionResponseType.java | 28 +- .../jaxb/InteractionStatementType.java | 22 +- .../ws/interaction/jaxb/ObjectFactory.java | 67 ++-- .../ws/interaction/jaxb/ParameterType.java | 18 +- .../jaxb/RedirectRequestElement.java | 4 +- .../interaction/jaxb/RedirectRequestType.java | 16 +- .../interaction/jaxb/ResourceIDElement.java | 4 +- .../ws/interaction/jaxb/SelectElement.java | 4 +- .../ws/interaction/jaxb/SelectType.java | 69 ++-- .../ws/interaction/jaxb/StatusElement.java | 4 +- .../ws/interaction/jaxb/StatusType.java | 26 +- .../ws/interaction/jaxb/TextElement.java | 4 +- .../liberty/ws/interaction/jaxb/TextType.java | 20 +- .../jaxb/UserInteractionElement.java | 4 +- .../jaxb/UserInteractionHeaderType.java | 34 +- .../jaxb/AdditionalMetadataLocationType.java | 16 +- .../meta/jaxb/AffiliationDescriptorType.java | 36 +- .../liberty/ws/meta/jaxb/ContactType.java | 34 +- .../liberty/ws/meta/jaxb/EmptyType.java | 14 +- .../meta/jaxb/EntitiesDescriptorElement.java | 4 +- .../ws/meta/jaxb/EntitiesDescriptorType.java | 20 +- .../ws/meta/jaxb/EntityDescriptorElement.java | 4 +- .../ws/meta/jaxb/EntityDescriptorType.java | 42 +- .../ws/meta/jaxb/ExtensionElement.java | 4 +- .../liberty/ws/meta/jaxb/ExtensionType.java | 20 +- .../ws/meta/jaxb/IDPDescriptorElement.java | 4 +- .../ws/meta/jaxb/IDPDescriptorType.java | 24 +- .../ws/meta/jaxb/KeyDescriptorElement.java | 4 +- .../ws/meta/jaxb/KeyDescriptorType.java | 28 +- .../ws/meta/jaxb/LocalizedURIType.java | 16 +- .../liberty/ws/meta/jaxb/ObjectFactory.java | 55 +-- .../jaxb/OrganizationDisplayNameType.java | 16 +- .../ws/meta/jaxb/OrganizationNameType.java | 16 +- .../ws/meta/jaxb/OrganizationType.java | 26 +- .../ws/meta/jaxb/ProviderDescriptorType.java | 62 +-- .../ws/meta/jaxb/SPDescriptorElement.java | 4 +- .../ws/meta/jaxb/SPDescriptorType.java | 57 ++- .../liberty/ws/meta/jaxb/StatusElement.java | 4 +- .../liberty/ws/meta/jaxb/StatusType.java | 26 +- .../liberty/ws/paos/jaxb/EmptyType.java | 14 +- .../ws/paos/jaxb/ExtensionElement.java | 4 +- .../liberty/ws/paos/jaxb/ExtensionType.java | 20 +- .../liberty/ws/paos/jaxb/ObjectFactory.java | 25 +- .../liberty/ws/paos/jaxb/RequestElement.java | 4 +- .../liberty/ws/paos/jaxb/RequestType.java | 24 +- .../liberty/ws/paos/jaxb/ResponseElement.java | 4 +- .../liberty/ws/paos/jaxb/ResponseType.java | 20 +- .../liberty/ws/paos/jaxb/StatusElement.java | 4 +- .../liberty/ws/paos/jaxb/StatusType.java | 26 +- .../ws/soapbinding/jaxb/ConsentElement.java | 4 +- .../ws/soapbinding/jaxb/ConsentType.java | 24 +- .../soapbinding/jaxb/CorrelationElement.java | 4 +- .../ws/soapbinding/jaxb/CorrelationType.java | 26 +- .../ws/soapbinding/jaxb/EmptyType.java | 14 +- .../ws/soapbinding/jaxb/ExtensionElement.java | 4 +- .../ws/soapbinding/jaxb/ExtensionType.java | 20 +- .../ws/soapbinding/jaxb/ObjectFactory.java | 37 +- .../jaxb/ProcessingContextElement.java | 4 +- .../jaxb/ProcessingContextType.java | 20 +- .../ws/soapbinding/jaxb/ProviderElement.java | 4 +- .../ws/soapbinding/jaxb/ProviderType.java | 24 +- .../ws/soapbinding/jaxb/StatusElement.java | 4 +- .../ws/soapbinding/jaxb/StatusType.java | 26 +- .../jaxb/UsageDirectiveElement.java | 4 +- .../soapbinding/jaxb/UsageDirectiveType.java | 28 +- .../jaxb11/CredentialsContextElement.java | 4 +- .../jaxb11/CredentialsContextType.java | 28 +- .../ws/soapbinding/jaxb11/EmptyType.java | 14 +- .../soapbinding/jaxb11/ExtensionElement.java | 4 +- .../ws/soapbinding/jaxb11/ExtensionType.java | 20 +- .../ws/soapbinding/jaxb11/ObjectFactory.java | 31 +- .../jaxb11/ServiceInstanceUpdateElement.java | 4 +- .../jaxb11/ServiceInstanceUpdateType.java | 73 ++-- .../ws/soapbinding/jaxb11/StatusElement.java | 4 +- .../ws/soapbinding/jaxb11/StatusType.java | 26 +- .../ws/soapbinding/jaxb11/TimeoutElement.java | 4 +- .../ws/soapbinding/jaxb11/TimeoutType.java | 22 +- .../java/org/w3/_2001/xmlschema/AnyType.java | 20 +- .../org/w3/_2001/xmlschema/ObjectFactory.java | 9 +- .../resources/mib/FORGEROCK-OPENAM-CTS.mib | 3 +- .../main/resources/mib/SUN-OPENSSO-SERVER.mib | 3 +- .../saml2/jaxb/assertion/ActionElement.java | 4 +- .../saml2/jaxb/assertion/ActionType.java | 16 +- .../saml2/jaxb/assertion/AdviceElement.java | 4 +- .../saml2/jaxb/assertion/AdviceType.java | 28 +- .../jaxb/assertion/AssertionElement.java | 4 +- .../jaxb/assertion/AssertionIDRefElement.java | 4 +- .../saml2/jaxb/assertion/AssertionType.java | 46 +-- .../assertion/AssertionURIRefElement.java | 4 +- .../jaxb/assertion/AttributeElement.java | 4 +- .../assertion/AttributeStatementElement.java | 4 +- .../assertion/AttributeStatementType.java | 22 +- .../saml2/jaxb/assertion/AttributeType.java | 28 +- .../jaxb/assertion/AttributeValueElement.java | 8 +- .../saml2/jaxb/assertion/AudienceElement.java | 4 +- .../assertion/AudienceRestrictionElement.java | 4 +- .../assertion/AudienceRestrictionType.java | 20 +- .../AuthenticatingAuthorityElement.java | 4 +- .../AuthnContextClassRefElement.java | 4 +- .../assertion/AuthnContextDeclElement.java | 4 +- .../assertion/AuthnContextDeclRefElement.java | 4 +- .../jaxb/assertion/AuthnContextElement.java | 4 +- .../jaxb/assertion/AuthnContextType.java | 46 +-- .../jaxb/assertion/AuthnStatementElement.java | 4 +- .../jaxb/assertion/AuthnStatementType.java | 28 +- .../AuthzDecisionStatementElement.java | 4 +- .../assertion/AuthzDecisionStatementType.java | 26 +- .../jaxb/assertion/BaseIDAbstractType.java | 16 +- .../saml2/jaxb/assertion/BaseIDElement.java | 4 +- .../jaxb/assertion/ConditionAbstractType.java | 14 +- .../jaxb/assertion/ConditionElement.java | 4 +- .../jaxb/assertion/ConditionsElement.java | 4 +- .../saml2/jaxb/assertion/ConditionsType.java | 30 +- .../assertion/EncryptedAssertionElement.java | 4 +- .../assertion/EncryptedAttributeElement.java | 4 +- .../jaxb/assertion/EncryptedElementType.java | 22 +- .../jaxb/assertion/EncryptedIDElement.java | 4 +- .../saml2/jaxb/assertion/EvidenceElement.java | 4 +- .../saml2/jaxb/assertion/EvidenceType.java | 26 +- .../saml2/jaxb/assertion/IssuerElement.java | 4 +- .../KeyInfoConfirmationDataType.java | 20 +- .../saml2/jaxb/assertion/NameIDElement.java | 4 +- .../saml2/jaxb/assertion/NameIDType.java | 20 +- .../saml2/jaxb/assertion/ObjectFactory.java | 131 +++---- .../jaxb/assertion/OneTimeUseElement.java | 4 +- .../saml2/jaxb/assertion/OneTimeUseType.java | 14 +- .../assertion/ProxyRestrictionElement.java | 4 +- .../jaxb/assertion/ProxyRestrictionType.java | 22 +- .../jaxb/assertion/StatementAbstractType.java | 14 +- .../jaxb/assertion/StatementElement.java | 4 +- .../SubjectConfirmationDataElement.java | 4 +- .../SubjectConfirmationDataType.java | 30 +- .../assertion/SubjectConfirmationElement.java | 4 +- .../assertion/SubjectConfirmationType.java | 32 +- .../saml2/jaxb/assertion/SubjectElement.java | 4 +- .../assertion/SubjectLocalityElement.java | 4 +- .../jaxb/assertion/SubjectLocalityType.java | 18 +- .../saml2/jaxb/assertion/SubjectType.java | 36 +- .../impl/runtime/DefaultJAXBContextImpl.java | 9 +- .../impl/runtime/GrammarInfoFacade.java | 5 +- .../impl/runtime/GrammarInfoImpl.java | 5 +- .../impl/runtime/InterleaveDispatcher.java | 4 +- .../impl/runtime/MarshallerImpl.java | 3 +- .../impl/runtime/NamespaceContext2.java | 3 +- .../assertion/impl/runtime/SAXMarshaller.java | 3 +- .../impl/runtime/SAXUnmarshallerHandler.java | 3 +- .../runtime/SAXUnmarshallerHandlerImpl.java | 3 +- .../impl/runtime/UnmarshallingContext.java | 3 +- .../assertion/impl/runtime/XMLSerializer.java | 3 +- .../AffiliationConfigElement.java | 4 +- .../AttributeAuthorityConfigElement.java | 4 +- .../jaxb/entityconfig/AttributeElement.java | 4 +- .../AttributeQueryConfigElement.java | 4 +- .../jaxb/entityconfig/AttributeType.java | 22 +- .../AuthnAuthorityConfigElement.java | 4 +- .../jaxb/entityconfig/BaseConfigType.java | 22 +- .../entityconfig/EntityConfigElement.java | 4 +- .../jaxb/entityconfig/EntityConfigType.java | 54 +-- .../entityconfig/IDPSSOConfigElement.java | 4 +- .../jaxb/entityconfig/ObjectFactory.java | 39 +- .../jaxb/entityconfig/PDPConfigElement.java | 4 +- .../jaxb/entityconfig/SPSSOConfigElement.java | 4 +- .../saml2/jaxb/entityconfig/ValueElement.java | 4 +- .../XACMLAuthzDecisionQueryConfigElement.java | 4 +- .../entityconfig/XACMLPDPConfigElement.java | 4 +- .../AdditionalMetadataLocationElement.java | 4 +- .../AdditionalMetadataLocationType.java | 16 +- .../jaxb/metadata/AffiliateMemberElement.java | 4 +- .../AffiliationDescriptorElement.java | 4 +- .../metadata/AffiliationDescriptorType.java | 34 +- .../ArtifactResolutionServiceElement.java | 4 +- .../AssertionConsumerServiceElement.java | 4 +- .../AssertionIDRequestServiceElement.java | 4 +- .../AttributeAuthorityDescriptorElement.java | 4 +- .../AttributeAuthorityDescriptorType.java | 28 +- .../AttributeConsumingServiceElement.java | 4 +- .../AttributeConsumingServiceType.java | 28 +- .../metadata/AttributeProfileElement.java | 4 +- .../metadata/AttributeServiceElement.java | 4 +- .../jaxb/metadata/AttributeServiceType.java | 18 +- .../AuthnAuthorityDescriptorElement.java | 4 +- .../AuthnAuthorityDescriptorType.java | 24 +- .../metadata/AuthnQueryServiceElement.java | 4 +- .../jaxb/metadata/AuthzServiceElement.java | 4 +- .../saml2/jaxb/metadata/CompanyElement.java | 4 +- .../jaxb/metadata/ContactPersonElement.java | 4 +- .../saml2/jaxb/metadata/ContactType.java | 32 +- .../jaxb/metadata/EmailAddressElement.java | 4 +- .../metadata/EncryptionMethodElement.java | 4 +- .../saml2/jaxb/metadata/EndpointType.java | 26 +- .../metadata/EntitiesDescriptorElement.java | 4 +- .../jaxb/metadata/EntitiesDescriptorType.java | 38 +- .../metadata/EntityDescriptorElement.java | 4 +- .../jaxb/metadata/EntityDescriptorType.java | 66 ++-- .../jaxb/metadata/ExtensionsElement.java | 4 +- .../saml2/jaxb/metadata/ExtensionsType.java | 20 +- .../saml2/jaxb/metadata/GivenNameElement.java | 4 +- .../metadata/IDPSSODescriptorElement.java | 4 +- .../jaxb/metadata/IDPSSODescriptorType.java | 30 +- .../jaxb/metadata/IndexedEndpointType.java | 18 +- .../jaxb/metadata/KeyDescriptorElement.java | 4 +- .../jaxb/metadata/KeyDescriptorType.java | 24 +- .../jaxb/metadata/LocalizedNameType.java | 16 +- .../saml2/jaxb/metadata/LocalizedURIType.java | 16 +- .../metadata/ManageNameIDServiceElement.java | 4 +- .../jaxb/metadata/NameIDFormatElement.java | 4 +- .../metadata/NameIDMappingServiceElement.java | 4 +- .../saml2/jaxb/metadata/ObjectFactory.java | 161 ++++---- .../OrganizationDisplayNameElement.java | 4 +- .../jaxb/metadata/OrganizationElement.java | 4 +- .../metadata/OrganizationNameElement.java | 4 +- .../saml2/jaxb/metadata/OrganizationType.java | 26 +- .../jaxb/metadata/OrganizationURLElement.java | 4 +- .../jaxb/metadata/PDPDescriptorElement.java | 4 +- .../jaxb/metadata/PDPDescriptorType.java | 24 +- .../jaxb/metadata/QueryDescriptorElement.java | 4 +- .../jaxb/metadata/QueryDescriptorType.java | 22 +- .../metadata/RequestedAttributeElement.java | 4 +- .../jaxb/metadata/RequestedAttributeType.java | 16 +- .../jaxb/metadata/RoleDescriptorElement.java | 4 +- .../jaxb/metadata/RoleDescriptorType.java | 38 +- .../jaxb/metadata/SPSSODescriptorElement.java | 4 +- .../jaxb/metadata/SPSSODescriptorType.java | 26 +- .../jaxb/metadata/SSODescriptorType.java | 26 +- .../metadata/ServiceDescriptionElement.java | 4 +- .../jaxb/metadata/ServiceNameElement.java | 4 +- .../metadata/SingleLogoutServiceElement.java | 4 +- .../metadata/SingleSignOnServiceElement.java | 4 +- .../saml2/jaxb/metadata/SurNameElement.java | 4 +- .../jaxb/metadata/TelephoneNumberElement.java | 4 +- ...MLAuthzDecisionQueryDescriptorElement.java | 4 +- ...XACMLAuthzDecisionQueryDescriptorType.java | 14 +- .../metadata/XACMLAuthzServiceElement.java | 4 +- .../metadata/XACMLPDPDescriptorElement.java | 4 +- .../jaxb/metadata/XACMLPDPDescriptorType.java | 20 +- .../metadataattr/EntityAttributesElement.java | 4 +- .../metadataattr/EntityAttributesType.java | 22 +- .../jaxb/metadataattr/ObjectFactory.java | 11 +- .../ActionNamespaceElement.java | 4 +- .../AttributeQueryDescriptorElement.java | 4 +- .../AttributeQueryDescriptorType.java | 20 +- .../AuthnQueryDescriptorType.java | 14 +- .../AuthzDecisionQueryDescriptorType.java | 20 +- .../jaxb/metadataextquery/ObjectFactory.java | 21 +- .../metadataextquery/QueryDescriptorType.java | 22 +- .../DiscoveryResponseElement.java | 4 +- .../metadataidpdiscovery/ObjectFactory.java | 9 +- .../identity/saml2/jaxb/schema/AnyType.java | 20 +- .../saml2/jaxb/schema/ObjectFactory.java | 9 +- .../jaxb/xmlenc/AgreementMethodElement.java | 4 +- .../jaxb/xmlenc/AgreementMethodType.java | 37 +- .../saml2/jaxb/xmlenc/CipherDataElement.java | 4 +- .../saml2/jaxb/xmlenc/CipherDataType.java | 22 +- .../jaxb/xmlenc/CipherReferenceElement.java | 4 +- .../jaxb/xmlenc/CipherReferenceType.java | 22 +- .../jaxb/xmlenc/EncryptedDataElement.java | 4 +- .../saml2/jaxb/xmlenc/EncryptedDataType.java | 14 +- .../jaxb/xmlenc/EncryptedKeyElement.java | 4 +- .../saml2/jaxb/xmlenc/EncryptedKeyType.java | 24 +- .../saml2/jaxb/xmlenc/EncryptedType.java | 34 +- .../jaxb/xmlenc/EncryptionMethodType.java | 32 +- .../xmlenc/EncryptionPropertiesElement.java | 4 +- .../jaxb/xmlenc/EncryptionPropertiesType.java | 22 +- .../xmlenc/EncryptionPropertyElement.java | 4 +- .../jaxb/xmlenc/EncryptionPropertyType.java | 24 +- .../saml2/jaxb/xmlenc/ObjectFactory.java | 67 ++-- .../jaxb/xmlenc/ReferenceListElement.java | 26 +- .../saml2/jaxb/xmlenc/ReferenceListType.java | 28 +- .../saml2/jaxb/xmlenc/ReferenceType.java | 22 +- .../saml2/jaxb/xmlenc/TransformsType.java | 20 +- .../xmlsig/CanonicalizationMethodElement.java | 4 +- .../xmlsig/CanonicalizationMethodType.java | 22 +- .../saml2/jaxb/xmlsig/DSAKeyValueElement.java | 4 +- .../saml2/jaxb/xmlsig/DSAKeyValueType.java | 40 +- .../jaxb/xmlsig/DigestMethodElement.java | 4 +- .../saml2/jaxb/xmlsig/DigestMethodType.java | 22 +- .../saml2/jaxb/xmlsig/DigestValueElement.java | 4 +- .../saml2/jaxb/xmlsig/KeyInfoElement.java | 4 +- .../saml2/jaxb/xmlsig/KeyInfoType.java | 36 +- .../saml2/jaxb/xmlsig/KeyNameElement.java | 4 +- .../saml2/jaxb/xmlsig/KeyValueElement.java | 4 +- .../saml2/jaxb/xmlsig/KeyValueType.java | 24 +- .../saml2/jaxb/xmlsig/ManifestElement.java | 4 +- .../saml2/jaxb/xmlsig/ManifestType.java | 22 +- .../saml2/jaxb/xmlsig/MgmtDataElement.java | 4 +- .../saml2/jaxb/xmlsig/ObjectElement.java | 4 +- .../saml2/jaxb/xmlsig/ObjectFactory.java | 135 +++---- .../saml2/jaxb/xmlsig/ObjectType.java | 26 +- .../saml2/jaxb/xmlsig/PGPDataElement.java | 4 +- .../saml2/jaxb/xmlsig/PGPDataType.java | 36 +- .../saml2/jaxb/xmlsig/RSAKeyValueElement.java | 4 +- .../saml2/jaxb/xmlsig/RSAKeyValueType.java | 22 +- .../saml2/jaxb/xmlsig/ReferenceElement.java | 4 +- .../saml2/jaxb/xmlsig/ReferenceType.java | 30 +- .../jaxb/xmlsig/RetrievalMethodElement.java | 4 +- .../jaxb/xmlsig/RetrievalMethodType.java | 24 +- .../saml2/jaxb/xmlsig/SPKIDataElement.java | 4 +- .../saml2/jaxb/xmlsig/SPKIDataType.java | 25 +- .../saml2/jaxb/xmlsig/SignatureElement.java | 4 +- .../jaxb/xmlsig/SignatureMethodElement.java | 4 +- .../jaxb/xmlsig/SignatureMethodType.java | 27 +- .../xmlsig/SignaturePropertiesElement.java | 4 +- .../jaxb/xmlsig/SignaturePropertiesType.java | 22 +- .../jaxb/xmlsig/SignaturePropertyElement.java | 4 +- .../jaxb/xmlsig/SignaturePropertyType.java | 24 +- .../saml2/jaxb/xmlsig/SignatureType.java | 28 +- .../jaxb/xmlsig/SignatureValueElement.java | 4 +- .../saml2/jaxb/xmlsig/SignatureValueType.java | 16 +- .../saml2/jaxb/xmlsig/SignedInfoElement.java | 4 +- .../saml2/jaxb/xmlsig/SignedInfoType.java | 26 +- .../saml2/jaxb/xmlsig/TransformElement.java | 4 +- .../saml2/jaxb/xmlsig/TransformType.java | 27 +- .../saml2/jaxb/xmlsig/TransformsElement.java | 4 +- .../saml2/jaxb/xmlsig/TransformsType.java | 20 +- .../saml2/jaxb/xmlsig/X509DataElement.java | 4 +- .../saml2/jaxb/xmlsig/X509DataType.java | 49 ++- .../jaxb/xmlsig/X509IssuerSerialType.java | 22 +- .../jaxb/entityconfig/AttributeElement.java | 4 +- .../jaxb/entityconfig/AttributeType.java | 22 +- .../jaxb/entityconfig/BaseConfigType.java | 22 +- .../entityconfig/FederationConfigElement.java | 4 +- .../entityconfig/FederationConfigType.java | 40 +- .../entityconfig/IDPSSOConfigElement.java | 4 +- .../jaxb/entityconfig/ObjectFactory.java | 25 +- .../jaxb/entityconfig/SPSSOConfigElement.java | 4 +- .../jaxb/entityconfig/ValueElement.java | 4 +- .../impl/runtime/DefaultJAXBContextImpl.java | 9 +- .../impl/runtime/GrammarInfoFacade.java | 5 +- .../impl/runtime/GrammarInfoImpl.java | 5 +- .../impl/runtime/InterleaveDispatcher.java | 4 +- .../impl/runtime/MarshallerImpl.java | 3 +- .../impl/runtime/NamespaceContext2.java | 3 +- .../impl/runtime/SAXMarshaller.java | 3 +- .../impl/runtime/SAXUnmarshallerHandler.java | 3 +- .../runtime/SAXUnmarshallerHandlerImpl.java | 3 +- .../impl/runtime/UnmarshallingContext.java | 3 +- .../impl/runtime/XMLSerializer.java | 3 +- .../jaxb/wsaddr/ActionElement.java | 4 +- .../jaxb/wsaddr/AttributedQNameType.java | 14 +- .../jaxb/wsaddr/AttributedURIType.java | 14 +- .../wsaddr/AttributedUnsignedLongType.java | 14 +- .../jaxb/wsaddr/EndpointReferenceElement.java | 4 +- .../jaxb/wsaddr/EndpointReferenceType.java | 26 +- .../jaxb/wsaddr/FaultToElement.java | 4 +- .../wsfederation/jaxb/wsaddr/FromElement.java | 4 +- .../jaxb/wsaddr/MessageIDElement.java | 4 +- .../jaxb/wsaddr/MetadataElement.java | 4 +- .../jaxb/wsaddr/MetadataType.java | 20 +- .../jaxb/wsaddr/ObjectFactory.java | 51 +-- .../jaxb/wsaddr/ProblemActionElement.java | 4 +- .../jaxb/wsaddr/ProblemActionType.java | 22 +- .../wsaddr/ProblemHeaderQNameElement.java | 4 +- .../jaxb/wsaddr/ProblemIRIElement.java | 4 +- .../wsaddr/ReferenceParametersElement.java | 4 +- .../jaxb/wsaddr/ReferenceParametersType.java | 20 +- .../jaxb/wsaddr/RelatesToElement.java | 4 +- .../jaxb/wsaddr/RelatesToType.java | 16 +- .../jaxb/wsaddr/ReplyToElement.java | 4 +- .../jaxb/wsaddr/RetryAfterElement.java | 4 +- .../wsfederation/jaxb/wsaddr/ToElement.java | 4 +- .../AdditionalContextProcessedElement.java | 4 +- .../jaxb/wsfederation/AssertionType.java | 20 +- .../AttributeExtensibleString.java | 14 +- .../wsfederation/AttributeExtensibleURI.java | 14 +- .../AttributeServiceEndpointElement.java | 4 +- .../AuthenticationTokenElement.java | 4 +- .../AutomaticPseudonymsElement.java | 4 +- .../jaxb/wsfederation/ClaimType.java | 26 +- .../wsfederation/ClientPseudonymElement.java | 4 +- .../wsfederation/ClientPseudonymType.java | 26 +- .../jaxb/wsfederation/DescriptionType.java | 14 +- .../jaxb/wsfederation/DisplayNameType.java | 14 +- .../jaxb/wsfederation/FederationElement.java | 4 +- .../wsfederation/FederationIDElement.java | 4 +- .../FederationMetadataElement.java | 4 +- .../FederationMetadataHandlerElement.java | 4 +- .../FederationMetadataHandlerType.java | 14 +- .../wsfederation/FederationMetadataType.java | 20 +- .../jaxb/wsfederation/FederationType.java | 22 +- .../wsfederation/FilterPseudonymsElement.java | 4 +- .../wsfederation/FilterPseudonymsType.java | 24 +- .../jaxb/wsfederation/Freshness.java | 16 +- .../jaxb/wsfederation/FreshnessElement.java | 4 +- .../jaxb/wsfederation/IssuerNameType.java | 16 +- .../IssuerNamesOfferedElement.java | 4 +- .../wsfederation/IssuerNamesOfferedType.java | 20 +- .../IssuesSpecificPolicyFaultElement.java | 4 +- .../jaxb/wsfederation/ObjectFactory.java | 147 +++---- .../jaxb/wsfederation/ProofTokenElement.java | 4 +- .../jaxb/wsfederation/ProofTokenType.java | 20 +- .../wsfederation/PseudonymBasisElement.java | 4 +- .../jaxb/wsfederation/PseudonymBasisType.java | 20 +- .../jaxb/wsfederation/PseudonymElement.java | 4 +- .../jaxb/wsfederation/PseudonymType.java | 24 +- .../PsuedonymServiceEndpointElement.java | 4 +- .../jaxb/wsfederation/RealmElement.java | 4 +- .../wsfederation/ReferenceDigestType.java | 14 +- .../wsfederation/ReferenceToken11Element.java | 4 +- .../wsfederation/ReferenceTokenElement.java | 4 +- .../jaxb/wsfederation/ReferenceTokenType.java | 28 +- .../jaxb/wsfederation/RelativeToElement.java | 4 +- .../jaxb/wsfederation/RelativeToType.java | 20 +- .../RequestProofTokenElement.java | 4 +- .../wsfederation/RequestProofTokenType.java | 20 +- .../wsfederation/RequestPseudonymElement.java | 4 +- .../wsfederation/RequestPseudonymType.java | 24 +- .../RequireBearerTokensElement.java | 4 +- .../RequireReferenceTokenElement.java | 4 +- .../RequireSharedCookiesElement.java | 4 +- .../RequireSignedTokensElement.java | 4 +- .../RequiresGenericClaimDialectElement.java | 4 +- .../wsfederation/SecurityTokenElement.java | 4 +- .../jaxb/wsfederation/SecurityTokenType.java | 20 +- .../jaxb/wsfederation/SignOutBasisType.java | 20 +- .../jaxb/wsfederation/SignOutElement.java | 4 +- .../jaxb/wsfederation/SignOutType.java | 26 +- ...gleSignOutNotificationEndpointElement.java | 4 +- ...gleSignOutSubscriptionEndpointElement.java | 4 +- .../TokenIssuerEndpointElement.java | 4 +- .../wsfederation/TokenIssuerNameElement.java | 4 +- .../jaxb/wsfederation/TokenKeyInfoType.java | 20 +- .../TokenKeyTransferKeyInfoElement.java | 4 +- .../TokenSigningKeyInfoElement.java | 4 +- .../jaxb/wsfederation/TokenType.java | 22 +- .../TokenTypesOfferedElement.java | 4 +- .../wsfederation/TokenTypesOfferedType.java | 22 +- .../UriNamedClaimTypesOfferedElement.java | 4 +- .../UriNamedClaimTypesOfferedType.java | 20 +- .../jaxb/wsfederation/WebBindingElement.java | 4 +- .../jaxb/wspolicy/AllElement.java | 4 +- .../jaxb/wspolicy/AppliesToElement.java | 24 +- .../jaxb/wspolicy/AppliesToType.java | 20 +- .../jaxb/wspolicy/ExactlyOneElement.java | 4 +- .../jaxb/wspolicy/ObjectFactory.java | 29 +- .../jaxb/wspolicy/OperatorContentType.java | 32 +- .../wspolicy/PolicyAttachmentElement.java | 34 +- .../jaxb/wspolicy/PolicyAttachmentType.java | 30 +- .../jaxb/wspolicy/PolicyElement.java | 22 +- .../jaxb/wspolicy/PolicyReferenceElement.java | 24 +- .../jaxb/wspolicy/PolicyReferenceType.java | 20 +- .../jaxb/wspolicy/PolicyType.java | 18 +- .../jaxb/wsse/AttributedString.java | 16 +- .../jaxb/wsse/BinarySecurityTokenElement.java | 4 +- .../jaxb/wsse/BinarySecurityTokenType.java | 16 +- .../jaxb/wsse/EmbeddedElement.java | 4 +- .../wsfederation/jaxb/wsse/EmbeddedType.java | 22 +- .../wsfederation/jaxb/wsse/EncodedString.java | 16 +- .../jaxb/wsse/KeyIdentifierElement.java | 4 +- .../jaxb/wsse/KeyIdentifierType.java | 16 +- .../wsfederation/jaxb/wsse/NonceElement.java | 4 +- .../wsfederation/jaxb/wsse/ObjectFactory.java | 49 +-- .../jaxb/wsse/PasswordElement.java | 4 +- .../jaxb/wsse/PasswordString.java | 16 +- .../jaxb/wsse/ReferenceElement.java | 4 +- .../wsfederation/jaxb/wsse/ReferenceType.java | 18 +- .../jaxb/wsse/SecurityElement.java | 4 +- .../jaxb/wsse/SecurityHeaderType.java | 20 +- .../wsse/SecurityTokenReferenceElement.java | 4 +- .../jaxb/wsse/SecurityTokenReferenceType.java | 24 +- .../wsse/TransformationParametersElement.java | 4 +- .../wsse/TransformationParametersType.java | 20 +- .../jaxb/wsse/UsernameTokenElement.java | 4 +- .../jaxb/wsse/UsernameTokenType.java | 24 +- .../jaxb/wsspolicy/AbsXPathElement.java | 4 +- .../jaxb/wsspolicy/AlgorithmSuiteElement.java | 4 +- .../wsspolicy/AsymmetricBindingElement.java | 4 +- .../jaxb/wsspolicy/Basic128Element.java | 4 +- .../jaxb/wsspolicy/Basic128Rsa15Element.java | 4 +- .../jaxb/wsspolicy/Basic128Sha256Element.java | 4 +- .../wsspolicy/Basic128Sha256Rsa15Element.java | 4 +- .../jaxb/wsspolicy/Basic192Element.java | 4 +- .../jaxb/wsspolicy/Basic192Rsa15Element.java | 4 +- .../jaxb/wsspolicy/Basic192Sha256Element.java | 4 +- .../wsspolicy/Basic192Sha256Rsa15Element.java | 4 +- .../jaxb/wsspolicy/Basic256Element.java | 4 +- .../jaxb/wsspolicy/Basic256Rsa15Element.java | 4 +- .../jaxb/wsspolicy/Basic256Sha256Element.java | 4 +- .../wsspolicy/Basic256Sha256Rsa15Element.java | 4 +- .../wsspolicy/BootstrapPolicyElement.java | 4 +- .../jaxb/wsspolicy/EmptyType.java | 14 +- .../EncryptBeforeSigningElement.java | 4 +- .../wsspolicy/EncryptSignatureElement.java | 4 +- .../wsspolicy/EncryptedElementsElement.java | 4 +- .../jaxb/wsspolicy/EncryptedPartsElement.java | 4 +- .../wsspolicy/EncryptionTokenElement.java | 4 +- ...rsingEncryptedSupportingTokensElement.java | 4 +- .../EndorsingSupportingTokensElement.java | 4 +- .../jaxb/wsspolicy/HashPasswordElement.java | 4 +- .../jaxb/wsspolicy/HeaderType.java | 18 +- .../HttpBasicAuthenticationElement.java | 4 +- .../HttpDigestAuthenticationElement.java | 4 +- .../jaxb/wsspolicy/HttpsTokenElement.java | 4 +- .../wsspolicy/IncludeTimestampElement.java | 4 +- .../jaxb/wsspolicy/InclusiveC14NElement.java | 4 +- .../InitiatorEncryptionTokenElement.java | 4 +- .../InitiatorSignatureTokenElement.java | 4 +- .../jaxb/wsspolicy/InitiatorTokenElement.java | 4 +- .../jaxb/wsspolicy/IssuedTokenElement.java | 4 +- .../jaxb/wsspolicy/IssuedTokenType.java | 26 +- .../jaxb/wsspolicy/KerberosTokenElement.java | 4 +- .../jaxb/wsspolicy/LaxElement.java | 4 +- .../jaxb/wsspolicy/LaxTsFirstElement.java | 4 +- .../jaxb/wsspolicy/LaxTsLastElement.java | 4 +- .../jaxb/wsspolicy/LayoutElement.java | 4 +- .../MustSupportClientChallengeElement.java | 4 +- .../MustSupportIssuedTokensElement.java | 4 +- .../MustSupportRefEmbeddedTokenElement.java | 4 +- .../MustSupportRefEncryptedKeyElement.java | 4 +- .../MustSupportRefExternalURIElement.java | 4 +- .../MustSupportRefIssuerSerialElement.java | 4 +- .../MustSupportRefKeyIdentifierElement.java | 4 +- .../MustSupportRefThumbprintElement.java | 4 +- .../MustSupportServerChallengeElement.java | 4 +- .../jaxb/wsspolicy/NestedPolicyType.java | 22 +- .../jaxb/wsspolicy/NoPasswordElement.java | 4 +- .../jaxb/wsspolicy/ObjectFactory.java | 267 ++++++------- .../OnlySignEntireHeadersAndBodyElement.java | 4 +- .../jaxb/wsspolicy/ProtectTokensElement.java | 4 +- .../wsspolicy/ProtectionTokenElement.java | 4 +- .../jaxb/wsspolicy/QNameAssertionType.java | 14 +- .../RecipientEncryptionTokenElement.java | 4 +- .../RecipientSignatureTokenElement.java | 4 +- .../jaxb/wsspolicy/RecipientTokenElement.java | 4 +- .../jaxb/wsspolicy/RelTokenElement.java | 4 +- .../RequestSecurityTokenTemplateType.java | 22 +- .../RequireClientCertificateElement.java | 4 +- .../RequireClientEntropyElement.java | 4 +- .../wsspolicy/RequireDerivedKeysElement.java | 4 +- .../RequireEmbeddedTokenReferenceElement.java | 4 +- .../RequireExplicitDerivedKeysElement.java | 4 +- .../RequireExternalReferenceElement.java | 4 +- .../RequireExternalUriReferenceElement.java | 4 +- .../RequireImplicitDerivedKeysElement.java | 4 +- .../RequireInternalReferenceElement.java | 4 +- .../RequireIssuerSerialReferenceElement.java | 4 +- .../RequireKeyIdentifierReferenceElement.java | 4 +- ...RequestSecurityTokenCollectionElement.java | 4 +- .../RequireServerEntropyElement.java | 4 +- .../RequireSignatureConfirmationElement.java | 4 +- .../RequireThumbprintReferenceElement.java | 4 +- .../wsspolicy/RequiredElementsElement.java | 4 +- .../SC200502SecurityContextTokenElement.java | 4 +- .../wsspolicy/SOAPNormalization10Element.java | 4 +- .../jaxb/wsspolicy/STRTransform10Element.java | 4 +- .../jaxb/wsspolicy/SamlTokenElement.java | 4 +- .../jaxb/wsspolicy/SePartsType.java | 24 +- .../SecureConversationTokenElement.java | 4 +- .../SecureConversationTokenType.java | 24 +- .../SecurityContextTokenElement.java | 4 +- .../jaxb/wsspolicy/SerElementsType.java | 24 +- .../jaxb/wsspolicy/SignatureTokenElement.java | 4 +- .../jaxb/wsspolicy/SignedElementsElement.java | 4 +- ...ignedEncryptedSupportingTokensElement.java | 4 +- ...rsingEncryptedSupportingTokensElement.java | 4 +- ...ignedEndorsingSupportingTokensElement.java | 4 +- .../jaxb/wsspolicy/SignedPartsElement.java | 4 +- .../SignedSupportingTokensElement.java | 4 +- .../wsspolicy/SpnegoContextTokenElement.java | 4 +- .../wsspolicy/SpnegoContextTokenType.java | 24 +- .../jaxb/wsspolicy/StrictElement.java | 4 +- .../wsspolicy/SupportingTokensElement.java | 4 +- .../wsspolicy/SymmetricBindingElement.java | 4 +- .../jaxb/wsspolicy/TokenAssertionType.java | 22 +- .../wsspolicy/TransportBindingElement.java | 4 +- .../jaxb/wsspolicy/TransportTokenElement.java | 4 +- .../jaxb/wsspolicy/TripleDesElement.java | 4 +- .../jaxb/wsspolicy/TripleDesRsa15Element.java | 4 +- .../wsspolicy/TripleDesSha256Element.java | 4 +- .../TripleDesSha256Rsa15Element.java | 4 +- .../jaxb/wsspolicy/Trust10Element.java | 4 +- .../jaxb/wsspolicy/UsernameTokenElement.java | 4 +- .../jaxb/wsspolicy/Wss10Element.java | 4 +- .../jaxb/wsspolicy/Wss11Element.java | 4 +- .../WssGssKerberosV5ApReqToken11Element.java | 4 +- .../WssKerberosV5ApReqToken11Element.java | 4 +- .../wsspolicy/WssRelV10Token10Element.java | 4 +- .../wsspolicy/WssRelV10Token11Element.java | 4 +- .../wsspolicy/WssRelV20Token10Element.java | 4 +- .../wsspolicy/WssRelV20Token11Element.java | 4 +- .../wsspolicy/WssSamlV11Token10Element.java | 4 +- .../wsspolicy/WssSamlV11Token11Element.java | 4 +- .../wsspolicy/WssSamlV20Token11Element.java | 4 +- .../wsspolicy/WssUsernameToken10Element.java | 4 +- .../wsspolicy/WssUsernameToken11Element.java | 4 +- .../wsspolicy/WssX509Pkcs7Token10Element.java | 4 +- .../wsspolicy/WssX509Pkcs7Token11Element.java | 4 +- .../WssX509PkiPathV1Token10Element.java | 4 +- .../WssX509PkiPathV1Token11Element.java | 4 +- .../wsspolicy/WssX509V1Token11Element.java | 4 +- .../wsspolicy/WssX509V3Token10Element.java | 4 +- .../wsspolicy/WssX509V3Token11Element.java | 4 +- .../jaxb/wsspolicy/X509TokenElement.java | 4 +- .../jaxb/wsspolicy/XPath10Element.java | 4 +- .../jaxb/wsspolicy/XPathFilter20Element.java | 4 +- .../jaxb/wsu/AttributedDateTime.java | 16 +- .../wsfederation/jaxb/wsu/AttributedURI.java | 16 +- .../wsfederation/jaxb/wsu/CreatedElement.java | 4 +- .../wsfederation/jaxb/wsu/ExpiresElement.java | 4 +- .../wsfederation/jaxb/wsu/ObjectFactory.java | 19 +- .../jaxb/wsu/TimestampElement.java | 4 +- .../wsfederation/jaxb/wsu/TimestampType.java | 30 +- .../xmlsig/CanonicalizationMethodElement.java | 4 +- .../xmlsig/CanonicalizationMethodType.java | 22 +- .../jaxb/xmlsig/DSAKeyValueElement.java | 4 +- .../jaxb/xmlsig/DSAKeyValueType.java | 40 +- .../jaxb/xmlsig/DigestMethodElement.java | 4 +- .../jaxb/xmlsig/DigestMethodType.java | 22 +- .../jaxb/xmlsig/DigestValueElement.java | 4 +- .../jaxb/xmlsig/KeyInfoElement.java | 4 +- .../wsfederation/jaxb/xmlsig/KeyInfoType.java | 36 +- .../jaxb/xmlsig/KeyNameElement.java | 4 +- .../jaxb/xmlsig/KeyValueElement.java | 4 +- .../jaxb/xmlsig/KeyValueType.java | 24 +- .../jaxb/xmlsig/ManifestElement.java | 4 +- .../jaxb/xmlsig/ManifestType.java | 22 +- .../jaxb/xmlsig/MgmtDataElement.java | 4 +- .../jaxb/xmlsig/ObjectElement.java | 4 +- .../jaxb/xmlsig/ObjectFactory.java | 135 +++---- .../wsfederation/jaxb/xmlsig/ObjectType.java | 26 +- .../jaxb/xmlsig/PGPDataElement.java | 4 +- .../wsfederation/jaxb/xmlsig/PGPDataType.java | 36 +- .../jaxb/xmlsig/RSAKeyValueElement.java | 4 +- .../jaxb/xmlsig/RSAKeyValueType.java | 22 +- .../jaxb/xmlsig/ReferenceElement.java | 4 +- .../jaxb/xmlsig/ReferenceType.java | 30 +- .../jaxb/xmlsig/RetrievalMethodElement.java | 4 +- .../jaxb/xmlsig/RetrievalMethodType.java | 24 +- .../jaxb/xmlsig/SPKIDataElement.java | 4 +- .../jaxb/xmlsig/SPKIDataType.java | 25 +- .../jaxb/xmlsig/SignatureElement.java | 4 +- .../jaxb/xmlsig/SignatureMethodElement.java | 4 +- .../jaxb/xmlsig/SignatureMethodType.java | 27 +- .../xmlsig/SignaturePropertiesElement.java | 4 +- .../jaxb/xmlsig/SignaturePropertiesType.java | 22 +- .../jaxb/xmlsig/SignaturePropertyElement.java | 4 +- .../jaxb/xmlsig/SignaturePropertyType.java | 24 +- .../jaxb/xmlsig/SignatureType.java | 28 +- .../jaxb/xmlsig/SignatureValueElement.java | 4 +- .../jaxb/xmlsig/SignatureValueType.java | 16 +- .../jaxb/xmlsig/SignedInfoElement.java | 4 +- .../jaxb/xmlsig/SignedInfoType.java | 26 +- .../jaxb/xmlsig/TransformElement.java | 4 +- .../jaxb/xmlsig/TransformType.java | 27 +- .../jaxb/xmlsig/TransformsElement.java | 4 +- .../jaxb/xmlsig/TransformsType.java | 20 +- .../jaxb/xmlsig/X509DataElement.java | 4 +- .../jaxb/xmlsig/X509DataType.java | 49 ++- .../jaxb/xmlsig/X509IssuerSerialType.java | 22 +- .../entitlement/xacml3/core/Advice.java | 21 +- .../xacml3/core/AdviceExpression.java | 23 +- .../xacml3/core/AdviceExpressions.java | 19 +- .../entitlement/xacml3/core/AllOf.java | 19 +- .../entitlement/xacml3/core/AnyOf.java | 19 +- .../entitlement/xacml3/core/Apply.java | 23 +- .../xacml3/core/AssociatedAdvice.java | 19 +- .../entitlement/xacml3/core/Attribute.java | 25 +- .../xacml3/core/AttributeAssignment.java | 19 +- .../core/AttributeAssignmentExpression.java | 25 +- .../xacml3/core/AttributeDesignator.java | 23 +- .../xacml3/core/AttributeSelector.java | 23 +- .../xacml3/core/AttributeValue.java | 21 +- .../entitlement/xacml3/core/Attributes.java | 25 +- .../xacml3/core/AttributesReference.java | 15 +- .../xacml3/core/CombinerParameter.java | 21 +- .../xacml3/core/CombinerParameters.java | 19 +- .../entitlement/xacml3/core/Condition.java | 19 +- .../entitlement/xacml3/core/Content.java | 19 +- .../entitlement/xacml3/core/DecisionType.java | 18 +- .../entitlement/xacml3/core/Defaults.java | 23 +- .../entitlement/xacml3/core/EffectType.java | 14 +- .../entitlement/xacml3/core/Expression.java | 13 +- .../entitlement/xacml3/core/Function.java | 15 +- .../entitlement/xacml3/core/IdReference.java | 19 +- .../entitlement/xacml3/core/Match.java | 29 +- .../xacml3/core/MissingAttributeDetail.java | 27 +- .../xacml3/core/MultiRequests.java | 19 +- .../entitlement/xacml3/core/Obligation.java | 21 +- .../xacml3/core/ObligationExpression.java | 23 +- .../xacml3/core/ObligationExpressions.java | 19 +- .../entitlement/xacml3/core/Obligations.java | 19 +- .../entitlement/xacml3/core/Policy.java | 49 +-- .../xacml3/core/PolicyCombinerParameters.java | 15 +- .../xacml3/core/PolicyIdentifierList.java | 21 +- .../entitlement/xacml3/core/PolicyIssuer.java | 21 +- .../entitlement/xacml3/core/PolicySet.java | 55 +-- .../core/PolicySetCombinerParameters.java | 15 +- .../entitlement/xacml3/core/Request.java | 27 +- .../xacml3/core/RequestDefaults.java | 23 +- .../xacml3/core/RequestReference.java | 19 +- .../entitlement/xacml3/core/Response.java | 19 +- .../entitlement/xacml3/core/Result.java | 29 +- .../entitlement/xacml3/core/Rule.java | 31 +- .../xacml3/core/RuleCombinerParameters.java | 15 +- .../entitlement/xacml3/core/Status.java | 23 +- .../entitlement/xacml3/core/StatusCode.java | 21 +- .../entitlement/xacml3/core/StatusDetail.java | 19 +- .../entitlement/xacml3/core/Target.java | 19 +- .../xacml3/core/VariableDefinition.java | 21 +- .../xacml3/core/VariableReference.java | 15 +- .../entitlement/xacml3/core/Version.java | 11 +- .../entitlement/xacml3/core/VersionMatch.java | 11 +- .../openam/scripting/ChainedBindings.java | 3 +- .../scripting/ScriptEngineConfiguration.java | 7 +- .../openam/scripting/ScriptEvaluator.java | 3 +- .../scripting/ThreadPoolScriptEvaluator.java | 4 +- .../scripting/api/http/GroovyHttpClient.java | 6 +- .../api/http/JavaScriptHttpClient.java | 6 +- .../sandbox/RhinoSandboxClassShutter.java | 3 +- .../beans/SecurityQuestionTransformer.java | 3 +- .../UI/AuthenticationServletBase.java | 10 +- openam-server-only/pom.xml | 7 - .../html/ja/help/tips_on_searching.html | 76 ++-- openam-server/pom.xml | 7 - .../main/java/com/iplanet/am/util/Cache.java | 23 +- .../com/iplanet/security/util/BigInt.java | 3 +- .../security/util/ByteArrayLexOrder.java | 10 +- .../security/util/ByteArrayTagOrder.java | 10 +- .../IssuingDistributionPointExtension.java | 3 +- .../iplanet/services/util/JCEEncryption.java | 9 +- .../java/com/iplanet/sso/SSOTokenEvent.java | 4 +- .../sun/identity/saml/xmlsig/KeyProvider.java | 6 +- .../security/keystore/AMPassword.java | 4 +- .../com/sun/identity/shared/Constants.java | 2 +- .../shared/datastruct/CollectionHelper.java | 4 +- .../com/sun/identity/shared/debug/Debug.java | 23 +- .../identity/shared/debug/IDebugProvider.java | 2 +- .../shared/debug/file/DebugConfiguration.java | 9 +- .../identity/shared/debug/file/DebugFile.java | 7 +- .../identity/shared/encode/CookieUtils.java | 6 +- .../identity/shared/jaxrpc/SOAPClient.java | 7 +- .../sun/identity/shared/locale/Locale.java | 7 +- .../identity/shared/search/FileLookup.java | 18 +- .../com/sun/identity/shared/stats/Stats.java | 14 +- .../identity/shared/test/CollectionUtils.java | 7 +- .../shared/test/tools/ReportGenerator.java | 3 +- .../shared/whitelist/HttpURLResourceName.java | 3 +- .../com/sun/identity/shared/xml/XMLUtils.java | 12 +- .../com/sun/identity/shared/xml/XPathAPI.java | 13 +- .../sun/identity/tools/objects/MapFormat.java | 4 +- .../shared/concurrency/LockFactory.java | 5 +- .../concurrency/ResizableSemaphore.java | 3 +- .../shared/concurrency/ThreadMonitor.java | 6 +- .../openam/shared/monitoring/RateWindow.java | 5 +- .../resourcename/BasePrefixResourceName.java | 3 + .../security/crypto/AESWrapEncryption.java | 3 +- .../shared/security/crypto/KeyStoreType.java | 9 +- .../openam/shared/sts/SharedSTSConstants.java | 5 +- .../openam/utils/DocumentBuilderProvider.java | 3 +- .../forgerock/openam/utils/MappingUtils.java | 3 +- .../java/org/forgerock/openam/utils/Time.java | 3 +- .../openam/sts/MapMarshallUtils.java | 39 +- .../sts/config/user/CustomTokenOperation.java | 3 +- .../openam/sts/config/user/SAML2Config.java | 3 +- .../config/user/RestSTSInstanceConfig.java | 5 +- .../config/user/SoapDeploymentConfig.java | 5 +- .../sts/token/model/OpenAMSessionToken.java | 3 +- .../sts/user/invocation/ProofTokenState.java | 7 +- .../openam/sts/InstanceConfigMarshaller.java | 10 +- .../openam/sts/STSPublishException.java | 6 +- .../sts/TokenCancellationException.java | 6 +- .../openam/sts/TokenCreationException.java | 6 +- .../sts/TokenIdGenerationException.java | 6 +- .../openam/sts/TokenValidationException.java | 6 +- .../token/provider/AMSessionInvalidator.java | 4 +- .../token/provider/TokenServiceConsumer.java | 4 +- .../TokenAuthenticationRequestDispatcher.java | 4 +- .../url/AuthenticationUrlProvider.java | 4 +- .../rest/RestSTSInstancePublisher.java | 10 +- .../rest/RestSTSInstancePublisherImpl.java | 6 +- .../soap/SoapSTSInstancePublisher.java | 8 +- .../RestUsernameTokenTransformValidator.java | 4 +- .../openam/sts/soap/SoapSTSConsumer.java | 4 +- .../sts/soap/audit/AuditContextFilter.java | 10 +- .../bootstrap/SoapSTSAccessTokenProvider.java | 5 +- ...pOpenIdConnectTokenAuthnContextMapper.java | 6 +- .../Saml2XmlTokenAuthnContextMapper.java | 6 +- .../wss/OpenAMWSSUsernameTokenValidator.java | 4 +- .../saml2/SAML2TokenGeneration.java | 4 +- .../saml2/StatementProvider.java | 14 +- .../AttributeStatementsProvider.java | 4 +- .../AuthenticationStatementsProvider.java | 4 +- .../saml2/statements/ConditionsProvider.java | 4 +- .../statements/DefaultAttributeMapper.java | 4 +- .../saml2/statements/SubjectProvider.java | 4 +- .../saml2/xmlsig/KeyInfoFactory.java | 6 +- .../state/STSInstanceStateFactory.java | 4 +- openam-test/pom.xml | 8 - .../openam/tokens/CoreTokenField.java | 8 +- .../forgerock/openam/tokens/package-info.java | 3 +- .../maven/plugins/CLIDefinitionGenerator.java | 16 +- .../tools/admin/BaseToolsResolver.java | 3 +- .../tools/configurator/BaseInteraction.java | 3 +- .../tools/configurator/ChoiceValidator.java | 7 +- .../configurator/FileSystemValidator.java | 5 +- .../tools/configurator/InstallException.java | 5 +- .../MigrateFromInstFinderStore.java | 17 +- .../configurator/MultipleMigrateDriver.java | 9 +- .../tools/configurator/NetworkValidator.java | 49 +-- .../configurator/UserDataInteraction.java | 33 +- .../tools/configurator/UserOptionItem.java | 7 +- .../configurator/UserResponseInteraction.java | 5 +- .../tools/configurator/ValidatorBase.java | 5 +- .../install/tools/handler/MigrateHandler.java | 5 +- .../identity/install/tools/util/Base64.java | 3 +- .../install/tools/util/ExecuteCommand.java | 9 +- .../install/tools/util/FileEditor.java | 3 +- .../install/tools/util/FileUtils.java | 112 +++--- .../install/tools/util/OSChecker.java | 53 +-- .../install/tools/util/RESTEndpoint.java | 15 +- .../install/tools/util/xml/BoundedToken.java | 5 +- .../install/tools/util/xml/Token.java | 4 +- .../install/tools/util/xml/XMLDocument.java | 10 +- .../install/tools/util/xml/XMLElement.java | 15 +- .../forgerock/openam/uma/PolicySearch.java | 19 +- .../openam/uma/UmaPolicyService.java | 10 +- .../org/forgerock/openam/uma/UmaSettings.java | 5 +- .../uma/audit/UmaAuditQueryFilterVisitor.java | 3 +- .../openam/uma/rest/ResourceSetResource.java | 16 +- .../openam/uma/rest/ResourceSetService.java | 4 +- .../openam/uma/rest/UmaLabelResource.java | 4 +- .../openam/upgrade/NewSubSchemaWrapper.java | 9 +- .../openam/upgrade/UpgradeUtils.java | 23 +- .../steps/DelegationConfigUpgradeStep.java | 4 +- .../UpgradeExternalCTSConfigurationStep.java | 4 +- .../steps/UpgradeLDAPAuthModulesStep.java | 8 +- pom.xml | 21 +- 2301 files changed, 16030 insertions(+), 15465 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..e195b512dd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# Keep HTML checked out with LF on all platforms so javadoc doclint +# (JDK 25/26) does not treat CR (from CRLF) as part of a multi-line tag name. +*.html text eol=lf diff --git a/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/AMExecutorServiceFactory.java b/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/AMExecutorServiceFactory.java index f6462b1306..74d908745a 100644 --- a/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/AMExecutorServiceFactory.java +++ b/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/AMExecutorServiceFactory.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package org.forgerock.openam.audit.context; @@ -24,9 +25,9 @@ import org.forgerock.util.thread.ExecutorServiceFactory; /** - * Responsible for filtering the API of {@ExecutorServiceFactory} to exclude any + * Responsible for filtering the API of {@link ExecutorServiceFactory} to exclude any * methods that do not offer a means of setting thread names and to ensure that - * new methods added to {@ExecutorServiceFactory} are always called via + * new methods added to {@link ExecutorServiceFactory} are always called via * {@link AuditRequestContextPropagatingExecutorServiceFactory}. * * @see ExecutorServiceFactory diff --git a/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/ConfigurableExecutorService.java b/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/ConfigurableExecutorService.java index 64b1e8a4e5..5273512fb3 100644 --- a/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/ConfigurableExecutorService.java +++ b/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/ConfigurableExecutorService.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package org.forgerock.openam.audit.context; @@ -19,7 +20,7 @@ import java.util.concurrent.ExecutorService; /** - * An ExecutorService that be re-configured after construction. + * An ExecutorService that may be re-configured after construction. * * This interface is a work-around for the fact that ThreadPoolExecutor does not implement an interface for * its configuration methods. As such, in order to re-configure a ThreadPoolExecutor after its construction diff --git a/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/TransactionIdConfiguration.java b/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/TransactionIdConfiguration.java index 326062d311..7a277ed769 100644 --- a/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/TransactionIdConfiguration.java +++ b/openam-audit/openam-audit-context/src/main/java/org/forgerock/openam/audit/context/TransactionIdConfiguration.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package org.forgerock.openam.audit.context; /** * Responsible for deciding whether or not transaction ID received as HTTP header should be accepted. - *

+ *

* The decision should be made based on the value of the System Property "org.forgerock.http.TrustTransactionHeader"; * unfortunately, due to cyclic dependency issues, it's not possible to access the com.iplanet.am.util.SystemProperties * from this module. diff --git a/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AuditEventPublisher.java b/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AuditEventPublisher.java index eb3b251c0d..549aa50837 100644 --- a/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AuditEventPublisher.java +++ b/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/AuditEventPublisher.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package org.forgerock.openam.audit; @@ -26,7 +27,7 @@ public interface AuditEventPublisher { /** * Tries to publish the provided AuditEvent to the specified topic of the AuditService. - *

+ *

* If an error occurs that prevents the AuditEvent from being published, then details regarding the error * are recorded in the debug logs. However, only details relating to the error are logged; the debug logs * are not treated as the fallback destination for audit information. diff --git a/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/configuration/AMAuditServiceConfiguration.java b/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/configuration/AMAuditServiceConfiguration.java index 74d8085cd3..fa6fbd15fd 100644 --- a/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/configuration/AMAuditServiceConfiguration.java +++ b/openam-audit/openam-audit-core/src/main/java/org/forgerock/openam/audit/configuration/AMAuditServiceConfiguration.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package org.forgerock.openam.audit.configuration; @@ -25,7 +26,7 @@ * Audit service configuration specific to OpenAM. An instance of the current state can be retrieved from * {@link AuditServiceConfigurationProvider}. The instance retrieved from {@link AuditServiceConfigurationProvider} * will represent the current settings in the SMS. - *

+ *

* Each of the Audit Services has its own configuration, which is stored with the Audit Service and can be retrieved * in a thread-safe way via its own accessor methods - * {@link AMAuditService#isAuditEnabled(String, org.forgerock.openam.audit.AuditConstants.EventName)}. diff --git a/openam-authentication/openam-auth-application/src/main/java/com/sun/identity/authentication/modules/application/Application.java b/openam-authentication/openam-auth-application/src/main/java/com/sun/identity/authentication/modules/application/Application.java index 03a65d24cd..80d342b105 100644 --- a/openam-authentication/openam-auth-application/src/main/java/com/sun/identity/authentication/modules/application/Application.java +++ b/openam-authentication/openam-auth-application/src/main/java/com/sun/identity/authentication/modules/application/Application.java @@ -25,7 +25,7 @@ * $Id: Application.java,v 1.9 2009/07/23 18:54:17 qcheng Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.authentication.modules.application; @@ -69,16 +69,16 @@ * Login.Token1 to specify secret.) For example: *

* 
- * "module=Application&IDToken0=UrlAccessAgent&IDToken1=secret"
+ * "module=Application&IDToken0=UrlAccessAgent&IDToken1=secret"
  *
* OR * 
- * "module=Application&IDToken0=&IDToken1=
- *     "
+ * "module=Application&IDToken0=<user id for Agent>&IDToken1=
+ *     <password for Agent user>"
  *
* Old usage: * 
- * "module=Application&Login.Token0=UrlAccessAgent&Login.Token1=secret"
+ * "module=Application&Login.Token0=UrlAccessAgent&Login.Token1=secret"
  *
*/ public class Application extends AMLoginModule { diff --git a/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePostAuthenticationPlugin.java b/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePostAuthenticationPlugin.java index 17955e1e4f..6d341d42cd 100644 --- a/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePostAuthenticationPlugin.java +++ b/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePostAuthenticationPlugin.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package org.forgerock.openam.authentication.modules.common; @@ -68,7 +68,7 @@ protected abstract Map generateConfig(HttpServletRequest request * @param request {@inheritDoc} * @param response {@inheritDoc} * @param ssoToken {@inheritDoc} - * @throws AuthenticationException {@inheritDoc} + * @throws AuthenticationException if the JASPI ServerAuthModule cannot secure the response */ public final void onLoginSuccess(Map requestParamsMap, HttpServletRequest request, HttpServletResponse response, SSOToken ssoToken) throws AuthenticationException { diff --git a/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/mapping/AttributeMapper.java b/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/mapping/AttributeMapper.java index 862528df71..36e9507a72 100644 --- a/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/mapping/AttributeMapper.java +++ b/openam-authentication/openam-auth-common/src/main/java/org/forgerock/openam/authentication/modules/common/mapping/AttributeMapper.java @@ -2,6 +2,7 @@  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.  *  * Copyright 2011-2015 ForgeRock AS. All rights reserved. + * Portions Copyrighted 2026 3A Systems, LLC.  *  * The contents of this file are subject to the terms  * of the Common Development and Distribution License @@ -50,7 +51,7 @@ public interface AttributeMapper { * @param attributeMapConfiguration The map of keys in the source to keys in the result. * @param source The source of values. * @return A map of attribute keys to values found. - * @throws AuthLoginException + * @throws AuthLoginException if the attributes cannot be mapped from the source */ Map> getAttributes(Map attributeMapConfiguration, T source) throws AuthLoginException; diff --git a/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/OATHPrincipal.java b/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/OATHPrincipal.java index cf327cf694..e212466e22 100644 --- a/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/OATHPrincipal.java +++ b/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/OATHPrincipal.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.authentication.modules.fr.oath; @@ -37,8 +38,6 @@ public OATHPrincipal(String name) { /** * Returns the HOTP username for this HOTPPrincipal. - *

- *

* * @return the HOTP username for this HOTPPrincipal */ @@ -48,8 +47,6 @@ public String getName() { /** * Returns a string representation of this HOTPPrincipal. - *

- *

* * @return a string representation of this HOTPPrincipal. */ @@ -62,8 +59,6 @@ public String toString() { * for equality. Returns true if the given object is also a * HOTPPrincipal and the two HOTPPrincipals * have the same username. - *

- *

* * @param o Object to be compared for equality with this * HOTPPrincipal. @@ -92,8 +87,6 @@ public boolean equals(Object o) { /** * Returns a hash code for this HOTPPrincipal. - *

- *

* * @return a hash code for this HOTPPrincipal. */ diff --git a/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/TOTPAlgorithm.java b/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/TOTPAlgorithm.java index 7b47d2cf0c..c9ce9182c6 100644 --- a/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/TOTPAlgorithm.java +++ b/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/TOTPAlgorithm.java @@ -10,6 +10,7 @@ */ /** * Portions Copyrighted 2012-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.authentication.modules.fr.oath; @@ -86,7 +87,7 @@ private static byte[] hexStr2Bytes(String hex) { * @param time a value that reflects a time * @param returnDigits number of digits to return * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP(String key, @@ -104,7 +105,7 @@ public static String generateTOTP(String key, * @param time a value that reflects a time * @param returnDigits number of digits to return * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP256(String key, @@ -121,7 +122,7 @@ public static String generateTOTP256(String key, * @param time a value that reflects a time * @param returnDigits number of digits to return * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP512(String key, @@ -140,7 +141,7 @@ public static String generateTOTP512(String key, * @param returnDigits number of digits to return * @param crypto the crypto function to use * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP(String key, diff --git a/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/HOTPPrincipal.java b/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/HOTPPrincipal.java index f39e6e8bb0..0b71c8f278 100644 --- a/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/HOTPPrincipal.java +++ b/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/HOTPPrincipal.java @@ -27,6 +27,7 @@ */ /** * Portions Copyrighted [2011] [ForgeRock AS] + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.authentication.modules.hotp; @@ -53,7 +54,6 @@ public HOTPPrincipal(String name) { /** * Returns the HOTP username for this HOTPPrincipal. * - *

* * @return the HOTP username for this HOTPPrincipal */ @@ -64,7 +64,6 @@ public String getName() { /** * Returns a string representation of this HOTPPrincipal. * - *

* * @return a string representation of this HOTPPrincipal. */ @@ -78,7 +77,6 @@ public String toString() { * HOTPPrincipal and the two HOTPPrincipals * have the same username. * - *

* * @param o Object to be compared for equality with this * HOTPPrincipal. @@ -109,7 +107,6 @@ public boolean equals(Object o) { /** * Returns a hash code for this HOTPPrincipal. * - *

* * @return a hash code for this HOTPPrincipal. */ diff --git a/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/SMSGateway.java b/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/SMSGateway.java index c06965a14f..950ce1b3cc 100644 --- a/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/SMSGateway.java +++ b/openam-authentication/openam-auth-hotp/src/main/java/com/sun/identity/authentication/modules/hotp/SMSGateway.java @@ -25,6 +25,7 @@ * $Id: SMSGateway.java,v 1.2 2009/06/03 20:46:51 veiming Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.authentication.modules.hotp; @@ -48,7 +49,6 @@ public interface SMSGateway { /** * Sends a SMS message to the phone with the code - *

* * @param from The address that sends the SMS message * @param to The address that the SMS message is sent @@ -64,7 +64,6 @@ void sendSMSMessage(String from, String to, String subject, /** * Sends an email message to the mail with the code - *

* * @param from The address that sends the E-mail message * @param to The address that the E-mail message is sent diff --git a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/ClearTextTransform.java b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/ClearTextTransform.java index 1682fc9ff1..6905e725e0 100755 --- a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/ClearTextTransform.java +++ b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/ClearTextTransform.java @@ -24,6 +24,7 @@ * * $Id: ClearTextTransform.java,v 1.2 2008/06/25 05:41:57 qcheng Exp $ * + * Portions Copyrighted 2026 3A Systems, LLC. */ @@ -46,8 +47,8 @@ public ClearTextTransform() { * * @param input Password before transform * @return Password after transform in this case the same thing. - * @throws AuthLoginException - */ + * @throws AuthLoginException if the input password is {@code null} + */ public String transform(String input) throws AuthLoginException { if (input == null) { throw new AuthLoginException( diff --git a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBC.java b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBC.java index 80938b31e2..387cd79069 100755 --- a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBC.java +++ b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBC.java @@ -26,6 +26,7 @@ * * Portions Copyrighted 2011-2016 ForgeRock AS. * Portions Copyrighted 2012 Open Source Solution Technology Corporation + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.authentication.modules.jdbc; @@ -116,9 +117,9 @@ public JDBC() { /** * Initializes parameters. * - * @param subject - * @param sharedState - * @param options + * @param subject the subject to be authenticated + * @param sharedState the state shared between authentication modules + * @param options the configuration options for this module */ public void init(Subject subject, Map sharedState, Map options) { debug.message("in initialize..."); diff --git a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBCPasswordSyntaxTransform.java b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBCPasswordSyntaxTransform.java index 2f30b57f30..6370e6f174 100755 --- a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBCPasswordSyntaxTransform.java +++ b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/JDBCPasswordSyntaxTransform.java @@ -24,6 +24,7 @@ * * $Id: JDBCPasswordSyntaxTransform.java,v 1.3 2008/06/25 05:41:57 qcheng Exp $ * + * Portions Copyrighted 2026 3A Systems, LLC. */ @@ -43,7 +44,7 @@ public interface JDBCPasswordSyntaxTransform { * * @param input Password before transform * @return Password after transform - in this case the same thing. - * @throws AuthLoginException + * @throws AuthLoginException if the password cannot be transformed */ String transform(String input) throws AuthLoginException; diff --git a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/MD5Transform.java b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/MD5Transform.java index 59eebc9fd8..5b21428a4c 100644 --- a/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/MD5Transform.java +++ b/openam-authentication/openam-auth-jdbc/src/main/java/com/sun/identity/authentication/modules/jdbc/MD5Transform.java @@ -1,3 +1,7 @@ +/* + * Portions Copyrighted 2026 3A Systems, LLC. + */ + package com.sun.identity.authentication.modules.jdbc; import java.security.MessageDigest; @@ -20,8 +24,8 @@ public MD5Transform() { * * @param input Password before transform * @return MD5 Password after transform in this case the same thing. - * @throws AuthLoginException - */ + * @throws AuthLoginException if the input password is {@code null} + */ public String transform(String input) throws AuthLoginException { if (input == null) { throw new AuthLoginException( diff --git a/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAPCallbacks.java b/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAPCallbacks.java index b2a6eba184..c5159ff24d 100644 --- a/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAPCallbacks.java +++ b/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAPCallbacks.java @@ -28,6 +28,7 @@ /* * Portions Copyrighted [2011] [ForgeRock AS] + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.authentication.modules.ldap; @@ -68,7 +69,8 @@ public LDAPCallbacks( * method of a CallbackHandler to ask for user name and * password to procees Login Page. * - * @throws LoginException + * @throws LoginException if no callback handler is available or the + * login callbacks cannot be presented to the user */ public void setLoginScreen() throws LoginException { loginCallbacks(); @@ -79,9 +81,10 @@ public void setLoginScreen() throws LoginException { * method of a CallbackHandler to ask for old, new and * confirm passwords to procees change password screen. * - * @throws LoginException + * @throws LoginException if no callback handler is available or the + * change password callbacks cannot be presented to the user */ - public void setPwdExpiryScreen() throws LoginException { + public void setPwdExpiryScreen() throws LoginException { chgPwdCallback(); } @@ -90,9 +93,12 @@ public void setPwdExpiryScreen() throws LoginException { * invokeCallback method of a CallbackHandler to * display information messages, warning messages and error messages. * - * @param type - * @param msg - * @throws LoginException + * @param type the message type to display, one of the + * TextOutputCallback constants (information, warning + * or error) + * @param msg the message text to display to the user + * @throws LoginException if no callback handler is available or the + * message callback cannot be presented to the user */ public void sendMessage(int type, String msg) throws LoginException { messageCallback(type,msg); diff --git a/openam-authentication/openam-auth-membership/src/main/java/com/sun/identity/authentication/modules/membership/Membership.java b/openam-authentication/openam-auth-membership/src/main/java/com/sun/identity/authentication/modules/membership/Membership.java index 04e872b356..2af089ef80 100644 --- a/openam-authentication/openam-auth-membership/src/main/java/com/sun/identity/authentication/modules/membership/Membership.java +++ b/openam-authentication/openam-auth-membership/src/main/java/com/sun/identity/authentication/modules/membership/Membership.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2011-2012 ForgeRock Inc. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -113,12 +114,12 @@ public void init(Subject subject, Map sharedState, Map options) { * Return STATE_SUCCEED if the login is successful, return STATE_FAILED * if the LoginModule should be ignored. * - * @param callbacks an array of Callback for this Login state + * @param callbacks an array of Callback for this Login state * @param state order of state. State order starts with 1. * @return int order of next state. Return STATE_SUCCEED if authentication * is successful, return STATE_FAILED if the * LoginModule should be ignored. - * @throws AuthLoginException + * @throws AuthLoginException if an error occurs while processing the callbacks */ public int process(Callback[] callbacks, int state) throws AuthLoginException { diff --git a/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDN.java b/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDN.java index 164c098051..ff6989642f 100644 --- a/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDN.java +++ b/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDN.java @@ -165,12 +165,12 @@ private void initAuthConfig() { /** * Validates the authentication credentials. * - * @param callbacks - * @param state + * @param callbacks the callbacks presented to this module for the request + * @param state the current authentication state * @return ISAuthConstants.LOGIN_SUCCEED on login success - * @exception AuthLoginException + * @exception AuthLoginException if the credentials cannot be validated */ - public int process(Callback[] callbacks, int state) + public int process(Callback[] callbacks, int state) throws AuthLoginException { debug.message("MSISDN : in process .."); if (errorMsgKey != null) { diff --git a/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDNValidation.java b/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDNValidation.java index b98f3bfa2b..e74ddc4ac1 100644 --- a/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDNValidation.java +++ b/openam-authentication/openam-auth-msisdn/src/main/java/com/sun/identity/authentication/modules/msisdn/MSISDNValidation.java @@ -182,11 +182,11 @@ private void initMSISDNConfig(Map options) throws AuthLoginException { } /** - * Returns user ID which has sunIdentityMSISDNNumber matching - * the msisdn number. + * Returns user ID which has sunIdentityMSISDNNumber matching + * the msisdn number. * * @param msisdnNumber to search. - * @throws AuthLoginException + * @throws AuthLoginException if the MSISDN number is invalid or the user cannot be looked up */ protected String getUserId(String msisdnNumber) throws AuthLoginException { String validatedUserID = null; diff --git a/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATH.java b/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATH.java index b601ec3744..53ce91a517 100644 --- a/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATH.java +++ b/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATH.java @@ -21,6 +21,7 @@ * your own identifying information: * * Portions Copyrighted 2014 Nomura Research Institute, Ltd + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.authentication.modules.oath; @@ -155,9 +156,9 @@ public java.security.Principal getPrincipal() { * settings, and the username from the previous authentication module in * the chain. * - * @param subject - * @param sharedState - * @param options + * @param subject the subject to be authenticated + * @param sharedState the state shared with other configured authentication modules + * @param options the options configured for this authentication module */ @Override public void init(Subject subject, @@ -232,8 +233,8 @@ public void init(Subject subject, * Processes the OTP input by the user. Checks the OTP for validity, and * resynchronizes the server as needed. * - * @param callbacks - * @param state + * @param callbacks the callbacks submitted for the current authentication state + * @param state the current authentication state * @return -1 for success; 0 for failure * @throws AuthLoginException upon any errors */ diff --git a/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATHPrincipal.java b/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATHPrincipal.java index d50ad4c586..8af4846066 100644 --- a/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATHPrincipal.java +++ b/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/OATHPrincipal.java @@ -20,6 +20,7 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted 2012 ForgeRock AS" + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.authentication.modules.oath; @@ -45,8 +46,6 @@ public OATHPrincipal(String name) { /** * Returns the HOTP username for this HOTPPrincipal. - *

- *

* * @return the HOTP username for this HOTPPrincipal */ @@ -56,8 +55,6 @@ public String getName() { /** * Returns a string representation of this HOTPPrincipal. - *

- *

* * @return a string representation of this HOTPPrincipal. */ @@ -70,8 +67,6 @@ public String toString() { * for equality. Returns true if the given object is also a * HOTPPrincipal and the two HOTPPrincipals * have the same username. - *

- *

* * @param o Object to be compared for equality with this * HOTPPrincipal. @@ -100,8 +95,6 @@ public boolean equals(Object o) { /** * Returns a hash code for this HOTPPrincipal. - *

- *

* * @return a hash code for this HOTPPrincipal. */ diff --git a/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/TOTPAlgorithm.java b/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/TOTPAlgorithm.java index 1d1bac7e06..8ef30671ea 100644 --- a/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/TOTPAlgorithm.java +++ b/openam-authentication/openam-auth-oath/src/main/java/org/forgerock/openam/authentication/modules/oath/TOTPAlgorithm.java @@ -9,7 +9,7 @@ (http://trustee.ietf.org/license-info). * * Portions Copyrighted 2012-2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.authentication.modules.oath; @@ -68,7 +68,7 @@ private static byte[] hmac_sha(String crypto, byte[] keyBytes, byte[] text) { * @param time a value that reflects a time * @param returnDigits number of digits to return * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP(byte[] key, @@ -86,7 +86,7 @@ public static String generateTOTP(byte[] key, * @param time a value that reflects a time * @param returnDigits number of digits to return * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP256(byte[] key, @@ -103,7 +103,7 @@ public static String generateTOTP256(byte[] key, * @param time a value that reflects a time * @param returnDigits number of digits to return * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP512(byte[] key, @@ -122,7 +122,7 @@ public static String generateTOTP512(byte[] key, * @param returnDigits number of digits to return * @param crypto the crypto function to use * @return a numeric String in base 10 that includes - * {@link truncationDigits} digits + * {@code truncationDigits} digits */ public static String generateTOTP(byte[] key, diff --git a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/DefaultEmailGatewayImpl.java b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/DefaultEmailGatewayImpl.java index df37258eaa..46e6d12721 100644 --- a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/DefaultEmailGatewayImpl.java +++ b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/DefaultEmailGatewayImpl.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2011 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -53,7 +54,6 @@ public DefaultEmailGatewayImpl() { /** * Sends an email message to the mail with the code - *

* * @param from The address that sends the E-mail message * @param to The address that the E-mail message is sent diff --git a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/EmailGateway.java b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/EmailGateway.java index b2d8df3c48..df5c9b0bfb 100644 --- a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/EmailGateway.java +++ b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/EmailGateway.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2011 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -30,7 +31,6 @@ public interface EmailGateway { /** * Sends an email message to the mail with the code - *

* * @param from The address that sends the E-mail message * @param to The address that the E-mail message is sent diff --git a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth2PostAuthnPlugin.java b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth2PostAuthnPlugin.java index bd02c67adb..81c36625ce 100644 --- a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth2PostAuthnPlugin.java +++ b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth2PostAuthnPlugin.java @@ -20,7 +20,7 @@  * with the fields enclosed by brackets [] replaced by  * 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 org.forgerock.openam.authentication.modules.oauth2; @@ -55,7 +55,7 @@ public class OAuth2PostAuthnPlugin implements AMPostAuthProcessInterface { * @param request HttpServletRequest object * @param response HttpServletResponse object * @param ssoToken authenticated user's ssoToken - * @exception Authentication Exception when there is an error + * @exception AuthenticationException when there is an error */ public void onLoginSuccess(Map requestParamsMap, HttpServletRequest request, diff --git a/openam-authentication/openam-auth-oidc/src/main/java/org/forgerock/openam/authentication/modules/oidc/JwtHandler.java b/openam-authentication/openam-auth-oidc/src/main/java/org/forgerock/openam/authentication/modules/oidc/JwtHandler.java index 703e101006..46cac43240 100644 --- a/openam-authentication/openam-auth-oidc/src/main/java/org/forgerock/openam/authentication/modules/oidc/JwtHandler.java +++ b/openam-authentication/openam-auth-oidc/src/main/java/org/forgerock/openam/authentication/modules/oidc/JwtHandler.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.oidc; @@ -64,7 +65,7 @@ public JwtHandler(JwtHandlerConfig config) { * * @param jwtValue The encoded JWT string. * @return The validated JWT claims. - * @throws AuthLoginException + * @throws AuthLoginException if the JWT fails validation */ public JwtClaimsSet validateJwt(String jwtValue) throws AuthLoginException { final SignedJwt signedJwt = getSignedJwt(jwtValue); @@ -140,7 +141,7 @@ public JwtClaimsSet validateJwt(String jwtValue) throws AuthLoginException { /** * Indicates whether the JWT token is issued by configured issuer, with parameterized substitution from the claims set. - * Example: https://login.microsoftonline.com/{tid}/v2.0 shall have {tid} replaced with the iss claim's value. + * Example: https://login.microsoftonline.com/{tid}/v2.0 shall have {tid} replaced with the iss claim's value. * * @param jwtClaimSet The JWT claims. * @return Whether the JWT token is issued by the configured issuer. @@ -167,7 +168,7 @@ private boolean isJwtFromIssuerFormat(JwtClaimsSet jwtClaimSet) { * * @param jwtValue The encoded JWT string. * @return The reconstructed JWT object. - * @throws AuthLoginException + * @throws AuthLoginException if the JWT cannot be reconstructed from the encoded value */ private SignedJwt getSignedJwt(String jwtValue) throws AuthLoginException { final SignedJwt signedJwt; @@ -190,7 +191,7 @@ private SignedJwt getSignedJwt(String jwtValue) throws AuthLoginException { * @param audienceName The audience name to check that the token is intended for. * @param jwtClaims The parsed JWT claims. * @return true if the token is intended for the specified audience, false if it is not. - * @throws AuthLoginException + * @throws AuthLoginException if the token audience cannot be evaluated */ public static boolean isIntendedForAudience(String audienceName, JwtClaimsSet jwtClaims) throws AuthLoginException { List jwtAudiences = jwtClaims.getAudience(); @@ -205,7 +206,7 @@ public static boolean isIntendedForAudience(String audienceName, JwtClaimsSet jw * @param jwtClaims The parsed JWT claims. * @return true if the token's authorized party is in the list of accepted authorized parties, false if it is not, * or the token does not contain an authorized party entry. - * @throws AuthLoginException + * @throws AuthLoginException if the authorized party cannot be evaluated */ public static boolean isFromValidAuthorizedParty(Set acceptedAuthorizedParties, JwtClaimsSet jwtClaims) throws AuthLoginException { @@ -225,7 +226,7 @@ public static boolean isFromValidAuthorizedParty(Set acceptedAuthorizedP * @param jwtClaims The parsed JWT claims. * @return true if the token contains an authorized party claim and that claim is not an empty string, otherwise * false. - * @throws AuthLoginException + * @throws AuthLoginException if the token's claims cannot be read */ private static boolean jwtHasAudienceClaim(JwtClaimsSet jwtClaims) throws AuthLoginException { List audienceClaim = jwtClaims.getAudience(); @@ -239,7 +240,7 @@ private static boolean jwtHasAudienceClaim(JwtClaimsSet jwtClaims) throws AuthLo * @param jwtClaims The parsed JWT claims. * @return true if the token contains an authorized party claim and that claim is not an empty string, otherwise * false. - * @throws AuthLoginException + * @throws AuthLoginException if the token's claims cannot be read */ public static boolean jwtHasAuthorizedPartyClaim(JwtClaimsSet jwtClaims) throws AuthLoginException { String authorizedPartyClaim = (String) jwtClaims.getClaim(AUTHORIZED_PARTY_CLAIM_KEY); @@ -252,7 +253,7 @@ public static boolean jwtHasAuthorizedPartyClaim(JwtClaimsSet jwtClaims) throws * * @param jwtValue The encoded JWT string. * @return The set of claims contained within the token. - * @throws AuthLoginException + * @throws AuthLoginException if the JWT cannot be parsed */ public JwtClaimsSet getJwtClaims(String jwtValue) throws AuthLoginException { SignedJwt signedJwt = getSignedJwt(jwtValue); diff --git a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java index de6ceacb75..02b0d02410 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java +++ b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2018-2025 3A Systems, LLC. + * Portions Copyrighted 2018-2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.persistentcookie; @@ -168,7 +168,7 @@ protected Map generateConfig(Subject subject, Map sharedState, M * @param callbacks {@inheritDoc} * @param state {@inheritDoc} * @return {@inheritDoc} - * @throws LoginException {@inheritDoc} + * @throws LoginException if the persistent cookie cannot be validated or the login state is incorrect */ @Override public int process(Callback[] callbacks, int state) throws LoginException { @@ -219,7 +219,7 @@ public int process(Callback[] callbacks, int state) throws LoginException { * @param clientSubject {@inheritDoc} * @param callbacks {@inheritDoc} * @return {@inheritDoc} - * @throws LoginException {@inheritDoc} + * @throws LoginException if the JWT session cookie is invalid */ @Override protected boolean process(MessageInfo messageInfo, Subject clientSubject, Callback[] callbacks) diff --git a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java index 843a22af11..c8550494da 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java +++ b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2018-2025 3A Systems, LLC. + * Portions copyright 2018-2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.persistentcookie; @@ -76,7 +76,7 @@ protected PersistentCookieAuthModulePostAuthenticationPlugin(PersistentCookieMod * @param response {@inheritDoc} * @param ssoToken {@inheritDoc} * @return {@inheritDoc} - * @throws AuthenticationException {@inheritDoc} + * @throws AuthenticationException if the configuration cannot be generated from the SSO token */ @Override protected Map generateConfig(HttpServletRequest request, HttpServletResponse response, @@ -118,7 +118,7 @@ protected Map generateConfig(HttpServletRequest request, HttpSer * @param request {@inheritDoc} * @param response {@inheritDoc} * @param ssoToken {@inheritDoc} - * @throws AuthenticationException {@inheritDoc} + * @throws AuthenticationException if an error occurs while setting the persistent cookie information */ @SuppressWarnings("unchecked") @Override diff --git a/openam-authentication/openam-auth-radius/src/main/java/com/sun/identity/authentication/modules/radius/RADIUSPrincipal.java b/openam-authentication/openam-auth-radius/src/main/java/com/sun/identity/authentication/modules/radius/RADIUSPrincipal.java index 567d93e68d..2931e77908 100755 --- a/openam-authentication/openam-auth-radius/src/main/java/com/sun/identity/authentication/modules/radius/RADIUSPrincipal.java +++ b/openam-authentication/openam-auth-radius/src/main/java/com/sun/identity/authentication/modules/radius/RADIUSPrincipal.java @@ -29,6 +29,7 @@ /* * Portions Copyrighted 2011-2015 ForgeRock AS. * Portions Copyrighted [2015] [Intellectual Reserve, Inc (IRI)] + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.authentication.modules.radius; @@ -62,8 +63,6 @@ public RADIUSPrincipal(String name) { /** * Return the RADIUS username for this RADIUSPrincipal. - *

- *

* * @return the RADIUS username for this RADIUSPrincipal */ @@ -73,8 +72,6 @@ public String getName() { /** * Return a string representation of this RADIUSPrincipal. - *

- *

* * @return a string representation of this RADIUSPrincipal. */ @@ -85,8 +82,6 @@ public String toString() { /** * Compares the specified Object with this RADIUSPrincipal for equality. Returns true if the given * object is also a RADIUSPrincipal and the two RADIUSPrincipals have the same username. - *

- *

* * @param o Object to be compared for equality with this RADIUSPrincipal. * @return true if the specified Object is equal equal to this RADIUSPrincipal. @@ -113,8 +108,6 @@ public boolean equals(Object o) { /** * Return a hash code for this RADIUSPrincipal. - *

- *

* * @return a hash code for this RADIUSPrincipal. */ diff --git a/openam-authentication/openam-auth-securid/src/main/java/com/sun/identity/authentication/modules/securid/SecurIDPrincipal.java b/openam-authentication/openam-auth-securid/src/main/java/com/sun/identity/authentication/modules/securid/SecurIDPrincipal.java index 66f77fa066..69f05106e6 100644 --- a/openam-authentication/openam-auth-securid/src/main/java/com/sun/identity/authentication/modules/securid/SecurIDPrincipal.java +++ b/openam-authentication/openam-auth-securid/src/main/java/com/sun/identity/authentication/modules/securid/SecurIDPrincipal.java @@ -28,6 +28,7 @@ /* * Portions Copyrighted [2011] [ForgeRock AS] + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.authentication.modules.securid; @@ -54,7 +55,6 @@ public SecurIDPrincipal(String name) { /** * Return the SecurID username for this SecurIDPrincipal. * - *

* * @return the SecurID username for this SecurIDPrincipal */ @@ -65,7 +65,6 @@ public String getName() { /** * Return a string representation of this SecurIDPrincipal. * - *

* * @return a string representation of this SecurIDPrincipal. */ @@ -79,7 +78,6 @@ public String toString() { * SecurIDPrincipal and the two SecurIDPrincipals * have the same username. * - *

* * @param o Object to be compared for equality with this * SecurIDPrincipal. @@ -106,7 +104,6 @@ public boolean equals(Object o) { /** * Return a hash code for this SecurIDPrincipal. * - *

* * @return a hash code for this SecurIDPrincipal. */ diff --git a/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSO.java b/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSO.java index d79a459b05..3629b282a4 100644 --- a/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSO.java +++ b/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSO.java @@ -25,7 +25,7 @@ * $Id: WindowsDesktopSSO.java,v 1.7 2009/07/28 19:40:45 beomsuk Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.authentication.modules.windowsdesktopsso; @@ -128,11 +128,11 @@ public WindowsDesktopSSO() { } /** - * Initialize parameters. + * Initialize parameters. * - * @param subject - * @param sharedState - * @param options + * @param subject the subject to be authenticated + * @param sharedState the state shared between authentication modules + * @param options the configuration options for this module */ public void init(Subject subject, Map sharedState, Map options) { this.options = options; @@ -154,8 +154,8 @@ public Principal getPrincipal() { /** * Processes the authentication request. * - * @param callbacks - * @param state + * @param callbacks the callbacks presented to this module for the request + * @param state the current authentication state * @return -1 as succeeded; 0 as failed. * @exception AuthLoginException upon any failure. */ diff --git a/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOConfig.java b/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOConfig.java index 1ad67cf24d..783230f9f6 100644 --- a/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOConfig.java +++ b/openam-authentication/openam-auth-windowsdesktopsso/src/main/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOConfig.java @@ -24,6 +24,7 @@ * * $Id: WindowsDesktopSSOConfig.java,v 1.3 2009/04/07 22:55:13 beomsuk Exp $ * + * Portions Copyrighted 2026 3A Systems, LLC. */ @@ -54,7 +55,7 @@ public class WindowsDesktopSSOConfig extends Configuration { /** * Constructor * - * @param config + * @param config the configuration this instance delegates to */ public WindowsDesktopSSOConfig(Configuration config) { this.config = config; @@ -63,7 +64,7 @@ public WindowsDesktopSSOConfig(Configuration config) { /** * Sets principal name. * - * @param principalName + * @param principalName the service principal name to set */ public void setPrincipalName(String principalName) { servicePrincipal = principalName; @@ -72,7 +73,7 @@ public void setPrincipalName(String principalName) { /** * Sets key tab file. * - * @param keytabFile + * @param keytabFile the keytab file path to set */ public void setKeyTab(String keytabFile) { keytab = keytabFile; @@ -89,7 +90,7 @@ public void setRefreshConfig(String refresh) { * Returns AppConfigurationEntry array for the application appName * using Kerberos module. * - * @param appName + * @param appName the application name to build the configuration entry for * @return Array of AppConfigurationEntry */ public AppConfigurationEntry[] getAppConfigurationEntry(String appName){ diff --git a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java index 5fbade5521..f2bbcefbf0 100644 --- a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java +++ b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java @@ -25,7 +25,7 @@ * $Id: AMCRLStore.java,v 1.7 2009/01/28 05:35:12 ww203982 Exp $ * * Portions Copyrighted 2013-2016 ForgeRock AS. - * Portions Copyrighted 2023-2025 3A Systems, LLC. + * Portions Copyrighted 2023-2026 3A Systems, LLC. */ package com.sun.identity.security.cert; @@ -125,7 +125,7 @@ public class AMCRLStore extends AMCertStore { * and all the access information for CRLDistributionPointExtension and * CRLIssuingDistributionPoint Extension * - * @param param + * @param param the LDAP certificate store parameters used to configure this CRL store */ public AMCRLStore(AMLDAPCertStoreParameters param) { super(param); @@ -134,7 +134,9 @@ public AMCRLStore(AMLDAPCertStoreParameters param) { /** * Checks certificate and returns corresponding stored CRL in ldap store * - * @param certificate + * @param certificate the certificate whose CRL should be retrieved + * @return the stored CRL for the certificate's issuer, or null if none was found + * @throws IOException if an error occurs while accessing the CRL store */ public X509CRL getCRL(X509Certificate certificate) throws IOException { SearchResultEntry crlEntry = null; @@ -227,7 +229,7 @@ public X509CRL getCRL(X509Certificate certificate) throws IOException { /** * Checks certificate and returns corresponding stored CRL in cached CRL store. * - * @param certificate + * @param certificate the certificate whose issuer is used to look up the cached CRL * @return Cached CRL information about the certificate. */ public X509CRL getCRLFromCache(X509Certificate certificate) { @@ -237,8 +239,8 @@ public X509CRL getCRLFromCache(X509Certificate certificate) { /** * Checks certificate and update CRL in cached CRL store. * - * @param certificate - * @param crl + * @param certificate the certificate whose issuer identifies the cache entry + * @param crl the CRL to store in the cache, or null to remove the cached entry */ public void updateCRLCache(X509Certificate certificate, X509CRL crl) { String issuer = CertUtils.getIssuerName(certificate); @@ -711,27 +713,28 @@ private boolean needCRLUpdate(X509CRL crl) { * (example : ldap://server:port/uid=ca,o=company.com) * This dn entry has to have CRL in attribute certificaterevocationlist * or certificaterevocationlist;binary. - *

+ *

* if attrNames does only contain one value the ldap search filter will be * (attrName=Value_of_the_corresponding_Attribute_from_SubjectDN) * e.g. SubjectDN of issuer cert 'C=BE, CN=Citizen CA, serialNumber=201007' * attrNames is 'CN', search filter used will be (CN=Citizen CA) - *

+ *

* if attrNames does contain serveral values the ldap search filter value will be * a comma separated list of name attribute values, the search attribute will be 'cn' * (cn="attrNames[0]=Value_of_the_corresponding_Attribute_from_SubjectDN, * attrNames[1]=Value_of_the_corresponding_Attribute_from_SubjectDN") - *

+ *

* e.g. SubjectDN of issuer cert 'C=BE, CN=Citizen CA, serialNumber=201007' * attrNames is {"CN","serialNumber"}, search filter used will be * (cn=CN=Citizen CA,serialNumber=201007) - *

+ *

* The order of the values of attrNames matter as they must match the value of the * 'cn' attribute of a crlDistributionPoint entry in the directory server * - * @param ldapParam - * @param cert - * @param attrNames, attributes names from the subjectDN of the issuer cert + * @param ldapParam the LDAP certificate store parameters used to connect to the store + * @param cert the certificate whose issuer CRL should be retrieved + * @param attrNames the attribute names from the subjectDN of the issuer cert used to build the search filter + * @return the CRL retrieved for the certificate's issuer, or null if none was found */ public static X509CRL getCRL(AMLDAPCertStoreParameters ldapParam, X509Certificate cert, String... attrNames) { X509CRL crl = null; diff --git a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertPath.java b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertPath.java index 46d87902df..d2f3a836c6 100644 --- a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertPath.java +++ b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertPath.java @@ -25,6 +25,7 @@ * $Id: AMCertPath.java,v 1.5 2009/07/16 00:02:24 beomsuk Exp $ * * Portions Copyrighted 2010-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.security.cert; @@ -107,9 +108,12 @@ public AMCertPath(Vector crls) } /** - * It does cert path validation together with CRL check and ocsp checking + * It does cert path validation together with CRL check and ocsp checking * if they are properly configured. - * @param certs + * @param certs the certificate chain to validate, ordered from the target certificate to the trust anchor + * @param crlEnabled true if CRL-based revocation checking should be performed + * @param ocspEnabled true if OCSP-based revocation checking should be performed + * @return true if the certificate path is valid, false otherwise **/ public boolean verify(X509Certificate[] certs, boolean crlEnabled, boolean ocspEnabled) { diff --git a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertStore.java b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertStore.java index 53981aecbc..143d2bd7ef 100644 --- a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertStore.java +++ b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCertStore.java @@ -25,6 +25,7 @@ * $Id: AMCertStore.java,v 1.5 2009/01/28 05:35:12 ww203982 Exp $ * * Portions Copyrighted 2014-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.security.cert; @@ -88,7 +89,7 @@ public class AMCertStore { * Class AMCertStore is special cased Certificate store for LDAP. * A AMCertStore instance has to have all the information for ldap. * - * @param param + * @param param the LDAP certificate store parameters used to configure this store */ public AMCertStore(AMLDAPCertStoreParameters param) { storeParam = param; @@ -193,9 +194,9 @@ SearchResultEntry getLdapEntry(Connection ldc, String... attributes) { } /** - * Return matched certificate from ldap certificate store + * Return matched certificate from ldap certificate store * - * @param cert + * @param cert the certificate to match against the store */ public X509Certificate getCertificate (X509Certificate cert) { X509Certificate c = getCertificate(); @@ -279,7 +280,7 @@ public X509Certificate getCertificate () { /** * Return value of certificate Issuer DN. * - * @param certificate + * @param certificate the certificate whose issuer DN is returned * @return The Issuer's DN as String. */ public static String getIssuerDN(X509Certificate certificate) { @@ -289,7 +290,7 @@ public static String getIssuerDN(X509Certificate certificate) { /** * Return value of certificate subject DN. * - * @param certificate + * @param certificate the certificate whose subject DN is returned * @return The Subject's DN as String. */ public static String getSubjectDN(X509Certificate certificate) throws IOException { @@ -297,10 +298,10 @@ public static String getSubjectDN(X509Certificate certificate) throws IOExceptio } /** - * Return value of certificate subject DN + * Return value of certificate subject DN * - * @param attrName - * @param attrValue + * @param attrName the attribute name to match in the search filter + * @param attrValue the attribute value to match in the search filter * @return searchFilter */ public static String setSearchFilter(String attrName, String attrValue) { @@ -317,15 +318,15 @@ public static String setSearchFilter(String attrName, String attrValue) { } /** - * Return ldapParam object has all config params + * Return ldapParam object has all config params * - * @param serverHost - * @param serverPort - * @param principleUser - * @param principlePasswd - * @param startSearchLoc - * @param uriParamsCRL - * @param isSSL + * @param serverHost the LDAP server host name + * @param serverPort the LDAP server port + * @param principleUser the bind DN used to authenticate to the LDAP server + * @param principlePasswd the bind password used to authenticate to the LDAP server + * @param startSearchLoc the base DN at which to start the search + * @param uriParamsCRL the URI parameters used when retrieving CRLs + * @param isSSL true if the connection to the LDAP server should use SSL */ public static AMLDAPCertStoreParameters setLdapStoreParam( String serverHost, int serverPort, @@ -351,9 +352,9 @@ public static AMLDAPCertStoreParameters setLdapStoreParam( /** * Return Issuer Certificate if the ldap entry has one * - * @param ldapParam - * @param cert - * @param attrName + * @param ldapParam the LDAP certificate store parameters used to connect to the store + * @param cert the certificate whose issuer certificate is looked up + * @param attrName the attribute name used to match the issuer certificate */ public static X509Certificate getIssuerCertificate ( AMLDAPCertStoreParameters ldapParam, @@ -370,9 +371,9 @@ public static X509Certificate getIssuerCertificate ( /** * Return X509 Certificate if the ldap entry has the same one * - * @param ldapParam - * @param cert - * @param attrName + * @param ldapParam the LDAP certificate store parameters used to connect to the store + * @param cert the certificate to look up and compare against the store + * @param attrName the attribute name used to match the certificate */ public static X509Certificate getRegisteredCertificate ( AMLDAPCertStoreParameters ldapParam, @@ -397,11 +398,11 @@ public static X509Certificate getRegisteredCertificate ( } /** - * Return X509 Certificate if the ldap entry has one + * Return X509 Certificate if the ldap entry has one * - * @param ldapParam - * @param attrName - * @param attrValue + * @param ldapParam the LDAP certificate store parameters used to connect to the store + * @param attrName the attribute name to match in the search filter + * @param attrValue the attribute value to match in the search filter */ public static X509Certificate getCertificate ( AMLDAPCertStoreParameters ldapParam, @@ -433,9 +434,9 @@ public static X509Certificate getCertificate ( } /** - * Return true if it is self signed ROOT CA + * Return true if it is self signed ROOT CA * - * @param cert + * @param cert the certificate to test for being a self-signed root CA */ public static boolean isRootCA(X509Certificate cert) { return CertUtils.getIssuerName(cert).equals(CertUtils.getSubjectName(cert)); diff --git a/openam-certs/src/main/java/com/sun/identity/security/cert/AMLDAPCertStoreParameters.java b/openam-certs/src/main/java/com/sun/identity/security/cert/AMLDAPCertStoreParameters.java index 854e601ab9..3a87c78e4b 100644 --- a/openam-certs/src/main/java/com/sun/identity/security/cert/AMLDAPCertStoreParameters.java +++ b/openam-certs/src/main/java/com/sun/identity/security/cert/AMLDAPCertStoreParameters.java @@ -25,6 +25,7 @@ * $Id: AMLDAPCertStoreParameters.java,v 1.3 2009/01/28 05:35:12 ww203982 Exp $ * * Portions Copyrighted 2013-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package com.sun.identity.security.cert; @@ -45,8 +46,8 @@ public class AMLDAPCertStoreParameters { private boolean doCRLupdate = true; /** - * @param server - * @param port + * @param server the LDAP server host name + * @param port the LDAP server port */ public AMLDAPCertStoreParameters(String server, int port) { serverName = server; diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/AttributeValues.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/AttributeValues.java index 32936d3297..1788414231 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/AttributeValues.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/AttributeValues.java @@ -23,6 +23,7 @@ * "Portions Copyrighted [year] [name of copyright owner]" * * Portions Copyrighted 2011-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.cli; @@ -243,7 +244,7 @@ public static List parseValues(String fileName) * @param bAdd true to add the values of map2 * map1. false to remove values of * map2 from map1. - * @return truemap1 is altered. + * @return {@code true} if {@code map1} is altered. */ public static boolean mergeAttributeValues( Map map1, @@ -282,7 +283,7 @@ public static boolean mergeAttributeValues( * @param bAdd true to add the values of map2 * map1. false to remove values of * map2 from map1. - * @return truemap1 is altered. + * @return {@code true} if {@code map1} is altered. */ public static boolean mergeAttributeValues( Map map1, diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/Debugger.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/Debugger.java index 59d64ccf2b..982b5d669f 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/Debugger.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/Debugger.java @@ -25,6 +25,7 @@ * $Id: Debugger.java,v 1.2 2008/06/25 05:42:08 qcheng Exp $ * * Portions Copyrighted 2011-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.cli; @@ -190,7 +191,7 @@ public static void error(CommandManager mgr, String msg) { * Prints error messages only if debug state is greater than * Debug.OFF. If the debug file is not accessible and debugging is enabled, * the message along with a time stamp and thread info will be printed on - * System.out.

+ * System.out. * *

This method creates the debug file if does not exist; otherwise it * starts appending to the existing debug file. When invoked for the first diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/SubCommand.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/SubCommand.java index 59e24c570b..19c0ca73fd 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/SubCommand.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/SubCommand.java @@ -25,6 +25,7 @@ * $Id: SubCommand.java,v 1.11 2008/10/21 03:14:31 veiming Exp $ * * Portions Copyrighted 2014-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.cli; @@ -442,10 +443,10 @@ public String getShortOptionName(String name) { } /** - * Returns if the option is supported. + * Returns {@code true} if the option is supported. * * @param name Name of the argument/option. - * @return if the option is supported. + * @return {@code true} if the option is supported. */ public boolean isSupportedOption(String name) { boolean isSupported = false; diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StartRecord.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StartRecord.java index 4d45c29a6e..eb6643dc67 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StartRecord.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StartRecord.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.cli.record; @@ -48,7 +49,7 @@ public class StartRecord extends AuthenticatedCommand { /** * Start recording handle * @param rc Request Context. - * @throws CLIException + * @throws CLIException if an error occurs while processing the request */ public void handleRequest(RequestContext rc) throws CLIException { super.handleRequest(rc); diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StatusRecord.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StatusRecord.java index 275f970674..67119b25ee 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StatusRecord.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StatusRecord.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.cli.record; @@ -48,7 +49,7 @@ public class StatusRecord extends AuthenticatedCommand { /** * Record * @param rc Request Context. - * @throws CLIException + * @throws CLIException if an error occurs while processing the request */ public void handleRequest(RequestContext rc) throws CLIException { super.handleRequest(rc); diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StopRecord.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StopRecord.java index a073c13387..f83d5d53e0 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StopRecord.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/record/StopRecord.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.cli.record; @@ -48,7 +49,7 @@ public class StopRecord extends AuthenticatedCommand { /** * Stop recording * @param rc Request Context. - * @throws CLIException + * @throws CLIException if an error occurs while processing the request */ public void handleRequest(RequestContext rc) throws CLIException { super.handleRequest(rc); diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/rest/RestCommand.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/rest/RestCommand.java index 4188c8759d..71a2385078 100644 --- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/rest/RestCommand.java +++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/rest/RestCommand.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.cli.rest; @@ -40,13 +41,13 @@ public class RestCommand { /** * Run a rest command with a SSO Token - * @param ssoTokenID - * @param url - * @param requestMethod - * @param headers - * @param data - * @return - * @throws IOException + * @param ssoTokenID the SSO token ID used to authenticate the request + * @param url the URL of the REST endpoint to call + * @param requestMethod the HTTP request method (for example GET or POST) + * @param headers the HTTP request headers to send + * @param data the request body to send, or empty if there is none + * @return the response body read from the REST endpoint + * @throws IOException if an I/O error occurs while communicating with the endpoint */ public String sendRestCommand(SSOTokenID ssoTokenID, URL url, String requestMethod, Map headers, String data) throws IOException { @@ -56,12 +57,12 @@ public String sendRestCommand(SSOTokenID ssoTokenID, URL url, String requestMeth /** * Run a rest command - * @param url - * @param requestMethod - * @param headers - * @param data - * @return - * @throws IOException + * @param url the URL of the REST endpoint to call + * @param requestMethod the HTTP request method (for example GET or POST) + * @param headers the HTTP request headers to send + * @param data the request body to send, or empty if there is none + * @return the response body read from the REST endpoint + * @throws IOException if an I/O error occurs while communicating with the endpoint */ public String sendRestCommand(URL url, String requestMethod, Map headers, String data) throws IOException { diff --git a/openam-console/pom.xml b/openam-console/pom.xml index 094ce9d8fb..643f47b9a7 100644 --- a/openam-console/pom.xml +++ b/openam-console/pom.xml @@ -93,14 +93,6 @@ true - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - diff --git a/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentProfileViewBean.java b/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentProfileViewBean.java index 21f1376dcf..eabd18e7e5 100644 --- a/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentProfileViewBean.java +++ b/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentProfileViewBean.java @@ -24,7 +24,7 @@ * * $Id: AgentProfileViewBean.java,v 1.14 2009/11/10 23:20:15 asyhuang Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. * */ @@ -510,7 +510,6 @@ public void handleBtnDumpRequest(RequestInvocationEvent event) throws ModelContr * Handles reset button click. * * @param event Request Invocation Event. - * @throws ModelControlException if cannot access to framework model. */ public void handleButton2Request(RequestInvocationEvent event) { forwardTo(); @@ -520,7 +519,6 @@ public void handleButton2Request(RequestInvocationEvent event) { * Handles back to main page button click. * * @param event Request Invocation Event. - * @throws ModelControlException if cannot access to framework model. */ public void handleButton3Request(RequestInvocationEvent event) { AgentsViewBean vb = (AgentsViewBean)getViewBean(AgentsViewBean.class); diff --git a/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentsViewBean.java b/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentsViewBean.java index 6b945a9d2c..ad1c8892a8 100644 --- a/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentsViewBean.java +++ b/openam-console/src/main/java/com/sun/identity/console/agentconfig/AgentsViewBean.java @@ -28,7 +28,7 @@ /* * Portions Copyrighted [2011] [ForgeRock AS] - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.agentconfig; @@ -271,10 +271,10 @@ protected boolean handleRealmNameInTabSwitch(RequestContext rc) { } /** - * Returns true>/code> if tab set of more than one tab. + * Returns {@code true} if tab set of more than one tab. * * @param event Child Display Event. - * @return true>/code> if tab set of more than one tab. + * @return {@code true} if tab set of more than one tab. */ public boolean beginTabCommonDisplay(ChildDisplayEvent event) { return (tabModel.getNodeCount() > 1); @@ -1131,7 +1131,6 @@ private List reverseParentagePath(String path) { * Handles parentage path request. * * @param event Request Invocation Event. - * @throws ModelControlException if table model cannot be restored. */ public void handleParentagepathHrefRequest(RequestInvocationEvent event) { String path = (String)getDisplayFieldValue(PARENTAGE_PATH_HREF); diff --git a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModel.java b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModel.java index cac8bed7d8..7d89845e67 100644 --- a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModel.java +++ b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModel.java @@ -24,6 +24,7 @@ * * $Id: AgentsModel.java,v 1.12 2008/12/13 07:16:09 veiming Exp $ * + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.console.agentconfig.model; @@ -273,8 +274,6 @@ boolean setGroup(String realmName, String universalId, String groupName) * Returns map of secure token service configurations. * * @return map of secure token service configurations. - * @throws AMConsoleException if sercure token service configurations cannot - * be returned. */ Map getSTSConfigurations(); @@ -282,7 +281,6 @@ boolean setGroup(String realmName, String universalId, String groupName) * Returns set of discovery configurations. * * @return set of discovery configurations. - * @throws AMConsoleException if discovery configurations cannot be returned. */ Map getDiscoveryConfigurations(); diff --git a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModelImpl.java index e9fbf580c5..43e70febcd 100644 --- a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentsModelImpl.java @@ -28,7 +28,7 @@ /** * Portions Copyrighted 2012 ForgeRock Inc - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.agentconfig.model; @@ -884,8 +884,6 @@ public Map getSecurityMechanisms(String agentType) { * Returns map of secure token service configurations. * * @return map of secure token service configurations. - * @throws AMConsoleException if secure token service configurations cannot - * be returned. */ public Map getSTSConfigurations() { try { @@ -917,7 +915,6 @@ public Map getSTSConfigurations() { * Returns map of discovery configurations. * * @return map of discovery configurations. - * @throws AMConsoleException if discovery configurations cannot be returned. */ public Map getDiscoveryConfigurations() { try { diff --git a/openam-console/src/main/java/com/sun/identity/console/authentication/EditAuthTypeViewBean.java b/openam-console/src/main/java/com/sun/identity/console/authentication/EditAuthTypeViewBean.java index 1f4621ae35..01621aed1a 100644 --- a/openam-console/src/main/java/com/sun/identity/console/authentication/EditAuthTypeViewBean.java +++ b/openam-console/src/main/java/com/sun/identity/console/authentication/EditAuthTypeViewBean.java @@ -29,7 +29,7 @@ /* * Portions Copyright 2014-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.authentication; @@ -95,7 +95,7 @@ public EditAuthTypeViewBean() { * This will populate the property sheet with attribute values for display. If this is called after * a dynamic request the values that was present on the UI (which might not have been persisted) will be used. * @param event The display event. - * @throws ModelControlException + * @throws ModelControlException if the framework model cannot be accessed. */ public void beginDisplay(DisplayEvent event) throws ModelControlException { super.beginDisplay(event); diff --git a/openam-console/src/main/java/com/sun/identity/console/base/AMViewBeanBase.java b/openam-console/src/main/java/com/sun/identity/console/base/AMViewBeanBase.java index 5642146269..98f3b229e0 100644 --- a/openam-console/src/main/java/com/sun/identity/console/base/AMViewBeanBase.java +++ b/openam-console/src/main/java/com/sun/identity/console/base/AMViewBeanBase.java @@ -25,7 +25,7 @@ * $Id: AMViewBeanBase.java,v 1.15 2009/10/19 18:17:33 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.console.base; @@ -651,7 +651,7 @@ protected void bypassForwardTo(RequestContext rc) { /** * Set location DN * - * @param dn + * @param dn the location distinguished name to set */ public void setCurrentLocation(String dn) { if (dn != null) { diff --git a/openam-console/src/main/java/com/sun/identity/console/base/ConsoleServletBase.java b/openam-console/src/main/java/com/sun/identity/console/base/ConsoleServletBase.java index 0dd38e3430..ede54d28dd 100644 --- a/openam-console/src/main/java/com/sun/identity/console/base/ConsoleServletBase.java +++ b/openam-console/src/main/java/com/sun/identity/console/base/ConsoleServletBase.java @@ -25,7 +25,7 @@ * $Id: ConsoleServletBase.java,v 1.7 2009/03/24 23:57:32 babysunil Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.base; @@ -188,7 +188,7 @@ protected void onSessionTimeout(RequestContext requestContext) * * @param requestContext - request context * @param handlerName - name of handler - * @throws ServletException + * @throws ServletException if forwarding to the invalid URL view bean fails. */ protected void onRequestHandlerNotFound( RequestContext requestContext, @@ -206,7 +206,7 @@ protected void onRequestHandlerNotFound( * Forwards to invalid URL view bean, in case of no handler specified * * @param requestContext - request context - * @throws ServletException + * @throws ServletException if forwarding to the invalid URL view bean fails. */ protected void onRequestHandlerNotSpecified(RequestContext requestContext) throws ServletException @@ -235,8 +235,8 @@ protected void onPageSessionDeserializationException( * * @param requestContext - request context * @param e Exception that was not handled by the application. - * @throws ServletException - * @throws IOException + * @throws ServletException if the error response cannot be processed. + * @throws IOException if the redirect response cannot be sent. */ protected void onUncaughtException( RequestContext requestContext, diff --git a/openam-console/src/main/java/com/sun/identity/console/base/model/AMFormatUtils.java b/openam-console/src/main/java/com/sun/identity/console/base/model/AMFormatUtils.java index 02c3cbb3ad..5e54b6b57b 100644 --- a/openam-console/src/main/java/com/sun/identity/console/base/model/AMFormatUtils.java +++ b/openam-console/src/main/java/com/sun/identity/console/base/model/AMFormatUtils.java @@ -25,6 +25,7 @@ * $Id: AMFormatUtils.java,v 1.5 2009/01/28 05:34:56 ww203982 Exp $ * * Portions Copyrighted 2011-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.console.base.model; @@ -131,7 +132,7 @@ public static OptionList getSortedOptionList(Map map, Locale locale) { /** * Gets relative distinguished name * - * @param model + * @param model the model used to resolve localized strings * @param dn - distinguished name * @return name of relative distinguished name */ diff --git a/openam-console/src/main/java/com/sun/identity/console/base/model/AMModelBase.java b/openam-console/src/main/java/com/sun/identity/console/base/model/AMModelBase.java index 470ccebdec..b6f4e3b8d9 100644 --- a/openam-console/src/main/java/com/sun/identity/console/base/model/AMModelBase.java +++ b/openam-console/src/main/java/com/sun/identity/console/base/model/AMModelBase.java @@ -26,7 +26,7 @@ * * Portions Copyrighted 2011-2016 ForgeRock AS. * Portions Copyrighted 2022 Open Identity Platform Community - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.base.model; @@ -309,7 +309,7 @@ public String getRandomString() { /** * Returns the attribute name that is used for the main user display * on user entries. This attribute is defined in the administration - * service in Search Return Attribute/code>. The FIRST entry in + * service in Search Return Attribute. The FIRST entry in * this attribute is the value returned. If the attribute contains the * following values cn uid, then cn will be * the return value. diff --git a/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java b/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java index 6b1b5a7a7a..a520248d59 100644 --- a/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java +++ b/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java @@ -25,6 +25,7 @@ * $Id: SubConfigMeta.java,v 1.2 2008/06/25 05:42:50 qcheng Exp $ * * Portions Copyrighted 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.console.base.model; @@ -128,8 +129,6 @@ public Map getCreateableSubSchemaNames() { /** * Returns sub service schema. - * - * @throws SMSException if sub schema cannot be determined. */ public ServiceSchema getServiceSchema() { return corrSchema; diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/ImportEntityViewBean.java b/openam-console/src/main/java/com/sun/identity/console/federation/ImportEntityViewBean.java index 838dbe6bd9..5ec066995a 100644 --- a/openam-console/src/main/java/com/sun/identity/console/federation/ImportEntityViewBean.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/ImportEntityViewBean.java @@ -24,7 +24,7 @@ * * $Id: ImportEntityViewBean.java,v 1.7 2009/08/21 20:09:23 veiming Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. * */ @@ -193,7 +193,7 @@ public String endPropertyAttributesDisplay( * required. * * @param event Request invocation event - * @throws ModelControlException + * @throws ModelControlException if the framework model cannot be accessed. */ public void handleButton1Request(RequestInvocationEvent event) throws ModelControlException diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/SAMLPropertyXMLBuilder.java b/openam-console/src/main/java/com/sun/identity/console/federation/SAMLPropertyXMLBuilder.java index 10025ac56a..caf299ebb1 100755 --- a/openam-console/src/main/java/com/sun/identity/console/federation/SAMLPropertyXMLBuilder.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/SAMLPropertyXMLBuilder.java @@ -24,6 +24,7 @@ * * $Id: SAMLPropertyXMLBuilder.java,v 1.7 2009/10/15 00:02:02 asyhuang Exp $ * + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.console.federation; @@ -186,7 +187,7 @@ public static SAMLPropertyXMLBuilder getInstance() { /** * get samlv1.x Property. * - * @param name + * @param name the name of the SAML property to return * @return samlv1.x Property */ public static SAMLProperty getSAMLProperty(String name) { diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModel.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModel.java index e8f7ef36ff..358aac9bc6 100755 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModel.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModel.java @@ -24,6 +24,7 @@ * * $Id: FSAuthDomainsModel.java,v 1.3 2008/06/25 05:49:39 qcheng Exp $ * + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.console.federation.model; @@ -102,7 +103,7 @@ void createAuthenticationDomain(Map attrValues, Set providers) /** * Deletes authentication domains. - * @param realm + * @param realm the realm containing the authentication domain * @param cotName Name of circle of trust * @throws AMConsoleException if authentication domains cannot be deleted. */ @@ -111,11 +112,10 @@ void deleteAuthenticationDomain(String realm, String cotName) /** * Returns attribute values. - * @param realm + * @param realm the realm containing the authentication domain * @param name Name of authentication domain. * @return attribute values. - * @throws FSAllianceManagementException if attribute values cannot be - * obtained. + * @throws AMConsoleException if attribute values cannot be obtained. */ Map getAttributeValues(String realm, String name) throws AMConsoleException; @@ -139,7 +139,7 @@ void setAttributeValues(String realm, String name, Map values) /** * Returns a set of provider names. - * @param realm + * @param realm the realm to search for provider names * @return a set of provider names. * @throws AMConsoleException if provider names cannot be obtained. */ @@ -148,7 +148,7 @@ Set getAllProviderNames(String realm) /** * Returns a set of provider names under a authentication domain. - * @param realm + * @param realm the realm containing the authentication domain * @param name Name of authentication domain. * @return a set of provider names under a authentication domain. * @throws AMConsoleException if provider names cannot be obtained. diff --git a/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModelImpl.java index 319f0cb1f9..a989dfe5e9 100755 --- a/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/federation/model/FSAuthDomainsModelImpl.java @@ -24,7 +24,7 @@ * * $Id: FSAuthDomainsModelImpl.java,v 1.12 2009/11/10 01:19:49 exu Exp $ * - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. * */ @@ -82,7 +82,7 @@ public FSAuthDomainsModelImpl(HttpServletRequest req, Map map) { } /** - * Returns a <code>Set</code> of all the authentication domains + * Returns a {@code Set} of all the authentication domains * starting from the root realm. * * @return a Set of authentication domain names. @@ -270,7 +270,7 @@ public Map getAttributeValues(String realm, String name) * * @param name Name of authentication domain. * @param values Map of attribute name to value. - * @throws IDFFMetaException if attribute values cannot be set. + * @throws AMConsoleException if attribute values cannot be set. */ public void setAttributeValues(String realm, String name, Map values) throws AMConsoleException @@ -314,7 +314,7 @@ public Map getDataMap() { } /** - * Returns a <code>Set</code> of provider names that exist in the + * Returns a {@code Set} of provider names that exist in the * specified realm. * * @param realm name of the realm to search. 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..f01b61e0c5 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; @@ -225,7 +225,7 @@ public IDFFModelImpl(HttpServletRequest req, Map map) { * @param realm the realm in which the entity resides. * @param entityName Name of Entity Descriptor. * @return provider-affiliate common attribute values. - * @throws IDFFMetaException if attribute values cannot be obtained. + * @throws AMConsoleException if attribute values cannot be obtained. */ public Map getCommonAttributeValues(String realm, String entityName) throws AMConsoleException { @@ -932,7 +932,6 @@ private void updateAttrInConfig( * @param realm where entity exists. * @param attrValues Map of attribute name to set of values. * @throws AMConsoleException if provider cannot be modified. - * @throws JAXBException if provider cannot be retrieved. */ public void updateIDPEntityConfig( String realm, @@ -985,7 +984,6 @@ public void updateIDPEntityConfig( * @param entityName name of Entity Descriptor. * @param attrValues Map of attribute name to set of values. * @throws AMConsoleException if provider cannot be modified. - * @throws JAXBException if provider cannot be retrieved. */ public void updateSPEntityConfig( String realm, @@ -1616,7 +1614,7 @@ public void updateAffiliateProfile( * * @param realm the realm in which the entity resides. * @return the IDFF entity descriptor - * @throws AMConsoleException + * @throws AMConsoleException if the entity descriptor names cannot be obtained. */ public Set getAllEntityDescriptorNames(String realm) throws AMConsoleException { diff --git a/openam-console/src/main/java/com/sun/identity/console/realm/RMRealmViewBeanBase.java b/openam-console/src/main/java/com/sun/identity/console/realm/RMRealmViewBeanBase.java index 344f6b873f..18c1d33a29 100644 --- a/openam-console/src/main/java/com/sun/identity/console/realm/RMRealmViewBeanBase.java +++ b/openam-console/src/main/java/com/sun/identity/console/realm/RMRealmViewBeanBase.java @@ -28,6 +28,7 @@ /* * Portions Copyrighted [2011] [ForgeRock AS] + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.console.realm; @@ -174,7 +175,6 @@ private List reverseParentagePath(String path) { * Handles parentage path request. * * @param event Request Invocation Event. - * @throws ModelControlException if table model cannot be restored. */ public void handleParentagepathHrefRequest(RequestInvocationEvent event) { String path = (String)getDisplayFieldValue(PARENTAGE_PATH_HREF); diff --git a/openam-console/src/main/java/com/sun/identity/console/realm/model/RMRealmModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/realm/model/RMRealmModelImpl.java index 8320a6b183..f3174fde42 100644 --- a/openam-console/src/main/java/com/sun/identity/console/realm/model/RMRealmModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/realm/model/RMRealmModelImpl.java @@ -28,7 +28,7 @@ /* * Portions Copyrighted [2011] [ForgeRock AS] - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package com.sun.identity.console.realm.model; @@ -214,8 +214,6 @@ public void deleteSubRealms(String parentRealm, Collection names) * type attributes. Returning other default values runs the risk * of violating the attribute uniqueness plugin while creating a * new realm. - * - * @throws AMConsoleException if map cannot be obtained. */ public Map getDefaultValues() { Map map = new HashMap(); @@ -247,8 +245,6 @@ public Map getDefaultValues() { /** * Returns Map of attribute name to empty set of values. - * - * @throws AMConsoleException if map cannot be obtained. */ public Map getDataMap() { Map map = new HashMap(); diff --git a/openam-console/src/main/java/com/sun/identity/console/session/model/SMSessionData.java b/openam-console/src/main/java/com/sun/identity/console/session/model/SMSessionData.java index 5cd487a292..7b431f2376 100644 --- a/openam-console/src/main/java/com/sun/identity/console/session/model/SMSessionData.java +++ b/openam-console/src/main/java/com/sun/identity/console/session/model/SMSessionData.java @@ -24,6 +24,7 @@ * * $Id: SMSessionData.java,v 1.2 2008/06/25 05:43:21 qcheng Exp $ * + * Portions Copyrighted 2026 3A Systems, LLC */ package com.sun.identity.console.session.model; @@ -109,7 +110,7 @@ public void setMaxIdleTime(long value) { /** * Set Organization * - * @param Organization + * @param organization the organization to set */ public void setOrganization(String organization) { this.organization = organization; @@ -118,7 +119,7 @@ public void setOrganization(String organization) { /** * Set Service * - * @param Service + * @param service the service to set */ public void setService(String service) { this.service = service; @@ -127,7 +128,7 @@ public void setService(String service) { /** * Set AuthType * - * @param AuthType + * @param authType the authentication type to set */ public void setAuthType(String authType) { this.authType = authType; @@ -136,7 +137,7 @@ public void setAuthType(String authType) { /** * Set AuthLevel * - * @param AuthLevel + * @param authLevel the authentication level to set */ public void setAuthLevel(String authLevel) { this.authLevel = authLevel; @@ -145,7 +146,7 @@ public void setAuthLevel(String authLevel) { /** * Set AMCtxId * - * @param AMCtxId + * @param aMCtxId the AM context ID to set */ public void setaMCtxId(String aMCtxId) { this.aMCtxId = aMCtxId; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/JsonCallbackParser.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/JsonCallbackParser.java index e01c254052..0da32fa9c9 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/JsonCallbackParser.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/JsonCallbackParser.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.authn.callbackhandlers; @@ -43,7 +44,6 @@ public interface JsonCallbackParser { * Converts the given Callback into JSON format. * * The JSON representation of the Callback MUST be in the following form: - *

* * { * type : "NameCallback", @@ -61,7 +61,6 @@ public interface JsonCallbackParser { * ] * } * - *

* * The type field MUST be the name of the Callback class. * Output fields detail information that the client can use to display to the user. 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..517b1382b6 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 @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2018 Open Identity Community. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.core.rest.authn.callbackhandlers; @@ -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-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/wrappers/AuthContextLocalWrapper.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/wrappers/AuthContextLocalWrapper.java index f2fefdc2cc..8575ee3f3b 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/wrappers/AuthContextLocalWrapper.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/wrappers/AuthContextLocalWrapper.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.authn.core.wrappers; @@ -34,7 +35,7 @@ /** * A wrapper class around AuthContextLocal. - *

+ *

* Providing a wrapper around these methods allows for easy decoupling and unit testing. */ public class AuthContextLocalWrapper implements AuthenticationContext { diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/dashboard/DashboardResource.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/dashboard/DashboardResource.java index 465137a314..06acd56c2a 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/dashboard/DashboardResource.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/dashboard/DashboardResource.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.core.rest.dashboard; @@ -74,7 +74,8 @@ public DashboardResource(@Named("frRest") Debug debug) { } /** - * {@inheritDoc} + * Reads dashboard information for the given resource identifier, which may be the dashboard + * definitions, the applications available to the user, or the applications assigned to the user. */ @Read(operationDescription = @Operation( description = DASHBOARD_RESOURCE + READ_DESCRIPTION)) diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/devices/TwoFADevicesResource.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/devices/TwoFADevicesResource.java index 2812ad2338..04b40a2940 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/devices/TwoFADevicesResource.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/devices/TwoFADevicesResource.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. +* Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.devices; @@ -34,7 +35,7 @@ * A TwoFADevice must have the ability to skip the module, if desired by the user and * the configuration of that server allows it. * - * @param + * @param the type of {@code UserDevicesDao} used to access the user's devices */ public abstract class TwoFADevicesResource extends UserDevicesResource { diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/docs/api/ApiService.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/docs/api/ApiService.java index 7e85ea01c7..80dc45b7d0 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/docs/api/ApiService.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/docs/api/ApiService.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 org.forgerock.openam.core.rest.docs.api; @@ -63,8 +63,9 @@ public class ApiService { private static final String OPERATION_DELIMITER = "#"; /** + * Constructs a new {@code ApiService}. * - * @param describableHandler + * @param describableHandler the handler used to describe and dispatch REST API requests */ @Inject public ApiService( @Named("RestHandler") DescribableHandler describableHandler) { @@ -72,11 +73,12 @@ public ApiService( @Named("RestHandler") DescribableHandler describableHandler) } /** + * Handles a request for the HTML representation of the OpenAM REST API. * - * @param request - * @return - * @throws URISyntaxException - * @throws MalformedHeaderException + * @param request the incoming API request + * @return the HTTP response containing the HTML representation of the REST API + * @throws URISyntaxException if a request URI cannot be parsed + * @throws MalformedHeaderException if a request header cannot be parsed */ @Get public Response handle(@Contextual Request request) throws URISyntaxException, MalformedHeaderException { diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DebugRecorder.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DebugRecorder.java index 284f430312..26ee9d864b 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DebugRecorder.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DebugRecorder.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.record; @@ -26,8 +27,7 @@ public interface DebugRecorder { * Start recording * * @param jsonProperties record json properties - * @return the current recording, created from the jsonProperties - * @throws RecordException if y + * @throws RecordException if an error occurs while starting the recording */ void startRecording(JsonValue jsonProperties) throws RecordException; @@ -35,7 +35,6 @@ public interface DebugRecorder { * Get the current record if exist * * @return the current record or null if we are not recording - * @throws RecordException */ Record getCurrentRecord(); @@ -43,7 +42,7 @@ public interface DebugRecorder { * Stop recording * * @return the stopped record or null if we are not recording - * @throws RecordException + * @throws RecordException if an error occurs while stopping the recording */ Record stopRecording() throws RecordException; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DefaultDebugRecorder.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DefaultDebugRecorder.java index fc65fcfb17..e5eda3490f 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DefaultDebugRecorder.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/DefaultDebugRecorder.java @@ -13,7 +13,7 @@ * * Copyright 2015-2016 ForgeRock AS. * Portions Copyrighted 2015 Nomura Research Institute, Ltd. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package org.forgerock.openam.core.rest.record; @@ -113,7 +113,7 @@ public DefaultDebugRecorder(AMExecutorServiceFactory executorServiceFactory) { /** * Start recording an issue * - * @param jsonProperties + * @param jsonProperties the JSON properties describing the recording to start * @throws RecordException throw a RecordException if the issueID doesn't exist */ public synchronized void startRecording(JsonValue jsonProperties) throws RecordException { diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/Record.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/Record.java index d905899661..a0556534ef 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/Record.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/Record.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.record; @@ -45,8 +46,8 @@ public class Record { /** * Create a RecordDebug instance * - * @param recordProperties - * @param folderPath + * @param recordProperties the properties describing the record + * @param folderPath the path of the folder where the record output is stored */ public Record(RecordProperties recordProperties, String folderPath) { this.recordProperties = recordProperties; @@ -58,7 +59,7 @@ public Record(RecordProperties recordProperties, String folderPath) { /** * Get the record properties * - * @return + * @return the record properties */ public RecordProperties getRecordProperties() { return recordProperties; @@ -67,7 +68,7 @@ public RecordProperties getRecordProperties() { /** * Get the record folder path * - * @return + * @return the record folder path */ public String getFolderPath() { return this.folderPath; @@ -76,7 +77,7 @@ public String getFolderPath() { /** * Get record status * - * @return + * @return the current record status */ public RecordStatus getRecordStatus() { return recordStatus; @@ -108,7 +109,7 @@ public void stopRecord() { /** * Get the history of the records * - * @return + * @return the history of the record statuses keyed by date */ public Map getRecordsHistory() { return recordHistory; @@ -117,7 +118,7 @@ public Map getRecordsHistory() { /** * Export into json. * - * @return + * @return the JSON representation of this record */ public JsonValue exportJson() { JsonValue properties = RecordProperties.toJson(this.getRecordProperties()); diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordException.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordException.java index 23491aa48d..c4e3ff7c86 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordException.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordException.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.record; @@ -29,7 +30,7 @@ public RecordException() { /** * Record Exception constructor with a message * - * @param message + * @param message the detail message */ public RecordException(String message) { super(message); @@ -38,8 +39,8 @@ public RecordException(String message) { /** * Record exception constructor with a message and an exception * - * @param message - * @param cause + * @param message the detail message + * @param cause the cause of this exception */ public RecordException(String message, Throwable cause) { super(message, cause); @@ -48,7 +49,7 @@ public RecordException(String message, Throwable cause) { /** * Record exception constructor with an exception * - * @param cause + * @param cause the cause of this exception */ public RecordException(Throwable cause) { super(cause); diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordProperties.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordProperties.java index 83fc43350b..3f53848df3 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordProperties.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordProperties.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.record; @@ -251,7 +252,7 @@ private static JsonValue checkIfExist(JsonValue jsonValue, String jsonLabel) { /** * Export a record properties into json * - * @param recordProperties + * @param recordProperties the record properties to export * @return json representing the record properties */ public static JsonValue toJson(RecordProperties recordProperties) { @@ -360,7 +361,7 @@ private static JsonValue toDebugLogsJson(RecordProperties recordProperties) { /** * Get Issue ID * - * @return + * @return the issue identifier */ public Long getIssueID() { return issueID; @@ -369,7 +370,7 @@ public Long getIssueID() { /** * Get Reference ID * - * @return + * @return the reference identifier */ public String getReferenceID() { return referenceID; @@ -378,7 +379,7 @@ public String getReferenceID() { /** * Get Description * - * @return + * @return the description */ public String getDescription() { return description; @@ -387,7 +388,7 @@ public String getDescription() { /** * is ThreadDump feature enable * - * @return + * @return {@code true} if thread dump is enabled */ public Boolean isThreadDumpEnabled() { return threadDumpEnable; @@ -397,7 +398,7 @@ public Boolean isThreadDumpEnabled() { * Get ThreadDump delay between two threads dumps in seconds * NB: Thread dump should be enable first * - * @return + * @return the delay in seconds between two thread dumps */ public Long getThreadDumpDelayInSeconds() { return threadDumpDelayInSeconds; @@ -406,7 +407,7 @@ public Long getThreadDumpDelayInSeconds() { /** * is config export feature enable * - * @return + * @return {@code true} if configuration export is enabled */ public Boolean isConfigExportEnabled() { return configExportEnable; @@ -415,7 +416,7 @@ public Boolean isConfigExportEnabled() { /** * is share password enable * - * @return + * @return {@code true} if the configuration export password is shared */ public Boolean isConfigExportSharePasswordEnabled() { return configExportSharePassword; @@ -425,7 +426,7 @@ public Boolean isConfigExportSharePasswordEnabled() { * Get configuration export password * NB: Config export should be enable first * - * @return + * @return the configuration export password */ public String getConfigExportPassword() { return configExportPassword; @@ -434,7 +435,7 @@ public String getConfigExportPassword() { /** * Get debug level * - * @return + * @return the debug level */ public DebugLevel getDebugLevel() { return debugLevel; @@ -443,7 +444,7 @@ public DebugLevel getDebugLevel() { /** * Is auto stop feature enable * - * @return + * @return {@code true} if the auto stop feature is enabled */ public Boolean isAutoStopEnabled() { return autoStopEnable; @@ -452,7 +453,7 @@ public Boolean isAutoStopEnabled() { /** * Is auto stop time feature enable * - * @return + * @return {@code true} if the auto stop time feature is enabled */ public Boolean isAutoStopTimeEnabled() { return autoStopTimeEnable; @@ -462,7 +463,7 @@ public Boolean isAutoStopTimeEnabled() { * Get auto stop time in milli-seconds * NB: auto stop time should be enable first * - * @return + * @return the auto stop time in milliseconds */ public Long getAutoStopTimeInMS() { return autoStopTimeInMS; @@ -471,7 +472,7 @@ public Long getAutoStopTimeInMS() { /** * is auto stop file size enable * - * @return + * @return {@code true} if the auto stop file size feature is enabled */ public Boolean isAutoStopFileSizeEnabled() { return autoStopFileSizeEnable; @@ -481,7 +482,7 @@ public Boolean isAutoStopFileSizeEnabled() { * Get auto stop file size in KB * NB: auto stop file size should be enable first * - * @return + * @return the auto stop file size in kilobytes */ public Long getAutoStopFileSizeInKB() { return autoStopFileSizedInKB; @@ -490,7 +491,7 @@ public Long getAutoStopFileSizeInKB() { /** * is zip enable * - * @return + * @return {@code true} if zipping the record output is enabled */ public Boolean isZipEnabled() { return zipEnable; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordReport.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordReport.java index da06668c4a..2eba37c67e 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordReport.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordReport.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.record; @@ -75,8 +76,8 @@ public class RecordReport { /** * Create the infoReport * - * @param record - * @return + * @param record the record to build the report from + * @return the information report as a JSON value */ public JsonValue infoReport(Record record) { JsonObject report = JsonValueBuilder.jsonValue(); @@ -117,9 +118,9 @@ private JsonValue globalInformationReport(Record record) { /** * Get Date from info report * - * @param jsonRecordProperties - * @return - * @throws ParseException + * @param jsonRecordProperties the JSON info report to extract the date from + * @return the date extracted from the info report + * @throws ParseException if the date cannot be parsed */ public Date getDateFromInfoReport(JsonValue jsonRecordProperties) throws ParseException, JsonValueException { JsonValue globalInfo = jsonRecordProperties.get(GLOBAL_INFO_LABEL).required(); @@ -203,8 +204,8 @@ private JsonValue getSystemProperties() { /** * Create the history report * - * @param record - * @return + * @param record the record whose history is reported + * @return the history report as a formatted string */ public String recordHistoryReport(Record record) { StringBuilder report = new StringBuilder(); diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordResource.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordResource.java index 7aecdd3773..d1fd6768a3 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordResource.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/record/RecordResource.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. */ package org.forgerock.openam.core.rest.record; @@ -77,7 +77,7 @@ public RecordResource(DebugRecorder debugRecorder) { /** * Start action * - * @return + * @return a promise of the action response containing the started recording status */ @Action(name = "start", operationDescription = @Operation( @@ -106,7 +106,7 @@ public Promise actionStart(Context serverCont /** * Status action * - * @return + * @return a promise of the action response containing the current recording status */ @Action(name = "status", operationDescription = @Operation( @@ -129,7 +129,7 @@ public Promise actionStatus(Context serverCon /** * Stop action * - * @return + * @return a promise of the action response for the stopped recording */ @Action(name = "stop", operationDescription = @Operation( diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/server/ServerVersionResource.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/server/ServerVersionResource.java index 9e410bb9a4..3dff712016 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/server/ServerVersionResource.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/server/ServerVersionResource.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package org.forgerock.openam.core.rest.server; @@ -74,7 +75,7 @@ private String getVersion() { } /** - * {@inheritDoc} + * Reads the server version information, including the version, revision and build date. */ @Read(operationDescription = @Operation( description = SERVER_VERSION_RESOURCE + READ_DESCRIPTION, diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/AuthenticationModuleRealmSmsHandler.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/AuthenticationModuleRealmSmsHandler.java index a25ae54d3d..4495453f55 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/AuthenticationModuleRealmSmsHandler.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/AuthenticationModuleRealmSmsHandler.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.core.rest.sms; @@ -87,8 +87,6 @@ public AuthenticationModuleRealmSmsHandler(@Named("frRest") Debug debug, @Named( /** * Returns the list of configured authentication module instances for the current realm. - * - * {@inheritDoc} */ @Query(operationDescription = @Operation(description = REALM_AUTH_MODULES + "query.description"), type = QueryType.FILTER, queryableFields = "_id") diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsCollectionProvider.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsCollectionProvider.java index f344e241d9..451d031493 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsCollectionProvider.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsCollectionProvider.java @@ -14,7 +14,7 @@ * Copyright 2015-2016 ForgeRock AS. * Portions Copyrighted 2015 Nomura Research Institute, Ltd. * Portions Copyrighted 2019 Open Source Solution Technology Corporation - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems LLC. */ package org.forgerock.openam.core.rest.sms; @@ -210,7 +210,6 @@ public Promise getCreatableTypes(Context cont /** * Creates a new child instance of config. The parent config referenced by the request path is found, and * new config is created using the provided name property. - * {@inheritDoc} */ @Create(operationDescription = @Operation) public Promise createInstance(final Context context, CreateRequest request) { @@ -279,7 +278,6 @@ private boolean matchesPattern(Collection patterns, String baseUri) { /** * Deletes a child instance of config. The parent config referenced by the request path is found, and * the config is deleted using the resourceId. - * {@inheritDoc} */ @Delete(operationDescription = @Operation) public Promise deleteInstance(Context context, final String resourceId) { @@ -326,7 +324,6 @@ public ResourceResponse apply(Void aVoid) { /** * Reads a child instance of config. The parent config referenced by the request path is found, and * the config is read using the resourceId. - * {@inheritDoc} */ @Read(operationDescription = @Operation) public Promise readInstance(Context context, String resourceId) { @@ -352,7 +349,6 @@ public Promise readInstance(Context context /** * Updates a child instance of config. The parent config referenced by the request path is found, and * the config is updated using the resourceId. - * {@inheritDoc} */ @Update(operationDescription = @Operation) public Promise updateInstance(Context context, String resourceId, @@ -388,7 +384,6 @@ public Promise updateInstance(Context conte *

* Note that only query filter is supported, and only a filter of value {@code true} (i.e. all values). * Sorting and paging are not supported. - * {@inheritDoc} */ @Query(operationDescription = @Operation, type = QueryType.FILTER, queryableFields = "*") public Promise queryCollection(Context context, QueryRequest request, diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsConsoleServiceNameFilter.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsConsoleServiceNameFilter.java index b7df116235..49550ddef5 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsConsoleServiceNameFilter.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsConsoleServiceNameFilter.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 org.forgerock.openam.core.rest.sms; @@ -50,7 +50,7 @@ * situations where the service's schema simply does not allow it to be rendered (by having blank * i18n fields). * - * The 'map' function helps to a set of internal names to a map of resourcenames -> displayable names. + * The 'map' function helps to a set of internal names to a map of resourcenames -> displayable names. * Any service where its internal name is equal to its displayable name is not included in the returned map. * */ @@ -82,7 +82,8 @@ public SmsConsoleServiceNameFilter(@Named("frRest") Debug debug, SmsConsoleServi * Filters (mutates) the provided service set to remove services which should not be displayed to the console. * * @param services The set of service identities to filter. - * @throws AMConfigurationException If there was an issue loading internal handlers and managers used to filter. + * @throws SSOException if there is a problem with the caller's single sign-on token while filtering. + * @throws SMSException if there was an issue loading internal handlers and managers used to filter. */ public void filter(Set services) throws SSOException, SMSException { filterByAuthServices(services); diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsSingletonProvider.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsSingletonProvider.java index 0e2a1a06aa..b7c907f6e3 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsSingletonProvider.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsSingletonProvider.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.core.rest.sms; @@ -139,7 +139,6 @@ protected ApiDescription initDescription(ServiceSchema schema) { /** * Reads config for the singleton instance referenced, and returns the JsonValue representation. - * {@inheritDoc} */ @Read(operationDescription = @Operation) public Promise handleRead(Context serverContext) { @@ -197,7 +196,6 @@ private void updateDynamicAttributes(Context context, JsonValue value) throws SM /** * Updates config for the singleton instance referenced, and returns the JsonValue representation. - * {@inheritDoc} */ @Update(operationDescription = @Operation) public Promise handleUpdate(Context serverContext, @@ -225,7 +223,6 @@ public Promise handleUpdate(Context serverC /** * Deletes config for the singleton instance referenced. - * {@inheritDoc} */ @Delete(operationDescription = @Operation) public Promise handleDelete(Context serverContext) { @@ -270,7 +267,6 @@ private AMIdentity getRealmIdentity(String realm, SSOToken ssoToken) throws IdRe /** * Creates config for the singleton instance referenced, and returns the JsonValue representation. - * {@inheritDoc} */ @Create(operationDescription = @Operation) public Promise handleCreate(Context serverContext, diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMAttributeSchema.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMAttributeSchema.java index ffdaf9213f..8a43e4eecd 100644 --- a/openam-core/src/main/java/com/iplanet/am/sdk/AMAttributeSchema.java +++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMAttributeSchema.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -340,7 +341,7 @@ public String getCosQualifier() { * The method returns the default value of the attribute; * * @return Set containing the default values of the attribute or - * Collections.EMPTY_SET otherwise + * Collections.EMPTY_SET otherwise */ public Set getDefaultValues() { return attrSchema.getDefaultValues(); @@ -383,6 +384,7 @@ public String getI18NKey() { * @param i18nKey * value of i18nKey. * @throws AMException + * if an error occurs while setting the I18N key */ public void setI18NKey(String i18nKey) throws AMException { try { diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMCallBack.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMCallBack.java index 6a909cda1d..8eb5574126 100644 --- a/openam-core/src/main/java/com/iplanet/am/sdk/AMCallBack.java +++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMCallBack.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -63,18 +64,15 @@ *

* Note: *

    - *

    *

  • When more than one plugin modules are configured at a particular * Organization level, the call backs for each of the plugins will occur one * after the other. Also, note that the order in which plugins are called back * is cannot pre-determined in any way. - * - *

    + * *

  • Since the methods of this class will be invoked by the Identity Server * SDK and will control the flow of SDK, extreme caution should be taken while * overriding these methods to avoid performance bottle necks. - * - *

    + * *

  • The exceptions thrown by the pre-processing methods of this class will * be treated as a failure of external processing and the operation in progress * will be halted by the SDK. The exception thrown should include a proper user @@ -168,7 +166,7 @@ public Map getAttributes(SSOToken token, String entryDN, Set attrNames) { *
  • {@link AMObject#ASSIGNABLE_DYNAMIC_GROUP * AMObject.ASSIGNABLE_DYNAMIC_GROUP} *
- * @return Map of updated values for attributes or null. If this + * @return Map of updated values for attributes or null. If this * returned map is not null, then this map will be used while * performing the operation. * @throws AMPreCallBackException if an @@ -417,7 +415,7 @@ public void postProcessDelete(SSOToken token, String entryDN, * AMObject.ASSIGNABLE_DYNAMIC_GROUP} * * - * @return Set of updated values for members or null. If null + * @return Set of updated values for members or null. If null * value or empty set is returned, no users will be added. Hence, if no * modification is being performed to the original set, it needs to be * back. @@ -487,7 +485,7 @@ public void postProcessAddUser(SSOToken token, String entryDN, Set members, * AMObject.ASSIGNABLE_DYNAMIC_GROUP} * * - * @return Set of updated values for members or null. If null + * @return Set of updated values for members or null. If null * value or empty set is returned, no users will be removed. Hence, if no * modification is being performed to the original set, it needs to be * back. diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMCommonUtils.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMCommonUtils.java index f211f5c8f2..2a963aaf2a 100644 --- a/openam-core/src/main/java/com/iplanet/am/sdk/AMCommonUtils.java +++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMCommonUtils.java @@ -25,6 +25,7 @@ * $Id: AMCommonUtils.java,v 1.7 2009/01/28 05:34:46 ww203982 Exp $ * * Portions Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ package com.iplanet.am.sdk; @@ -143,7 +144,7 @@ protected static String getUserLocale(SSOToken token) { * the first AttrSet * @param attrSet2 * the second AttrSet - * @return an AttrSet which has combined values of attrSet1 & attrSet2 + * @return an AttrSet which has combined values of attrSet1 & attrSet2 */ protected static AttrSet combineAttrSets(AttrSet attrSet1, AttrSet attrSet2) { @@ -456,7 +457,7 @@ public static Set updateAndGetRemovableOCs(Set origSet, Set removeOCs) { * remove these attributes from newly created entries. Such empty sets * should be ignored, when entry is being created. * - * @param attrMap + * @param attrMap the attribute-value map from which empty value sets are removed * @return map without empty set. */ public static Map removeEmptyValues(Map attrMap) { diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMEntityType.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMEntityType.java index 55091f4d3d..215b037aee 100644 --- a/openam-core/src/main/java/com/iplanet/am/sdk/AMEntityType.java +++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMEntityType.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -42,7 +43,6 @@ * This class defines a supported managed object type by AM SDK * It defines the name, type, service name of the object. A set of the supported * types can be obtained by using the class AMStoreConnection: - *

* * 

  * 
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMEvent.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMEvent.java
index 65c34f8679..2e45af4aa0 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMEvent.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMEvent.java
@@ -25,6 +25,7 @@
  * $Id: AMEvent.java,v 1.8 2009/01/28 05:34:47 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk;
@@ -167,7 +168,6 @@ public int getEventType() {
 
     /**
      * Returns the type of the source object that caused the event.
-     * 

      * @return Returns one of the following possible values:
      * 
    
      * 
  •  AMObject.USER
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMObjectImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMObjectImpl.java
index a861ad07be..c2542383de 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMObjectImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMObjectImpl.java
@@ -25,6 +25,7 @@
  * $Id: AMObjectImpl.java,v 1.14 2009/11/20 23:52:51 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk;
@@ -111,7 +112,7 @@ class AMObjectImpl implements AMObject {
     /**
      * Hash table used to keep track of elements that need to be removed from
      * objImplListeners table when a SSOToken is no longer valid. The key is
-     * SSOTokenId & the value is a Set of DN's.
+     * SSOTokenId & the value is a Set of DN's.
      */
     protected static Hashtable profileNameTable = new Hashtable();
 
@@ -1622,7 +1623,6 @@ public void removeAttributes(Set attrNames) throws AMException,
      * UnRegister a previously registered event listener. If the
      * listener was not registered, the method simply returns
      * without doing anything.
-     * 
    
      * 
      * @param listener
      *            listener object that will be removed or unregistered.
@@ -2046,7 +2046,7 @@ protected String getSearchFilter(int objectType, String searchTempName) {
 
     /**
      * Notifies ACI Change. This method will be called by the
-     * AMIdRepoListener to send
+     * AMIdRepoListener to send
      * notifications to all interested AMObjectImp's whenever an ACI
      * change occurs.
      *
@@ -2106,7 +2106,6 @@ protected static void notifyACIChangeEvent(String dn, int eventType) {
     /**
      * This method will be called EntryEventListener to send notifications to
      * all interested AMObjectImp's whenever an Entry Event occurs.
-     * 
    
      * 
      * @param dn
      *            the object that is modified
@@ -2208,7 +2207,6 @@ protected static void sendExpiryEvent(String sourceDN, int sourceType) {
      * This method removes the entry corresponding to SSOTokenID supplied.
      * 
      * @return Set of DN's for the given SSOTokenID or null if not present
-     *         
    
      * 
      * @param ssoToken -
      *            a SSOToken
@@ -3348,7 +3346,6 @@ private String mapToString(Map map) {
     /**
      * Sends event notifications to all the listeners that correspond to a DN
      * whose suffix which ends with affectedDN in the objImpListeners.
-     * 
    
      * 
      * @param affectedDN -
      *            String which has been stripped to reflect the subtree of DN's
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganization.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganization.java
index 61022f996b..b183d95bbd 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganization.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganization.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -888,8 +889,8 @@ public Set createAssignableDynamicGroups(Set assignableDynamicGroups)
      *            attribute-value pairs to be set
      * @param serviceNameAndAttrs
      *            service name and attribute map where the map is like this:
-     *            <serviceName><AttrMap>
-     *      (attrMap=<attrName><Set of attrvalues>)
+     *            <serviceName><AttrMap>
+     *      (attrMap=<attrName><Set of attrvalues>)
      * @return AMGroup object of newly created group.
      * @throws AMException
      *             if an error is encountered when trying to access/retrieve
@@ -1116,15 +1117,15 @@ public Set createDynamicGroups(Map dynamicGroups) throws AMException,
             SSOException;
 
     /**
-     * Creates dynamic group. Takes serviceNameAndAttr map
+     * Creates dynamic group. Takes serviceNameAndAttr map
      * so that services can be assigned to the group which is just created.
      *
      * @param name of group to be created
      * @param attributes to be set in group 
      * @param serviceNameAndAttrs service name and attribute map where the map
      *        is like this:
-     * <serviceName><AttrMap>
-     *       (attrMap=<attrName><Set of attrvalues>)
+     * <serviceName><AttrMap>
+     *       (attrMap=<attrName><Set of attrvalues>)
      * @return AMGroup object of newly created group.
      * @throws AMException if an error is encountered when trying to
      *         access/retrieve data from the data store.
@@ -1351,8 +1352,8 @@ public AMSearchResults searchDynamicGroups(String wildcard, Map avPairs,
      *            to be set in group node.
      * @param serviceNameAndAttrs
      *            service name and attribute map where the map is like this:
-     *            <serviceName><AttrMap>
-     *              (attrMap=<attrName><Set of attrvalues>).
+     *            <serviceName><AttrMap>
+     *              (attrMap=<attrName><Set of attrvalues>).
      * @return AMGroup object of newly created group.
      * @throws AMException
      *             if an error is encountered when trying to access/retrieve
@@ -2009,7 +2010,9 @@ public AMUser createUser(String uid, Map attrMap, Map serviceNameAndAttrs)
      *            search template.
      * @return AMUser object of user found.
      * @throws AMException
+     *             if an error occurs while retrieving the user
      * @throws SSOException
+     *             if the single sign-on token is invalid or has expired
      */
     AMUser getUser(String uid, String userSearchTemplate) throws AMException,
             SSOException;
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationImpl.java
index fc17be5e34..e13e3c948b 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationImpl.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -2724,7 +2725,7 @@ public AMSearchResults searchUsers(String wildcard, Map avPairs,
      * @param searchControl
      *            specifies the search scope to be used, VLV ranges etc.,
      * @param avfilter
-     *            this attribute-value pairs filter will be & with user search
+     *            this attribute-value pairs filter will be & with user search
      *            filter
      * 
      * @return AMSearchResults which contains a Set DNs of Users matching the
@@ -2751,7 +2752,7 @@ public AMSearchResults searchUsers(String wildcard,
      * @param searchControl
      *            specifies the search scope to be used, VLV ranges etc.,
      * @param avfilter
-     *            this attribute-value pairs filter will be & with user search
+     *            this attribute-value pairs filter will be & with user search
      *            filter
      * 
      * @return AMSearchResults which contains a Set DNs of Users matching the
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationalUnitImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationalUnitImpl.java
index 0444b69afc..8a4af7c7ee 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationalUnitImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMOrganizationalUnitImpl.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -2294,7 +2295,7 @@ public AMSearchResults searchUsers(String wildcard, Map avPairs,
      * @param searchControl
      *            specifies the search scope to be used, VLV ranges etc.,
      * @param avfilter
-     *            this attribute-value pairs filter will be & with user search
+     *            this attribute-value pairs filter will be & with user search
      *            filter
      * 
      * @return AMSearchResults which contains a Set DNs of Users matching the
@@ -2321,7 +2322,7 @@ public AMSearchResults searchUsers(String wildcard,
      * @param searchControl
      *            specifies the search scope to be used, VLV ranges etc.,
      * @param avfilter
-     *            this attribute-value pairs filter will be & with user search
+     *            this attribute-value pairs filter will be & with user search
      *            filter
      * 
      * @return AMSearchResults which contains a Set DNs of Users matching the
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMPeopleContainerImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMPeopleContainerImpl.java
index 94650c1c38..62307c4e73 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMPeopleContainerImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMPeopleContainerImpl.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -550,7 +551,7 @@ public AMSearchResults searchUsers(String wildcard, Map avPairs,
      * @param searchControl
      *            specifies the search scope to be used, VLV ranges etc.,
      * @param avfilter
-     *            this attribute-value pairs filter will be & with user search
+     *            this attribute-value pairs filter will be & with user search
      *            filter
      * 
      * @return AMSearchResults which contains a Set DNs of Users matching the
@@ -580,7 +581,7 @@ public AMSearchResults searchUsers(String wildcard,
      * @param searchControl
      *            specifies the search scope to be used, VLV ranges etc.,
      * @param avfilter
-     *            this attribute-value pairs filter will be & with user search
+     *            this attribute-value pairs filter will be & with user search
      *            filter
      * 
      * @return AMSearchResults which contains a Set DNs of Users matching the
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMStoreConnection.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMStoreConnection.java
index 50a15b3a88..b8ac773142 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMStoreConnection.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMStoreConnection.java
@@ -25,6 +25,7 @@
  * $Id: AMStoreConnection.java,v 1.13 2009/01/28 05:34:47 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk;
@@ -598,7 +599,7 @@ public AMOrganization getOrganization(String orgDN) throws SSOException {
      *            returned. A "/" separated string is assumed to represent an
      *            existing organization DN in the DIT. For example:
      *            /iplanet/sun is converted to a DN
-     *            (o=iplanet,o=sun,<base DN>) and the validity
+     *            (o=iplanet,o=sun,<base DN>) and the validity
      *            of this DN is checked and returned. Any other string is
      *            assumed to be either a domain or an associated domain or the
      *            organization name. The search filter is created accordingly.
@@ -1387,6 +1388,7 @@ public void purge(String domainName, int graceperiod) throws AMException,
      *             if there is an error in deleting the user, or if the user
      *             callbacks thrown an exception
      * @throws SSOException
+     *             if the single sign-on token is invalid or has expired
      */
     public void purgeUser(String uid, String domainName, int graceperiod)
             throws AMException, SSOException {
@@ -1439,6 +1441,7 @@ public void purgeUser(String uid, String domainName, int graceperiod)
      *             if there is an error in deleting the user, or if the user
      *             callbacks thrown an exception
      * @throws SSOException
+     *             if the single sign-on token is invalid or has expired
      */
     public void purgeResource(String rid, String domainName, int graceperiod)
             throws AMException, SSOException {
@@ -1492,6 +1495,7 @@ public void purgeResource(String rid, String domainName, int graceperiod)
      *             if there is an error in deleting the group, or if the
      *             callbacks thrown an exception
      * @throws SSOException
+     *             if the single sign-on token is invalid or has expired
      */
     public void purgeGroup(String gid, String domainName, int graceperiod)
             throws AMException, SSOException {
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/AMTemplate.java b/openam-core/src/main/java/com/iplanet/am/sdk/AMTemplate.java
index 0e259d4645..b0ae30c98a 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/AMTemplate.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/AMTemplate.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -161,6 +162,7 @@ public interface AMTemplate extends AMObject {
      *         
      
      *         
    •  DYNAMIC_TEMPLATE
      *         
    •  ORGANIZATION_TEMPLATE
+     *         
    
      */
     public int getType();
 
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/common/CacheBlockBase.java b/openam-core/src/main/java/com/iplanet/am/sdk/common/CacheBlockBase.java
index 65af52349e..4e9ac4fe6d 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/common/CacheBlockBase.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/common/CacheBlockBase.java
@@ -25,7 +25,7 @@
  * $Id: CacheBlockBase.java,v 1.6 2009/10/29 00:28:46 hengming Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2023 3A Systems LLC
+ * Portions Copyrighted 2023-2026 3A Systems LLC
  */
 
 package com.iplanet.am.sdk.common;
@@ -199,7 +199,7 @@ public String getEntryDN() {
      * NOTE: Call to this method should preceeded with
      * expiredAndUpdated() check. For example, isExists() return value holds
      * good only it the entry has not expired. So, check anywhere it is called
-     * the check should be if (!cb.expiredAndUpdated() && cb.isExists()) or
+     * the check should be if (!cb.expiredAndUpdated() && cb.isExists()) or
      * similar.
      *
      * @return true if it represents a valid entry, false otherwise
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/common/IComplianceServices.java b/openam-core/src/main/java/com/iplanet/am/sdk/common/IComplianceServices.java
index 4372a0b40e..25558f8382 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/common/IComplianceServices.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/common/IComplianceServices.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -69,7 +70,7 @@ public void verifyAndDeleteObject(SSOToken token, String profileDN)
     /**
      * Returns the search filter to be used for searching deleted objects. For
      * example, for searching deleted users, the search filter is
-     *  (&(objectclass=inetOrgPerson)(inetUserStatus=deleted)) .
+     *  (&(objectclass=inetOrgPerson)(inetUserStatus=deleted)) .
      * The search filters are configured in the Admin Console service
      * 
      * @param objectType
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/common/IDirectoryServices.java b/openam-core/src/main/java/com/iplanet/am/sdk/common/IDirectoryServices.java
index f038c00ffc..458651c526 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/common/IDirectoryServices.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/common/IDirectoryServices.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -76,8 +77,7 @@ public interface IDirectoryServices {
     public boolean doesEntryExists(SSOToken token, String entryDN);
 
     /**
-     * Returns the integer type of the object represented by the  DN
-     * .
+     * Returns the integer type of the object represented by the DN.
      * 
      * @param token
      *            User's single sign on token
@@ -392,7 +392,7 @@ public void createEntry(SSOToken token, String entryName, int objectType,
      * @param objectType
      *            profile type
      * @param recursive
-     *            if true, remove all sub entries & the object
+     *            if true, remove all sub entries & the object
      * @param softDelete
      *            Used to let pre/post callback plugins know that this delete is
      *            either a soft delete (marked for deletion) or a purge/hard
@@ -530,8 +530,11 @@ public void changePassword(SSOToken token, String entryDN, String attrName,
      * @param entryDN
      *            DN of the profile
      * @param profileType
+     *            the profile type of the entry
      * @throws AMException
+     *             if an error occurs while retrieving the group filter and scope
      * @throws SSOException
+     *             if the single sign-on token is invalid or has expired
      */
     public String[] getGroupFilterAndScope(SSOToken token, String entryDN,
             int profileType) throws SSOException, AMException;
@@ -696,6 +699,7 @@ public String createAMTemplate(SSOToken token, String entryDN,
      * objectclass.
      * 
      * @param objectclass
+     *            the object class whose attributes are returned
      * @return The set of attribute names (both required and optional) for this
      *         objectclass
      */
@@ -707,7 +711,7 @@ public String createAMTemplate(SSOToken token, String entryDN,
      * @param objectType
      *            Integere represenintg object type.
      * @param orgDN
-     *            Organization 
+     *            Organization DN
      * @param searchTemplateName
      *            Name of search template
      * @return Search filter
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/common/MiscUtils.java b/openam-core/src/main/java/com/iplanet/am/sdk/common/MiscUtils.java
index b4aeebed8b..20d320f620 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/common/MiscUtils.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/common/MiscUtils.java
@@ -25,6 +25,7 @@
  * $Id: MiscUtils.java,v 1.5 2009/01/28 05:34:47 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.common;
@@ -126,7 +127,7 @@ public static String getUserLocale(SSOToken token) {
      *            the first AttrSet
      * @param attrSet2
      *            the second AttrSet
-     * @return an AttrSet which has combined values of attrSet1 & attrSet2
+     * @return an AttrSet which has combined values of attrSet1 & attrSet2
      */
     public static AttrSet combineAttrSets(AttrSet attrSet1, AttrSet attrSet2) {
 
@@ -438,7 +439,7 @@ public static Set updateAndGetRemovableOCs(Set origSet, Set removeOCs) {
      * remove these attributes from newly created entries. Such empty sets
      * should be ignored, when entry is being created.
      * 
-     * @param attrMap
+     * @param attrMap the attribute-value map from which empty value sets are removed
      * @return map without empty set.
      */
     public static Map removeEmptyValues(Map attrMap) {
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ACIEventListener.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ACIEventListener.java
index 562c0c68dd..9906af3ba0 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ACIEventListener.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ACIEventListener.java
@@ -25,6 +25,7 @@
  * $Id: ACIEventListener.java,v 1.5 2009/01/28 05:34:48 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -72,7 +73,6 @@ public ACIEventListener() {
      * the AMObjectImpl by calling the appropriate method.
      * Usually all the DN's whose have a suffix of this DN of this event will
      * get affected
-     * 
    
      * 
      * @param dsEvent
      *            DSEvent object generated by the
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CachedDirectoryServicesImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CachedDirectoryServicesImpl.java
index fef0edd024..a81d8124d1 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CachedDirectoryServicesImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CachedDirectoryServicesImpl.java
@@ -25,7 +25,7 @@
  * $Id: CachedDirectoryServicesImpl.java,v 1.5 2009/11/20 23:52:51 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
- * Portions Copyrighted 2023 3A Systems LLC
+ * Portions Copyrighted 2023-2026 3A Systems LLC
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -981,7 +981,7 @@ public void setAttributes(SSOToken token, String entryDN, int objectType,
      * @param objectType
      *            profile type
      * @param recursive
-     *            if true, remove all sub entries & the object
+     *            if true, remove all sub entries & the object
      * @param softDelete
      *            Used to let pre/post callback plugins know that this delete is
      *            either a soft delete (marked for deletion) or a purge/hard
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CallBackHelper.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CallBackHelper.java
index d041519205..1b69696e3e 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CallBackHelper.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CallBackHelper.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -293,7 +294,7 @@ public void postProcess(SSOToken token, String entryDN, String orgDN,
     }
 
     /**
-     * Special method for pre processing memberShip modification for roles &
+     * Special method for pre processing memberShip modification for roles &
      * groups.
      */
     public Set preProcessModifyMemberShip(SSOToken token, String entryDN,
@@ -334,7 +335,7 @@ public Set preProcessModifyMemberShip(SSOToken token, String entryDN,
     }
 
     /**
-     * Special method for post processing memberShip modification for roles &
+     * Special method for post processing memberShip modification for roles &
      * groups.
      */
     public void postProcessModifyMemberShip(SSOToken token, String entryDN,
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CommonUtils.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CommonUtils.java
index 02c0bee3a7..147dea79a7 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CommonUtils.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/CommonUtils.java
@@ -25,6 +25,7 @@
  * $Id: CommonUtils.java,v 1.8 2009/01/28 05:34:48 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -156,7 +157,7 @@ protected static String getUserLocale(SSOToken token) {
      *            the first AttrSet
      * @param attrSet2
      *            the second AttrSet
-     * @return an AttrSet which has combined values of attrSet1 & attrSet2
+     * @return an AttrSet which has combined values of attrSet1 & attrSet2
      */
     protected static AttrSet combineAttrSets(AttrSet attrSet1, AttrSet attrSet2)
     {
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ComplianceServicesImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ComplianceServicesImpl.java
index bad1f3c0a9..00f620a46c 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ComplianceServicesImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/ComplianceServicesImpl.java
@@ -25,6 +25,7 @@
  * $Id: ComplianceServicesImpl.java,v 1.10 2009/11/20 23:52:51 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -418,7 +419,6 @@ protected void verifyAndUnLinkGroupToRole(SSOToken token, Set members,
      * Method which checks the attribute set for the presence of
      * "inetuserstatus" attribute. If the attribute exists and has a value of
      * "deleted", the method returns true, if not it returns false.
-     * 
    
      * 
      * @param attrSet
      *            The attrSet to be verified
@@ -441,7 +441,6 @@ protected void verifyAttributes(AttrSet attrSet) throws AMException {
      * existing list of attribute names and then fetches the attribute set from
      * LDAP. The compliance attributes are verified for "inetuserstatus"
      * attribute.
-     * 
    
      * 
      * @param po a PersistentObject of the entry.
      * @param attributeNames Array of attribute names.
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DCTreeServicesImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DCTreeServicesImpl.java
index 3e29aeb835..c30a121373 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DCTreeServicesImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DCTreeServicesImpl.java
@@ -25,6 +25,7 @@
  * $Id: DCTreeServicesImpl.java,v 1.5 2009/01/28 05:34:48 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -398,6 +399,7 @@ protected AttrSet getDomainAttributes(SSOToken token, String orgDN,
      * @return
      *            the organization dn
      * @throws AMException
+     *             if an error occurs while resolving the organization DN
      */
     public String getOrganizationDN(SSOToken token, String domainName)
             throws AMException {
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DirectoryServicesImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DirectoryServicesImpl.java
index fa8107a9d8..5cba53eacb 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DirectoryServicesImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/DirectoryServicesImpl.java
@@ -25,6 +25,7 @@
  * $Id: DirectoryServicesImpl.java,v 1.14 2009/11/20 23:52:51 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -1635,7 +1636,7 @@ private void processPostDeleteCallBacks(SSOToken token, String entryDN,
      * @param objectType
      *            profile type
      * @param recursive
-     *            if true, remove all sub entries & the object
+     *            if true, remove all sub entries & the object
      * @param softDelete
      *            Used to let pre/post callback plugins know that this delete is
      *            either a soft delete (marked for deletion) or a purge/hard
@@ -2612,10 +2613,15 @@ public String[] getGroupFilterAndScope(SSOToken token, String entryDN,
      * Sets the filter for a dynamic group in the datastore.
      * 
      * @param token
+     *            the single sign-on token used to authorize the operation
      * @param entryDN
+     *            the DN of the dynamic group entry
      * @param filter
+     *            the search filter to set on the dynamic group
      * @throws AMException
+     *             if an error occurs while setting the group filter
      * @throws SSOException
+     *             if the single sign-on token is invalid or has expired
      */
     public void setGroupFilter(SSOToken token, String entryDN, String filter)
             throws AMException, SSOException {
@@ -3029,7 +3035,7 @@ private Set getServiceAttributesWithQualifier(SSOToken token,
     }
 
     /**
-     * Create a COS Definition based on serviceID & attribute set & type. For
+     * Create a COS Definition based on serviceID & attribute set & type. For
      * policy attribute, will set cosattribute to "override" For other
      * attribute, will set cosattribute to "default"
      */
@@ -3364,6 +3370,7 @@ public String getSearchFilterFromTemplate(int objectType, String orgDN,
      * objectclass based on the LDAP schema
      * 
      * @param objectclass
+     *            the object class whose attributes are returned
      * @return the attributes for the objectclass
      */
     public Set getAttributesForSchema(String objectclass) {
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EmailNotificationHelper.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EmailNotificationHelper.java
index 2588c23e54..99ec2a875a 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EmailNotificationHelper.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EmailNotificationHelper.java
@@ -25,7 +25,7 @@
  * $Id: EmailNotificationHelper.java,v 1.5 2009/01/28 05:34:48 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -56,7 +56,7 @@
 
 /**
  * This class has the functionality to send email notifications to the users
- * listed in the notification list for create, delete & modify
+ * listed in the notification list for create, delete & modify
  */
 public class EmailNotificationHelper {
 
@@ -208,9 +208,9 @@ public boolean isPresentUserModifyNotificationList() {
     }
 
     /**
-     * The proper setUser<>NotificationList method should be called before
-     * calling this method. 
-     * 
+     * The proper {@code setUser<>NotificationList} method should be called before
+     * calling this method.
+     *
      * @param attributes
      *            the attributes of the user
      */
@@ -229,9 +229,9 @@ public void sendUserCreateNotification(Map attributes) {
     }
 
     /**
-     * The proper setUser<>NotificationList method should be called before
+     * The proper {@code setUser<>NotificationList} method should be called before
      * calling this method.
-     * 
+     *
      * @param attributes
      *            the attributes of the user
      */
@@ -251,9 +251,9 @@ public void sendUserDeleteNotification(Map attributes) {
 
     // TODO: Refactor this method.
     /**
-     * The proper setUser<>NotificationList method should be called before
+     * The proper {@code setUser<>NotificationList} method should be called before
      * calling this method.
-     * 
+     *
      * @param token
      *            a valid single sign on token
      * @param attributes
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EventManager.java b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EventManager.java
index 1b8f3343b1..b451d1dbb3 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EventManager.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/ldap/EventManager.java
@@ -25,6 +25,7 @@
  * $Id: EventManager.java,v 1.7 2009/01/28 05:34:48 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.ldap;
@@ -53,7 +54,6 @@
  * instantiated directly. It is only instantiated when an instance of
  * AMCacheManager is created and since AMCacheManager class is a singleton it is
  * guaranted to have only one instance of this class.
- * 
    
  */
 class EventManager {
     protected static final int EVENT_SCOPE = SearchScope.WHOLE_SUBTREE.intValue();
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/remote/CachedRemoteServicesImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/remote/CachedRemoteServicesImpl.java
index 1d7bd34dbd..af0feb1988 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/remote/CachedRemoteServicesImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/remote/CachedRemoteServicesImpl.java
@@ -25,7 +25,7 @@
  * $Id: CachedRemoteServicesImpl.java,v 1.6 2009/11/20 23:52:52 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
- * Portions Copyrighted 2023 3A Systems LLC
+ * Portions Copyrighted 2023-2026 3A Systems LLC
  */
 
 package com.iplanet.am.sdk.remote;
@@ -992,7 +992,7 @@ public void setAttributes(SSOToken token, String entryDN, int objectType,
      * @param objectType
      *            profile type
      * @param recursive
-     *            if true, remove all sub entries & the object
+     *            if true, remove all sub entries & the object
      * @param softDelete
      *            Used to let pre/post callback plugins know that this delete is
      *            either a soft delete (marked for deletion) or a purge/hard
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/remote/EventListener.java b/openam-core/src/main/java/com/iplanet/am/sdk/remote/EventListener.java
index 90474c1272..16815a438c 100644
--- a/openam-core/src/main/java/com/iplanet/am/sdk/remote/EventListener.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/remote/EventListener.java
@@ -25,6 +25,7 @@
  * $Id: EventListener.java,v 1.12 2008/06/27 20:56:23 arviranga Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.remote;
@@ -98,7 +99,7 @@ public synchronized static EventListener getInstance() {
     }
 
     /**
-     * Constructor for EventListener. Should be instantiated
+     * Constructor for EventListener. Should be instantiated
      * once by RemoteServicesImpl
      *
      */
@@ -241,7 +242,6 @@ public void addListener(SSOToken token, AMObjectListener listener)
      * Sends notifications to listeners added via addListener.
      * The parameter nItem is an XML document having a single
      * notification event, using the following DTD.
-     * 
    
      * 
      * 
          *       <!-- EventNotification element specifes the change notification
diff --git a/openam-core/src/main/java/com/iplanet/am/sdk/remote/RemoteServicesImpl.java b/openam-core/src/main/java/com/iplanet/am/sdk/remote/RemoteServicesImpl.java
index 4db4ec091f..dbb1aae508 100755
--- a/openam-core/src/main/java/com/iplanet/am/sdk/remote/RemoteServicesImpl.java
+++ b/openam-core/src/main/java/com/iplanet/am/sdk/remote/RemoteServicesImpl.java
@@ -25,6 +25,7 @@
  * $Id: RemoteServicesImpl.java,v 1.10 2009/07/02 20:26:16 hengming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.sdk.remote;
@@ -832,7 +833,7 @@ public void createEntry(SSOToken token, String entryName, int objectType,
      * @param objectType
      *            profile type
      * @param recursive
-     *            if true, remove all sub entries & the object
+     *            if true, remove all sub entries & the object
      * @param softDelete
      *            Used to let pre/post callback plugins know that this delete is
      *            either a soft delete (marked for deletion) or a purge/hard
@@ -1299,10 +1300,15 @@ public String[] getGroupFilterAndScope(SSOToken token, String entryDN,
      * Sets the filter for a dynamic group in the datastore.
      * 
      * @param token
+     *            the single sign-on token used to authorize the operation
      * @param entryDN
+     *            the DN of the dynamic group entry
      * @param filter
+     *            the search filter to set on the dynamic group
      * @throws AMException
+     *             if an error occurs while setting the group filter
      * @throws SSOException
+     *             if the single sign-on token is invalid or has expired
      */
     public void setGroupFilter(SSOToken token, String entryDN, String filter)
             throws AMException, SSOException {
@@ -1691,7 +1697,7 @@ public String getObjectClass(int objectType) {
      * Returns the set of attributes (both optional and required) needed for an
      * objectclass based on the LDAP schema
      * 
-     * @param objectclass
+     * @param objectclass the object class whose attributes are returned
      * @return Set of the attributes for the  object class
      */
     public Set getAttributesForSchema(String objectclass) {
diff --git a/openam-core/src/main/java/com/iplanet/am/util/Misc.java b/openam-core/src/main/java/com/iplanet/am/util/Misc.java
index 25edf46f22..bf2db9ef22 100644
--- a/openam-core/src/main/java/com/iplanet/am/util/Misc.java
+++ b/openam-core/src/main/java/com/iplanet/am/util/Misc.java
@@ -25,6 +25,7 @@
  * $Id: Misc.java,v 1.6 2009/01/28 05:34:48 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.am.util;
@@ -120,7 +121,7 @@ public static String getMapAttr(Map m, String name, String defaultValue) {
      *             when fails to parse the defaultValue argument as a signed
      *             decimal integer for return
      * @deprecated As of OpenSSO version 8.0
-     * {@link com.sun.identity.shared.datastruct.CollectionHelper#getIntMapAttr(Map, String, String, Debug)}
+     * {@link com.sun.identity.shared.datastruct.CollectionHelper#getIntMapAttr(Map, String, int, Debug)}
      */
     public static int getIntMapAttr(Map m, String name, String defaultValue,
             Debug debug) throws NumberFormatException {
diff --git a/openam-core/src/main/java/com/iplanet/am/util/QCharset.java b/openam-core/src/main/java/com/iplanet/am/util/QCharset.java
index 14d3a806e3..509f32b052 100644
--- a/openam-core/src/main/java/com/iplanet/am/util/QCharset.java
+++ b/openam-core/src/main/java/com/iplanet/am/util/QCharset.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,7 +47,7 @@ public class QCharset implements Comparable {
      * Construct a QCharset object.
      *
      * @param name Name of the charset.
-     * @param q Q factor to express preference. 0.0 < q < 1.0.
+     * @param q Q factor to express preference. {@code 0.0 < q < 1.0}.
      *        Constructs new QCharset set object with charset
      *        name and q value.
      */
diff --git a/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java b/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java
index c17780d002..715e473588 100644
--- a/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java
+++ b/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java
@@ -23,7 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
- * Portions Copyrighted 2017-2025 3A Systems, LLC
+ * Portions Copyrighted 2017-2026 3A Systems, LLC
  */
 package com.iplanet.am.util;
 
@@ -84,7 +84,7 @@
  * 
    
  * If multiple servers are running, each may have their own configuration file.
  * The naming convention for such scenarios is
- * AMConfig-<serverName>.
+ * AMConfig-<serverName>.
  * 
  */
 public class SystemProperties {
@@ -457,11 +457,11 @@ public static Properties getPlatform() {
     }
 
     /**
-     * Initializes properties bundle from the file 
+     * Initializes properties bundle from the file 
      * passed.
      *
      * @param file type String, file name for the resource bundle
-     * @exception MissingResourceException
+     * @exception MissingResourceException if the resource bundle for the given file cannot be found
      */
     public static void initializeProperties(String file) throws MissingResourceException {
         Properties props = new Properties();
diff --git a/openam-core/src/main/java/com/iplanet/am/util/ThreadPool.java b/openam-core/src/main/java/com/iplanet/am/util/ThreadPool.java
index 562c6cf8d1..7614aa1223 100644
--- a/openam-core/src/main/java/com/iplanet/am/util/ThreadPool.java
+++ b/openam-core/src/main/java/com/iplanet/am/util/ThreadPool.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -141,9 +142,9 @@ private WorkerThread getAvailableThread() {
      * 
      * @param task
      *            user defined task.
-     * @throws ThreadPoolException
+     * @throws ThreadPoolException if the thread pool is being shut down and no more tasks can be accepted
      */
-    public final void run(Runnable task) throws ThreadPoolException 
+    public final void run(Runnable task) throws ThreadPoolException
     {
         WorkerThread t = null;
         synchronized (this) {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/ClientSdkSessionRequests.java b/openam-core/src/main/java/com/iplanet/dpro/session/ClientSdkSessionRequests.java
index 749558d123..7cfbcc670e 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/ClientSdkSessionRequests.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/ClientSdkSessionRequests.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.dpro.session;
@@ -59,7 +60,7 @@ public ClientSdkSessionRequests(final Debug debug, final SessionPLLSender pllSen
      *
      * @param svcurl Session Service URL.
      * @param sreq Session Request object.
-     * @exception SessionException
+     * @exception SessionException if the session request could not be sent or the response indicates an error.
      */
     public SessionResponse sendRequest(URL svcurl, SessionRequest sreq, Session session) throws SessionException {
         SessionResponse sres;
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/Session.java b/openam-core/src/main/java/com/iplanet/dpro/session/Session.java
index 40b6e73cac..82ae560a9a 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/Session.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/Session.java
@@ -319,7 +319,7 @@ public long getMaxIdleTime() {
      * Returns true if the session has timed out.
      * @return true if session timed out,
      *         falseotherwise
-     * @exception SessionException
+     * @exception SessionException if an error occurs while determining the session state.
      */
     public boolean isTimedOut() throws SessionException {
         /**
@@ -464,7 +464,7 @@ public String getProperty(String name) throws SessionException {
      * @param session Must be an app token
      * @param restrictedId The SSOTokenID of the restricted token
      * @return The SSOTokenID string of the master token
-     * @throws SSOException If the master token cannot be dereferenced
+     * @throws SessionException If the master token cannot be dereferenced
      */
     public String dereferenceRestrictedTokenID(Session session, String restrictedId) throws SessionException {
         String masterSID;
@@ -485,7 +485,7 @@ public String dereferenceRestrictedTokenID(Session session, String restrictedId)
      * restricted token, false otherwise.
      *
      * @return true if the token is restricted
-     * @throws SSOException If we are unable to determine if the session is
+     * @throws SessionException If we are unable to determine if the session is
      *              restricted
      */
     public boolean isRestricted() throws SessionException {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/SessionID.java b/openam-core/src/main/java/com/iplanet/dpro/session/SessionID.java
index 6f1cf6e901..7e9d8a7118 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/SessionID.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/SessionID.java
@@ -25,7 +25,7 @@
  * $Id: SessionID.java,v 1.10 2009/10/02 23:45:42 qcheng Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.iplanet.dpro.session;
@@ -445,7 +445,7 @@ public String getTail() {
     /**
      * Returns the if the cookies are supported.
      *
-     * @return Boolean object value which is Boolean.TRUE if
+     * @return Boolean object value which is Boolean.TRUE if
      *         supported FALSE otherwise
      */
     public Boolean getCookieMode() {
@@ -523,7 +523,7 @@ static String makeSessionID(String encryptedID, SessionIDExtensions extensions,
      * @param encryptedID encrypted ID.
      * @param prototype session ID to copy extensions and tail from
      * @return encoded session id
-     * @throws SessionException
+     * @throws SessionException if the prototype session id cannot be parsed
      */
     public static String makeRelatedSessionID(String encryptedID,
             SessionID prototype) throws SessionException {
@@ -700,7 +700,7 @@ private static String generateEncryptedID(SessionServerConfig serverConfig) {
      * @param domain session domain
      *
      * @return newly generated session id
-     * @throws SessionException
+     * @throws SessionException if the session id cannot be generated
      */
     public static SessionID generateSessionID(SessionServerConfig serverConfig, String domain) throws SessionException {
 
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategy.java b/openam-core/src/main/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategy.java
index 7737242113..cf41019232 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategy.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategy.java
@@ -1,5 +1,6 @@
 /**
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * 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
@@ -27,7 +28,7 @@ public class ClientSdkSessionOperationStrategy implements SessionOperationStrate
 
     /**
      * Default constructor appropriate for Client SDK usage.
-     * @param clientSdkOperations
+     * @param clientSdkOperations the ClientSdkOperations used to perform remote session operations
      */
     public ClientSdkSessionOperationStrategy(ClientSdkOperations clientSdkOperations) {
         this.clientSdkOperations = clientSdkOperations;
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperations.java b/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperations.java
index 0148d52094..86219c9ee0 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperations.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperations.java
@@ -75,8 +75,8 @@ public ClientSdkOperations(final Debug sessionDebug,
      *
      * @param session The Session to update.
      * @param reset If true, then update the last modified timestamp of the Session.
-     * @return
-     * @throws SessionException
+     * @return the refreshed SessionInfo for the given session
+     * @throws SessionException if the session could not be refreshed
      */
     public SessionInfo refresh(Session session, boolean reset) throws SessionException {
         SessionID sessionID = session.getID();
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/LocalOperations.java b/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/LocalOperations.java
index 4a668bc5ce..2c3f078be4 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/LocalOperations.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/operations/strategies/LocalOperations.java
@@ -298,7 +298,7 @@ private InternalSession resolveRestrictedToken(SessionID token,
      * @param masterSessionId   master session id
      * @param restriction TokenRestriction Object
      * @return restricted token id
-     * @throws SessionException
+     * @throws SessionException if the master session cannot be located or the restricted token cannot be created
      */
     public String getRestrictedTokenId(final SessionID masterSessionId,
                                        final TokenRestriction restriction) throws SessionException {
@@ -352,8 +352,8 @@ public Session resolveSession(SessionID sessionID) throws SessionException {
      * Gets all valid Internal Sessions, depending on the value of the user's
      * preferences.
      *
-     * @param s
-     * @throws SessionException
+     * @param s the requesting session used to authorize the search
+     * @throws SessionException if the valid sessions cannot be retrieved
      */
     @Override
     public SearchResults getValidSessions(Session s, String pattern) throws SessionException {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/InternalSession.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/InternalSession.java
index c3165860c9..0dbf6463ec 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/service/InternalSession.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/InternalSession.java
@@ -25,7 +25,7 @@
  * $Id: InternalSession.java,v 1.21 2009/03/20 21:05:25 weisun2 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2023 3A Systems LLC
+ * Portions Copyrighted 2023-2026 3A Systems LLC
  */
 package com.iplanet.dpro.session.service;
 
@@ -291,7 +291,7 @@ public String getClientID() {
     /**
      * Sets Client ID for this Internal Session.
      *
-     * @param id
+     * @param id the client ID to set for this Internal Session
      */
     public void setClientID(String id) {
         clientID = id;
@@ -352,7 +352,7 @@ public long getMaxIdleTime() {
     /**
      * Sets the maximum idle time (in minutes) for the Internal Session.
      *
-     * @param maxIdleTimeInMinutes
+     * @param maxIdleTimeInMinutes the maximum idle time in minutes to set
      */
     public void setMaxIdleTime(long maxIdleTimeInMinutes) {
     	if (this.maxIdleTimeInMinutes != maxIdleTimeInMinutes) {
@@ -717,7 +717,7 @@ public boolean isStored() {
 
     /**
      * Changes the state of the session to ACTIVE after creation.
-     * @param userDN
+     * @param userDN the distinguished name of the user owning the session
      * @return  true  if the session is successfully activated
      *         after creation , false otherwise
      */
@@ -850,7 +850,7 @@ public void setLatestAccessTime() {
     /**
      * Sets the {@link SessionState} of the Internal Session.
      *
-     * @param sessionState
+     * @param sessionState the new session state to set
      */
     public void setState(SessionState sessionState) {
         if (this.sessionState != sessionState) {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionConstraint.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionConstraint.java
index 54abb0fc23..4f9bfcce6f 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionConstraint.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionConstraint.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2016 Nomura Research Institute, Ltd.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.dpro.session.service;
@@ -117,7 +118,7 @@ static SessionQueryManager getSessionQueryManager(){
      * Check if the session quota for a given user has been exhausted and
      * perform necessary actions in such as case.
      *
-     * @param internalSession
+     * @param internalSession the internal session whose owner's session quota is checked
      * @return true if the session activation request should be rejected, false otherwise.
      */
     protected boolean checkQuotaAndPerformAction(InternalSession internalSession) {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionMaxStats.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionMaxStats.java
index 61869c3414..d8c0327530 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionMaxStats.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionMaxStats.java
@@ -25,7 +25,7 @@
  * $Id: SessionMaxStats.java,v 1.4 2008/06/25 05:41:31 qcheng Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.iplanet.dpro.session.service;
 
@@ -55,8 +55,8 @@ public class SessionMaxStats implements StatsListener {
    /**
     * Creates a new SessionMaxStats
     * @param sessionAccessManager session accessManagement
-    * @param sessionNotificationSender
-    * @param stats
+    * @param sessionNotificationSender the sender used to dispatch session notifications
+    * @param stats the statistics holder used to record session metrics
     */
    @Inject
    public SessionMaxStats(
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionService.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionService.java
index 91d38fa573..b4de904b96 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionService.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionService.java
@@ -106,7 +106,7 @@ private SessionService(
      * @param masterSid   master session id
      * @param restriction TokenRestriction Object
      * @return restricted token id
-     * @throws SessionException
+     * @throws SessionException if the restricted token cannot be created
      */
     public String getRestrictedTokenId(String masterSid, TokenRestriction restriction) throws SessionException {
         SessionID sessionID = new SessionID(masterSid);
@@ -155,7 +155,7 @@ public void destroySession(Session requester, SessionID sessionToDestroy) throws
     /**
      * Destroy a Internal Session, whose session id has been specified.
      *
-     * @param sessionID
+     * @param sessionID the session id of the authentication session to destroy
      */
     public void destroyAuthenticationSession(final SessionID sessionID) {
         InternalSession authenticationSession = InjectorHolder.getInstance(AuthenticationSessionStore.class).removeSession(sessionID);
@@ -192,9 +192,9 @@ public boolean checkSessionExists(SessionID sessionId) throws SessionException {
     /**
      * Returns the Session information.
      *
-     * @param sid
-     * @param reset
-     * @throws SessionException
+     * @param sid the session id to retrieve information for
+     * @param reset whether to reset the idle time of the session
+     * @throws SessionException if the session information cannot be retrieved
      */
     public SessionInfo getSessionInfo(SessionID sid, boolean reset) throws SessionException {
         return sessionOperationStrategy.getOperation(sid).getSessionInfo(sid, reset);
@@ -204,8 +204,9 @@ public SessionInfo getSessionInfo(SessionID sid, boolean reset) throws SessionEx
      * Gets all valid Internal Sessions, depending on the value of the user's
      * preferences.
      *
-     * @param s
-     * @throws SessionException
+     * @param s the requesting session
+     * @param pattern the search pattern used to match sessions
+     * @throws SessionException if the valid sessions cannot be retrieved
      */
     public SearchResults getValidSessions(Session s, String pattern) throws SessionException {
         return sessionOperationStrategy.getOperation(s.getSessionID()).getValidSessions(s, pattern);
@@ -232,8 +233,8 @@ public Collection getMatchingSessions(Session caller, CrestQuery
     /**
      * Logout the user.
      *
-     * @param session
-     * @throws SessionException
+     * @param session the session to log out
+     * @throws SessionException if the logout operation fails
      */
     public void logout(final Session session) throws SessionException {
         sessionOperationStrategy.getOperation(session.getSessionID()).logout(session);
@@ -243,7 +244,7 @@ public void logout(final Session session) throws SessionException {
      * Adds listener to a Internal Sessions.
      *
      * @param session Session
-     * @param url
+     * @param url the notification URL to which session events are sent
      * @throws SessionException Session is null OR the Session is invalid
      */
     public void addSessionListener(SSOToken clientToken, Session session, String url) throws SessionException {
@@ -255,10 +256,10 @@ public void addSessionListener(SSOToken clientToken, Session session, String url
      * protected
      *
      * @param clientToken - Token of the client setting external property.
-     * @param sessionId
-     * @param name
-     * @param value
-     * @throws SessionException
+     * @param sessionId the session id on which to set the property
+     * @param name the name of the property to set
+     * @param value the value to set for the property
+     * @throws SessionException if the property cannot be set
      */
     public void setExternalProperty(SSOToken clientToken, SessionID sessionId, String name, String value)
             throws SessionException {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterMonitor.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterMonitor.java
index 9f463bcbb6..6096eb0005 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterMonitor.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterMonitor.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.dpro.session.service.cluster;
@@ -55,7 +56,7 @@ public interface ClusterMonitor {
      *
      * @param sessionId SessionID for which the home server is to be found
      * @return server id for the server instance determined to be the current host
-     * @throws SessionException
+     * @throws SessionException if the current host server cannot be determined
      */
     String getCurrentHostServer(SessionID sessionId) throws SessionException;
 
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterStateService.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterStateService.java
index 0caf02bd9f..eab06a34fd 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterStateService.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/ClusterStateService.java
@@ -29,7 +29,7 @@
 /*
  * Portions Copyrighted 2010-2016 ForgeRock AS.
  * Portions Copyrighted 2014 Nomura Research Institute, Ltd.
- * Portions Copyrighted 2023 3A Systems LLC.
+ * Portions Copyrighted 2023-2026 3A Systems LLC.
  */
 
 package com.iplanet.dpro.session.service.cluster;
@@ -184,7 +184,7 @@ public String toString() {
 
     /**
      * Get Servers within Cluster
-     * @return Map
+     * @return {@code Map} of servers within the cluster keyed by server ID
      */
     protected Map getServers() {
         return servers;
@@ -219,7 +219,7 @@ protected String getLocalServerId() {
 
     /**
      * Is Specified ServerId our Local Server Id?
-     * @param serverId
+     * @param serverId the server ID to compare against the local server ID
      * @return boolean indicating true if the serverId matches the local server ID.
      */
     protected boolean isLocalServerId(String serverId) {
@@ -465,7 +465,7 @@ public void run() {
 
     /**
      * Internal method for checking health status using sock.connect()
-     * 
    
+     * 
    
      * TODO -- Use a better mechanism for alive status. 10.1+.
      *
      * @param info server info instance
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitor.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitor.java
index ccd1014016..e0180eba5a 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitor.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitor.java
@@ -25,7 +25,7 @@
  * $Id: SessionService.java,v 1.37 2010/02/03 03:52:54 bina Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
- * Portions Copyrighted 2023 3A Systems LLC.
+ * Portions Copyrighted 2023-2026 3A Systems LLC.
  */
 
 package com.iplanet.dpro.session.service.cluster;
@@ -75,7 +75,7 @@ public class MultiServerClusterMonitor implements ClusterMonitor {
      * @param sessionDebug The session debug instance.
      * @param serviceConfig The configuration for the session service.
      * @param serverConfig The configuration for the session server.
-     * @throws Exception
+     * @throws Exception if the cluster monitor cannot be initialised
      */
     public MultiServerClusterMonitor(
             Debug sessionDebug,
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionEncodeURL.java b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionEncodeURL.java
index d3fe14eed3..3dc93b3ed1 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionEncodeURL.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionEncodeURL.java
@@ -38,7 +38,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 
 /** 
- * SessionEncodeURL class encodes the URL 
+ * SessionEncodeURL class encodes the URL
  * with the cookie value as a query string
  * or extra path info based on the encoding scheme.
  * 
    
@@ -49,7 +49,7 @@
  * 
    
  * If the encoding scheme is SLASH then the  cookie value would be
  * written in the URL as extra path info in the following format:
- * protocol://server:port/servletpath/<cookieName>=<cookieValue>?
+ * protocol://server:port/servletpath/<cookieName>=<cookieValue>?
  * queryString
  * 
    
  * Note that this format works only if the path is a servlet, if a
@@ -61,7 +61,7 @@
  * 
    
  * If the encoding scheme is SEMICOLON then the cookie value would be
  * written in the URL as extra path info in the following format:
- * protocol://server:port/path;<cookieName=cookieValue>
+ * protocol://server:port/path;<cookieName=cookieValue>
  * ?queryString
  * Note that this is not supported in the servlet specification and
  * some web containers do not support this.
@@ -70,8 +70,8 @@
  * If the encoding scheme is QUERY then the cookie value would be
  * written in the URL in the following format:
  * 
    - * protocol://server:port/path?<cookieName>=<cookieValue>
- * protocol://server:port/path?queryString&<cookieName>=<cookieValue>
+ * protocol://server:port/path?<cookieName>=<cookieValue>
+ * protocol://server:port/path?queryString&<cookieName>=<cookieValue>
  * 
    
  * 
    
  * This is the default and OpenAM always encodes in this format
@@ -141,7 +141,6 @@ public SessionEncodeURL() {
      * if encoding scheme is SEMICOLON, encodedURL
      * format will be:
      * protocol://server:port/path;cookieName=cookieValue
-     * 
    
      * 
      * @param sidString Session ID.
      * @param url the URL to be encoded.
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionNotification.java b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionNotification.java
index d374720b7c..c31cc22b4f 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionNotification.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionNotification.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -35,8 +36,7 @@
  * This SessionNotification class represents a
  * SessionNotification XML document. The
  * SessionNotification DTD is defined as the following:
- * 
    
- * 
+ *
  * 
      *     <?xml version="1.0">
  *     < !DOCTYPE SessionNotification [
@@ -61,8 +61,7 @@
  *     < !ELEMENT Time (#PCDATA)>
  *     ]>
  * 
    
- * 
- * 
    
+ *
  */
 public class SessionNotification {
 
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequest.java b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequest.java
index 146b18e28a..316660bd5e 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequest.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequest.java
@@ -25,6 +25,7 @@
  * $Id: SessionRequest.java,v 1.3 2008/06/25 05:41:31 qcheng Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.dpro.session.share;
 
@@ -35,7 +36,6 @@
  * This SessionRequest class represents a
  * SessionRequest XML document. The SessionRequest
  * DTD is defined as the following:
- * 
    
  *
  * 
      *     <?xml version="1.0">
@@ -74,8 +74,6 @@
  *     < !ELEMENT Pattern (#PCDATA)>
  *     ]>
  * 
    
- *
- * 
    
  */
 
 public class SessionRequest {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequestParser.java b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequestParser.java
index 45e6a933ec..d1e169f055 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequestParser.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionRequestParser.java
@@ -25,6 +25,7 @@
  * $Id: SessionRequestParser.java,v 1.3 2008/06/25 05:41:31 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.dpro.session.share;
@@ -196,7 +197,7 @@ public SessionRequest parseXML() {
     }
 
     /**
-     * parse property name & value
+     * parse property name & value
      */
     private void parsePropertyAttributes(Element property) {
         if (property == null) {
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionResponse.java b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionResponse.java
index 884de375bc..0ed9b52c68 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionResponse.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/share/SessionResponse.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,8 +47,7 @@
  * This SessionResponse class represents a
  * SessionResponse XML document. The SessionResponse
  * DTD is defined as the following:
- * 
    
- * 
+ *
  * 
      *     <?xml version="1.0">
  *     < !DOCTYPE SessionResponse [
@@ -97,8 +97,6 @@
  *     < !ELEMENT Status (#PCDATA)>
  *     ]>
  * 
    
- * 
- * 
    
  */
 
 public class SessionResponse {
@@ -241,7 +239,7 @@ public void setSessionInfo(List infos) {
     /**
      * Sets the flag.
      *
-     * @param flag 
+     * @param flag the boolean flag value to set on this response
      */
     public void setBooleanFlag(boolean flag) {
         booleanFlag = flag;
diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/utils/SessionInfoFactory.java b/openam-core/src/main/java/com/iplanet/dpro/session/utils/SessionInfoFactory.java
index b632f082f4..3df87b21c6 100644
--- a/openam-core/src/main/java/com/iplanet/dpro/session/utils/SessionInfoFactory.java
+++ b/openam-core/src/main/java/com/iplanet/dpro/session/utils/SessionInfoFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.dpro.session.utils;
 
@@ -96,9 +97,6 @@ public void validateSession(InternalSession internalSession, SessionID sid)
      * @return A non null SessionInfo instance if valid.
      *
      * @throws SessionException If there was an error storing the TokenRestriction on the SessionInfo.
-     *
-     * @throws IllegalAccessException If this method has not been called in-conjunction with
-     * SessionInfoFactory#validateSession
      */
     public SessionInfo makeSessionInfo(InternalSession internalSession, SessionID sid)
             throws SessionException {
diff --git a/openam-core/src/main/java/com/iplanet/services/cdm/Client.java b/openam-core/src/main/java/com/iplanet/services/cdm/Client.java
index 994c607336..9ba3fd5351 100644
--- a/openam-core/src/main/java/com/iplanet/services/cdm/Client.java
+++ b/openam-core/src/main/java/com/iplanet/services/cdm/Client.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -42,7 +43,6 @@
 /**
  * Provides common access to client data.
  * 
    
- * 
    
  * Client data is accessed for a particular client type. The underlying client
  * data is stored in the profile service, but this interface should always used
  * for accessing it (not by accessing the profile directly).
diff --git a/openam-core/src/main/java/com/iplanet/services/cdm/ClientsManager.java b/openam-core/src/main/java/com/iplanet/services/cdm/ClientsManager.java
index 02051a5200..b00696df70 100644
--- a/openam-core/src/main/java/com/iplanet/services/cdm/ClientsManager.java
+++ b/openam-core/src/main/java/com/iplanet/services/cdm/ClientsManager.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -36,7 +37,6 @@
 /**
  * Provides common access to client data.
  * 
    
- * 
    
  * Client data is accessed for a particular client type. The underlying client
  * data is stored in the profile service, but this interface should always used
  * for accessing it (not by accessing the profile directly).
diff --git a/openam-core/src/main/java/com/iplanet/services/cdm/DefaultClientTypesManager.java b/openam-core/src/main/java/com/iplanet/services/cdm/DefaultClientTypesManager.java
index 2e7c8d40bf..1a9f48ef58 100644
--- a/openam-core/src/main/java/com/iplanet/services/cdm/DefaultClientTypesManager.java
+++ b/openam-core/src/main/java/com/iplanet/services/cdm/DefaultClientTypesManager.java
@@ -25,6 +25,7 @@
  * $Id: DefaultClientTypesManager.java,v 1.4 2008/09/04 16:16:34 dillidorai Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.services.cdm;
 
@@ -240,7 +241,7 @@ private static String getDefaultClientTypeFromService()
     }
 
     /**
-     * Get internal sso token, use admin DN & password
+     * Get internal sso token, use admin DN & password
      */
     private static SSOToken getInternalToken() throws SSOException {
         return ((SSOToken) AccessController.doPrivileged(AdminTokenAction
@@ -451,7 +452,7 @@ protected void loadMaps() {
     }
 
     /**
-     * Add to the userAgentMap, clientTypeMap & ProfilesMap.
+     * Add to the userAgentMap, clientTypeMap & ProfilesMap.
      * 
      * @return the created Client Object
      */
@@ -497,9 +498,9 @@ protected void removeFromClientMap(String ct, Client c) {
     }
 
     /**
-     * Adds the client to its appropriate baseProfileMap & styleMap. Ex:
-     * Nokia7110, with Nokia style & WML for its baseProfile, will go into
-     * wmlProfilesMap under Nokia styles. (Used only for displaying Styles &
+     * Adds the client to its appropriate baseProfileMap & styleMap. Ex:
+     * Nokia7110, with Nokia style & WML for its baseProfile, will go into
+     * wmlProfilesMap under Nokia styles. (Used only for displaying Styles &
      * Clients under Base in the console plug-in).
      * 
      * Currently Aligo only supports 1 level of Style. Only the baseProfiles
@@ -610,7 +611,7 @@ private String getFirstString(Set set) {
     }
 
     /**
-     * Create Client Object & add to all our indexes. Called only by addClient &
+     * Create Client Object & add to all our indexes. Called only by addClient &
      * on clientChanged notification.
      */
     protected Client addToIndexes(String ct, Map cMap) {
@@ -914,10 +915,10 @@ public void setDirty(String ct, Map data) {
 
     /**
      * AMClientDataListener method for client change notification
-     * 
-     * @param clientType
-     * @param dbType
-     * @param opType
+     *
+     * @param clientType the client type that changed
+     * @param dbType the database type of the change
+     * @param opType the operation type of the change
      */
     public void clientChanged(String clientType, int dbType, int opType) {
         if (debug.messageEnabled()) {
@@ -975,7 +976,7 @@ public void clientChanged(String clientType, int dbType, int opType) {
              * if the client has been flagged updated then remove flag else
              * force the client data to be reloaded for the next request for
              * this client type. We don't need to relaod the UA and clienttype
-             * maps because the two minimal properties - clientType & UA cannot
+             * maps because the two minimal properties - clientType & UA cannot
              * be modified.
              */
             synchronized (updatedClients) {
@@ -1034,7 +1035,7 @@ public Set getStyles(String baseProfileName) {
      * @param style
      *            A valid style name
      * 
-     * @return A Map of all clientTypes belonging to baseProfile & style
+     * @return A Map of all clientTypes belonging to baseProfile & style
      */
     public Map getClients(String baseProfileName, String style) {
         Map cMap = null;
@@ -1069,10 +1070,10 @@ public int addClientExternal(SSOToken token, Map props)
 
     /**
      * 
-     * @param token
-     * @param props
+     * @param token the single sign-on token authorizing the operation
+     * @param props the client properties to modify
      * @return 0 if everything went fine
-     * @throws AMClientCapException
+     * @throws AMClientCapException if the client capability data cannot be modified
      */
     public int modifyClientExternal(SSOToken token, Map props)
             throws AMClientCapException {
@@ -1111,10 +1112,10 @@ public int modifyClientExternal(SSOToken token, Map props)
 
     /**
      * 
-     * @param token
-     * @param clientType
+     * @param token the single sign-on token authorizing the operation
+     * @param clientType the client type to remove
      * @return 0 if everything went fine
-     * @throws AMClientCapException
+     * @throws AMClientCapException if the client capability data cannot be removed
      */
     public int removeClientExternal(SSOToken token, String clientType)
             throws AMClientCapException {
@@ -1157,8 +1158,8 @@ protected void removeFromMaps(String clientType) {
 
     /**
      * Sets the styles and parent ids tree set for a client
-     * 
-     * @param clientData
+     *
+     * @param clientData the client data map for which to set parent styles and ids
      */
     protected void setParentStyles(Map clientData) {
         if (clientData == null) {
diff --git a/openam-core/src/main/java/com/iplanet/services/cdm/G11NSettings.java b/openam-core/src/main/java/com/iplanet/services/cdm/G11NSettings.java
index 13ec670f17..fc6791e48f 100644
--- a/openam-core/src/main/java/com/iplanet/services/cdm/G11NSettings.java
+++ b/openam-core/src/main/java/com/iplanet/services/cdm/G11NSettings.java
@@ -25,6 +25,7 @@
  * $Id: G11NSettings.java,v 1.8 2008/08/27 22:05:40 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.services.cdm;
 
@@ -147,7 +148,7 @@ public List getCharsetForLocale(String loc) {
     }
 
     /**
-     * @param mimeCharset
+     * @param mimeCharset the MIME charset name whose alias table is requested
      * @return a Map which can provide equivalent charset names. Currently,
      *        OpenAM uses only Java name; however an application can be
      *        configured to have different names for platform level mapping etc.
@@ -157,7 +158,7 @@ public Map getCharsetAliasTable(String mimeCharset) {
     }
 
     /**
-     * @param mimeCharset
+     * @param mimeCharset the MIME charset name to map to its Java charset name
      * @return charset name used in Java. If there is no such mapping, same
      *         mimecharset is returned
      */
diff --git a/openam-core/src/main/java/com/iplanet/services/cdm/clientschema/AMClientCapData.java b/openam-core/src/main/java/com/iplanet/services/cdm/clientschema/AMClientCapData.java
index 8d9a75e956..18bd5f21aa 100644
--- a/openam-core/src/main/java/com/iplanet/services/cdm/clientschema/AMClientCapData.java
+++ b/openam-core/src/main/java/com/iplanet/services/cdm/clientschema/AMClientCapData.java
@@ -25,6 +25,7 @@
  * $Id: AMClientCapData.java,v 1.7 2009/01/28 05:34:49 ww203982 Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.services.cdm.clientschema;
@@ -279,7 +280,7 @@ private AMClientCapData(int dbType) throws Exception {
      * the ServiceSchemaManager for the service 4. Get the ServiceSchema for the
      * Global schema 5. Get the schema for the "internalData" schema. (temp
      * var). 6. Get the schema for the "clientData" schema id. (overwrite 8). 7.
-     * Get the ROOT_SUFFIX 8. Read config info & properties schema from
+     * Get the ROOT_SUFFIX 8. Read config info & properties schema from
      * ServiceSchema 9. Add Listeners to EventService.
      */
     private synchronized void init(String instanceRDN) throws Exception {
@@ -1090,7 +1091,7 @@ public String[] getClassifications() {
      * 
      * @return Set of Maps. Each Map has the propertyNames for the Key and Value
      *         is Set of Property values. By default, the keys returned are
-     *         clientType, userAgent & parentID.
+     *         clientType, userAgent & parentID.
      */
     public Set getMinimalClientInfo() {
         Set clients = new HashSet();
diff --git a/openam-core/src/main/java/com/iplanet/services/comm/client/PLLNotificationServlet.java b/openam-core/src/main/java/com/iplanet/services/comm/client/PLLNotificationServlet.java
index 5c1750275e..588a9227a2 100644
--- a/openam-core/src/main/java/com/iplanet/services/comm/client/PLLNotificationServlet.java
+++ b/openam-core/src/main/java/com/iplanet/services/comm/client/PLLNotificationServlet.java
@@ -48,7 +48,7 @@
  * The PLLNotificationServlet class is used to receive
  * notifications from servers and forward those notifications to the high level
  * services and applications for processing.
- * 
    
+ * 
    
  * The doPost() method gets the XML NotificationSet document from the
  * HttpRequest object, then parses the XML documnent and reconstructs a
  * NotificationSet object.
diff --git a/openam-core/src/main/java/com/iplanet/services/comm/server/PLLAuditor.java b/openam-core/src/main/java/com/iplanet/services/comm/server/PLLAuditor.java
index 2e41fe0457..ae7cbd8200 100644
--- a/openam-core/src/main/java/com/iplanet/services/comm/server/PLLAuditor.java
+++ b/openam-core/src/main/java/com/iplanet/services/comm/server/PLLAuditor.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 com.iplanet.services.comm.server;
 
@@ -66,7 +66,7 @@ public class PLLAuditor {
      * @param debug               Debug instance.
      * @param auditEventPublisher AuditEventPublisher to which publishing of events can be delegated.
      * @param auditEventFactory   AuditEventFactory for audit event builders.
-     * @param httpServletRequest
+     * @param httpServletRequest  the HTTP servlet request associated with the operation to be audited.
      */
     public PLLAuditor(Debug debug, AuditEventPublisher auditEventPublisher, AuditEventFactory auditEventFactory,
                       HttpServletRequest httpServletRequest) {
@@ -79,8 +79,6 @@ public PLLAuditor(Debug debug, AuditEventPublisher auditEventPublisher, AuditEve
 
     /**
      * Publishes an audit event with details of the attempted CREST operation, if the 'access' topic is audited.
-     *
-     * @throws AuditException If an exception occurred that prevented the audit event from being published.
      */
     public void auditAccessAttempt() {
         if (auditEventPublisher.isAuditing(realm, ACCESS_TOPIC, EventName.AM_ACCESS_ATTEMPT)) {
@@ -102,7 +100,7 @@ public void auditAccessAttempt() {
 
     /**
      * Publishes an event with details of the successfully completed CREST operation, if the 'access' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      */
@@ -133,7 +131,7 @@ public void auditAccessSuccess() {
 
     /**
      * Publishes an event with details of the failed CREST operation, if the 'access' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      *
@@ -145,7 +143,7 @@ public void auditAccessFailure(String message) {
 
     /**
      * Publishes an event with details of the failed CREST operation, if the 'access' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      *
diff --git a/openam-core/src/main/java/com/iplanet/services/comm/server/PLLRequestServlet.java b/openam-core/src/main/java/com/iplanet/services/comm/server/PLLRequestServlet.java
index ab6bc48f3e..a9887392d2 100644
--- a/openam-core/src/main/java/com/iplanet/services/comm/server/PLLRequestServlet.java
+++ b/openam-core/src/main/java/com/iplanet/services/comm/server/PLLRequestServlet.java
@@ -55,7 +55,7 @@
  * The PLLRequestServlet class is used to receive requests from
  * applications and forward those requests to the corresponding servers for
  * processing.
- * 
    
+ * 
    
  * The doPost() method gets the XML RequestSet document from the HttpRequest
  * object, then parses the XML documnent and reconstructs a RequestSet object.
  * 
diff --git a/openam-core/src/main/java/com/iplanet/services/comm/server/RequestHandler.java b/openam-core/src/main/java/com/iplanet/services/comm/server/RequestHandler.java
index 3786616603..c953fe848d 100644
--- a/openam-core/src/main/java/com/iplanet/services/comm/server/RequestHandler.java
+++ b/openam-core/src/main/java/com/iplanet/services/comm/server/RequestHandler.java
@@ -25,7 +25,7 @@
  * $Id: RequestHandler.java,v 1.2 2008/06/25 05:41:35 qcheng Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.iplanet.services.comm.server;
@@ -44,7 +44,7 @@
  * The RequestHandler interface needs to be implemented by high
  * level services and applications in order to be able to receive requests from
  * the Platform Low Level API.
- * 
    
+ * 
    
  * High level services and applications shall return Response objects filled
  * with exception classes and exception messages if there is an exception during
  * the request processing.
@@ -61,7 +61,7 @@ public interface RequestHandler {
      * @param auditor
      *            Delegate for publication of 'access' audit events.
      * @param requests
-     *            A Set of Request objects.
+     *            A {@code Set} of Request objects.
      * @param servletRequest
      *            Reference to HttpServletRequest object.
      * @param servletResponse
diff --git a/openam-core/src/main/java/com/iplanet/services/comm/share/NotificationSet.java b/openam-core/src/main/java/com/iplanet/services/comm/share/NotificationSet.java
index 2b06e552e0..fa643815bd 100644
--- a/openam-core/src/main/java/com/iplanet/services/comm/share/NotificationSet.java
+++ b/openam-core/src/main/java/com/iplanet/services/comm/share/NotificationSet.java
@@ -25,6 +25,7 @@
  * $Id: NotificationSet.java,v 1.2 2008/06/25 05:41:35 qcheng Exp $
  *
  * Portions Copyrighted 2011-2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.services.comm.share;
 
@@ -33,8 +34,7 @@
 /**
  * This NotificationSet class represents a NotificationSet XML
  * document. The NotificationSet DTD is defined as the following:
- * 
    
- * 
+ *
  * 
      *     <?xml version="1.0">
  *     < !-- This DTD is used by PLL -->
@@ -49,8 +49,7 @@
  *       dtdid CDATA #IMPLIED>
  *     ]>
  * 
    
- * 
- * 
    
+ *
  * Each NotificationSet object contains a version, service ID, notification set
  * ID, and a collection of Notification objects. The NotificationSet views each
  * Notification object as a String. This makes it possible that the content of
diff --git a/openam-core/src/main/java/com/iplanet/services/comm/share/RequestSet.java b/openam-core/src/main/java/com/iplanet/services/comm/share/RequestSet.java
index 114bd66c6b..fd9c55ae2f 100644
--- a/openam-core/src/main/java/com/iplanet/services/comm/share/RequestSet.java
+++ b/openam-core/src/main/java/com/iplanet/services/comm/share/RequestSet.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -39,8 +40,7 @@
 /**
  * This RequestSet class represents a RequestSet XML document.
  * The RequestSet DTD is defined as the following:
- * 
    
- * 
+ *
  * 
      *    <?xml version="1.0">
  *    < !-- This DTD is used by PLL -->
@@ -56,8 +56,7 @@
  *       sid   CDATA #IMPLIED>
  *    ]>
  * 
    
- * 
- * 
    
+ *
  * Each RequestSet object contains a version, service ID, request set ID, and a
  * collection of Request objects. The RequestSet views each Request object as a
  * String. This makes it possible that the content of the Request object can be
diff --git a/openam-core/src/main/java/com/iplanet/services/comm/share/ResponseSet.java b/openam-core/src/main/java/com/iplanet/services/comm/share/ResponseSet.java
index ac443c29d0..2bc37a8993 100644
--- a/openam-core/src/main/java/com/iplanet/services/comm/share/ResponseSet.java
+++ b/openam-core/src/main/java/com/iplanet/services/comm/share/ResponseSet.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -36,8 +37,7 @@
 /**
  * This ResponseSet class represents a ResponseSet XML document.
  * The ResponseSet DTD is defined as the following:
- * 
    
- * 
+ *
  * 
      *     <?xml version="1.0">
  *     < !-- This DTD is used by PLL -->
@@ -52,8 +52,7 @@
  *       dtdid CDATA #IMPLIED>
  *     ]>
  * 
    
- * 
- * 
    
+ *
  * Each ResponseSet object contains a version, service ID, response set ID, the
  * original request set ID, and a collection of Response objects. The
  * ResponseSet views each Response object as a String. This makes it possible
diff --git a/openam-core/src/main/java/com/iplanet/services/ldap/DSConfigMgr.java b/openam-core/src/main/java/com/iplanet/services/ldap/DSConfigMgr.java
index 6347b7ff48..5e93e3373c 100644
--- a/openam-core/src/main/java/com/iplanet/services/ldap/DSConfigMgr.java
+++ b/openam-core/src/main/java/com/iplanet/services/ldap/DSConfigMgr.java
@@ -25,6 +25,7 @@
  * $Id: DSConfigMgr.java,v 1.18 2009/01/28 05:34:49 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.services.ldap;
@@ -141,7 +142,7 @@ public class DSConfigMgr implements IDSConfigMgr {
      * variable.
      * 
      * @return DSConfigMgr The singleton instance.
-     * @throws LDAPServiceException
+     * @throws LDAPServiceException if the configuration manager cannot be initialized.
      */
     public static synchronized DSConfigMgr getDSConfigMgr()
             throws LDAPServiceException {
diff --git a/openam-core/src/main/java/com/iplanet/services/ldap/ModSet.java b/openam-core/src/main/java/com/iplanet/services/ldap/ModSet.java
index 0def53a607..baad420938 100644
--- a/openam-core/src/main/java/com/iplanet/services/ldap/ModSet.java
+++ b/openam-core/src/main/java/com/iplanet/services/ldap/ModSet.java
@@ -25,6 +25,7 @@
  * $Id: ModSet.java,v 1.4 2009/01/28 05:34:49 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.services.ldap;
@@ -132,15 +133,13 @@ public void removeElementAt(int index) {
     /**
      * Specifies another modification to be added to the set of modifications.
      * @param op the type of modification to make. This can be one of the following:
-     *   
    
      *   
      
      *   
    • LDAPModification.ADD (the value should be added to the attribute)
      *   
    • LDAPModification.DELETE (the value should be removed from the attribute)
      *   
    • LDAPModification.REPLACE (the value should replace the existing value of the attribute)
-     *   
    
+     *   

      * If you are working with a binary value (not a string value), you need to bitwise OR (|) the
      * modification type with LDAPModification.BVALUES.
-     * 

      *
      * @param attr the attribute (possibly with values) to modify
      */
diff --git a/openam-core/src/main/java/com/iplanet/services/ldap/ServerInstance.java b/openam-core/src/main/java/com/iplanet/services/ldap/ServerInstance.java
index cf49e4ce1e..789da5f7a5 100644
--- a/openam-core/src/main/java/com/iplanet/services/ldap/ServerInstance.java
+++ b/openam-core/src/main/java/com/iplanet/services/ldap/ServerInstance.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -32,7 +33,7 @@
 package com.iplanet.services.ldap;
 
 /**
- * The server instance object represents a tuple of . This
+ * The server instance object represents a tuple of {@code }. This
  * Server object provides information regarding the server name, port number.
  * The user object provides the information regarding the authentication type,
  * authentication dn, and password. The baseDN is the search base, which must be
diff --git a/openam-core/src/main/java/com/iplanet/services/naming/SessionIDCorrector.java b/openam-core/src/main/java/com/iplanet/services/naming/SessionIDCorrector.java
index e64ae885dd..afc58b6efe 100644
--- a/openam-core/src/main/java/com/iplanet/services/naming/SessionIDCorrector.java
+++ b/openam-core/src/main/java/com/iplanet/services/naming/SessionIDCorrector.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.services.naming;
 
@@ -35,7 +36,7 @@
  * these two fields are used.
  *
  * This class balances two competing requirements. The need to be accurate with
- * the Server>Site mapping, and the need to be performant as this code will
+ * the Server>Site mapping, and the need to be performant as this code will
  * be triggered on every invocation of {@link SessionID}.
  */
 public class SessionIDCorrector {
@@ -146,7 +147,7 @@ public String toString() {
      * SessionID S1/SI gives us the following logic:
      *
      * S1 not set, SI set = Primary Server ID
-     * S1 set, SI set = Primary Server ID & Site ID
+     * S1 set, SI set = Primary Server ID & Site ID
      * S1 set, SI not set = Primary Server ID (never used)
      *
      * When working with S1/SI IDs we need to ensure we are working with
diff --git a/openam-core/src/main/java/com/iplanet/services/naming/WebtopNaming.java b/openam-core/src/main/java/com/iplanet/services/naming/WebtopNaming.java
index 6a53e9866e..b7ab6a966b 100644
--- a/openam-core/src/main/java/com/iplanet/services/naming/WebtopNaming.java
+++ b/openam-core/src/main/java/com/iplanet/services/naming/WebtopNaming.java
@@ -25,6 +25,7 @@
  * $Id: WebtopNaming.java,v 1.31 2009/06/20 06:17:02 bigfatrat Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.services.naming;
 
@@ -378,7 +379,7 @@ public static URL mapSiteToServer(
      *
      * @return the site URL
      *
-     * @throws URLNotFoundException
+     * @throws URLNotFoundException if the server URL cannot be resolved for the session
      */
     public static String mapSiteToServer(SessionID sid) throws URLNotFoundException {
         URL mapSessionServiceUrl = mapSiteToServer(sid.getSessionServerProtocol(), sid.getSessionServer(),
diff --git a/openam-core/src/main/java/com/iplanet/services/naming/share/NamingRequest.java b/openam-core/src/main/java/com/iplanet/services/naming/share/NamingRequest.java
index c04c5e4415..10cc8c6efb 100644
--- a/openam-core/src/main/java/com/iplanet/services/naming/share/NamingRequest.java
+++ b/openam-core/src/main/java/com/iplanet/services/naming/share/NamingRequest.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -34,8 +35,7 @@
 /**
  * This NamingRequest class represents a NamingRequest XML
  * document. The NamingRequest DTD is defined as the following:
- * 

- * 
+ *
  * 
  *     <?xml version="1.0">
  *     < !DOCTYPE NamingRequest [
@@ -47,8 +47,6 @@
  *     < !ELEMENT GetNamingProfile EMPTY>
  *     ]>
  * 

- * 
- * 

  */
 
 public class NamingRequest {
diff --git a/openam-core/src/main/java/com/iplanet/services/naming/share/NamingResponse.java b/openam-core/src/main/java/com/iplanet/services/naming/share/NamingResponse.java
index 1b3242d941..43a9f533f9 100644
--- a/openam-core/src/main/java/com/iplanet/services/naming/share/NamingResponse.java
+++ b/openam-core/src/main/java/com/iplanet/services/naming/share/NamingResponse.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -38,8 +39,7 @@
 /**
  * This NamingResponse class represents a NamingResponse XML
  * document. The NamingResponse DTD is defined as the following:
- * 

- * 
+ *
  * 
  *     <?xml version="1.0">
  *     < !DOCTYPE NamingResponse [
@@ -55,8 +55,6 @@
  *     < !ELEMENT Exception (#PCDATA)>
  *     ]>
  * 

- * 
- * 

  */
 
 public class NamingResponse {
diff --git a/openam-core/src/main/java/com/iplanet/services/util/I18n.java b/openam-core/src/main/java/com/iplanet/services/util/I18n.java
index 21929b7e9e..33cbd64977 100644
--- a/openam-core/src/main/java/com/iplanet/services/util/I18n.java
+++ b/openam-core/src/main/java/com/iplanet/services/util/I18n.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -333,7 +334,7 @@ private static String format(MessageFormat mf, Object o) {
      * @param pattern
      *            pattern for which the message to be formatted
      * @param j
-     *            Object to be formatted & substituted
+     *            Object to be formatted & substituted
      * @param l
      *            locale in a string format
      * @return Returns the formatted message
@@ -353,7 +354,7 @@ public static String format(String pattern, Long j, String l) {
      * @param pattern
      *            pattern for which the message to be formatted
      * @param i
-     *            Integer to be formatted & substituted
+     *            Integer to be formatted & substituted
      * @param l
      *            locale in a string format
      * @return Returns the formatted message
diff --git a/openam-core/src/main/java/com/iplanet/services/util/ParseOutput.java b/openam-core/src/main/java/com/iplanet/services/util/ParseOutput.java
index 027eb7b6b2..63a061344b 100644
--- a/openam-core/src/main/java/com/iplanet/services/util/ParseOutput.java
+++ b/openam-core/src/main/java/com/iplanet/services/util/ParseOutput.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -34,7 +35,6 @@
 /**
  * Application shall implement this interface and store the result in the XML
  * DOM tree.
- * 

  */
 public interface ParseOutput {
     /**
diff --git a/openam-core/src/main/java/com/iplanet/services/util/XMLParser.java b/openam-core/src/main/java/com/iplanet/services/util/XMLParser.java
index 3543671a03..04f8222100 100644
--- a/openam-core/src/main/java/com/iplanet/services/util/XMLParser.java
+++ b/openam-core/src/main/java/com/iplanet/services/util/XMLParser.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -137,8 +138,8 @@ public XMLParser() {
      * 

      * Use default GenericNode as node type if usegeneric is true.
      * 

-     * 
-     * @param usegeneric
+     *
+     * @param usegeneric if true, use the default GenericNode as the node type
      */
     public XMLParser(boolean usegeneric, Map groupContainer) {
         useGenericClass = usegeneric;
diff --git a/openam-core/src/main/java/com/iplanet/sso/SSOTokenManager.java b/openam-core/src/main/java/com/iplanet/sso/SSOTokenManager.java
index c3d023b361..f622878d91 100644
--- a/openam-core/src/main/java/com/iplanet/sso/SSOTokenManager.java
+++ b/openam-core/src/main/java/com/iplanet/sso/SSOTokenManager.java
@@ -25,7 +25,7 @@
  * $Id: SSOTokenManager.java,v 1.7 2009/02/18 23:59:36 qcheng Exp $
  *
  * Portions copyright 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.iplanet.sso;
@@ -361,7 +361,7 @@ public SSOToken createSSOToken(Principal user, String password)
      * @exception SSOException
      *                if the single sign on token cannot be created.
      * @exception UnsupportedOperationException
-     * 
+     *                if the operation is not supported by the provider.
      */
     public SSOToken createSSOToken(String tokenId)
             throws UnsupportedOperationException, SSOException {
@@ -391,7 +391,7 @@ public SSOToken createSSOToken(String tokenId)
      * @exception SSOException
      *                if the single sign on token cannot be created.
      * @exception UnsupportedOperationException
-     * 
+     *                if the operation is not supported by the provider.
      */
     public SSOToken createSSOToken(String tokenId, String clientIP)
             throws UnsupportedOperationException, SSOException {
diff --git a/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOPrincipal.java b/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOPrincipal.java
index 7cfb258468..9cfde2f1d8 100644
--- a/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOPrincipal.java
+++ b/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOPrincipal.java
@@ -25,6 +25,7 @@
  * $Id: SSOPrincipal.java,v 1.2 2008/06/25 05:41:42 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.sso.providers.dpro;
@@ -43,7 +44,7 @@ public class SSOPrincipal implements java.security.Principal {
     /**
      * Creates a SSOPrincipal object
      * 
-     * @param String The name of the principal
+     * @param name The name of the principal
      */
 
     public SSOPrincipal(String name) {
@@ -53,7 +54,7 @@ public SSOPrincipal(String name) {
     /**
      * Compares this principal to the specified object.  Returns true
      * if the object passed in matches the principal.
-     * @param Object The object to be compared
+     * @param object The object to be compared
      * @return trueif the principal match.
      *         false
      */
diff --git a/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOProviderImpl.java b/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOProviderImpl.java
index 1e5af06217..bd47c06a49 100644
--- a/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOProviderImpl.java
+++ b/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOProviderImpl.java
@@ -28,7 +28,7 @@
 
 /**
  * Portions copyright 2013-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.iplanet.sso.providers.dpro;
 
@@ -86,8 +86,8 @@ public final class SSOProviderImpl implements SSOProvider {
     /**
      * Constructs a instance of SSOProviderImpl
      *
-     * @throws SSOException
-     * 
+     * @throws SSOException if the provider cannot be initialized
+     *
      */
     public SSOProviderImpl() throws SSOException {
         this(SessionCache.getInstance());
@@ -229,7 +229,7 @@ public SSOToken createSSOToken(String tokenId, boolean invokedByAuth, boolean po
      * @param tokenId single sign on token ID.
      * @return single sign on token.
      * @throws SSOException                  if the single sign on token cannot be created.
-     * @throws UnsupportedOperationException
+     * @throws UnsupportedOperationException if this operation is not supported
      * @deprecated Use #createSSOToken(String, String)
      */
     public SSOToken createSSOToken(String tokenId)
diff --git a/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOTokenIDImpl.java b/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOTokenIDImpl.java
index 51f021eb64..93ca9bdc4e 100644
--- a/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOTokenIDImpl.java
+++ b/openam-core/src/main/java/com/iplanet/sso/providers/dpro/SSOTokenIDImpl.java
@@ -25,6 +25,7 @@
  * $Id: SSOTokenIDImpl.java,v 1.2 2008/06/25 05:41:43 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.sso.providers.dpro;
@@ -73,7 +74,7 @@ public String toString() {
      * and only if the argument is not null and the random string and server
      * name are the same in both objects.
      * 
-     * @param an
+     * @param object
      *            Object - the object to compare this SessionID against.
      * @return true if the SessionID are equal; false otherwise.
      */
diff --git a/openam-core/src/main/java/com/iplanet/ums/ConfigManagerUMS.java b/openam-core/src/main/java/com/iplanet/ums/ConfigManagerUMS.java
index 3d90587d45..1db65cb48d 100644
--- a/openam-core/src/main/java/com/iplanet/ums/ConfigManagerUMS.java
+++ b/openam-core/src/main/java/com/iplanet/ums/ConfigManagerUMS.java
@@ -25,6 +25,7 @@
  * $Id: ConfigManagerUMS.java,v 1.6 2009/01/28 05:34:50 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -69,7 +70,6 @@
  * Configuration Manager is responsible for getting configuration parameters for
  * UMS. ConfigManager is implemented as a singleton and the configurations can
  * be accessed as follows:
- * 

  * 
  * 
  *  ConfigManager cm = ConfigManager.getConfigManager(); 
@@ -87,8 +87,7 @@
  * speeds up the retrieval in caching the configurations at start up time once
  * as a singleton and share it among the ums package. ConfigManager uses the
  * default PROXY as AuthPrincipal for this instance of the server.
- * 
- * 

+ *
  */
 public class ConfigManagerUMS implements java.io.Serializable {
 
@@ -657,7 +656,7 @@ public Set getConfigTemplateNames(Guid guid, String template, int lookup)
      *        applies.
      * @return Collection of attrSets pertaining to the structure
      *         templates in the DIT.
-     * @throws ConfigManagerException.
+     * @throws ConfigManagerException if the entity information cannot be retrieved
      */
     public Set getEntity(Guid guid, String name) throws ConfigManagerException {
         Set ret = (Set) getConfigData(guid, name, ENTITY,
@@ -680,7 +679,7 @@ public Set getEntity(Guid guid, String name) throws ConfigManagerException {
      *        ConfigManager to begin searching for DIT
      *        information (for structural entities).
      * @param templateName Template name.
-     * @param lookup
+     * @param lookup the lookup scope used when searching for the template
      * @return AttrSet value pertaining to the structural template
      *         in the DIT. Usage:
      *         
@@ -692,7 +691,7 @@ public Set getEntity(Guid guid, String name) throws ConfigManagerException {
      *         matching BasicUserSearch and returns the first one
      *         matched. If found in cache, it returns that. Else it looks it up
      *         in the Directory through SMS (traverses the tree if need be).
-     * @throws ConfigManagerException.
+     * @throws ConfigManagerException if the search template cannot be retrieved
      */
     public AttrSet getSearchTemplate(Guid guid, String templateName, int lookup)
             throws ConfigManagerException {
@@ -711,7 +710,7 @@ public AttrSet getSearchTemplate(Guid guid, String templateName, int lookup)
      *        ConfigManager to begin searching for DIT information
      *        (for structural entities).
      * @param templateName Template name.
-     * @param lookup
+     * @param lookup the lookup scope used when searching for the template
      * @return AttrSet value pertaining to the structural template
      *         in the DIT.  Usage:
      *         
@@ -723,7 +722,7 @@ public AttrSet getSearchTemplate(Guid guid, String templateName, int lookup)
      *         matching BasicUser and returns the first one
      *         matched. If found in cache, it returns that. Else it looks it
      *         up in the Directory through SMS (traverses the tree if need be)
-     * @throws ConfigManagerException.
+     * @throws ConfigManagerException if the creation template cannot be retrieved
      */
     public AttrSet getCreationTemplate(
         Guid guid,
@@ -747,7 +746,7 @@ public AttrSet getCreationTemplate(
      * 
      * @param guid Organization DN.
      * @param className Name of javaclass Attribute to be matched.
-     * @param lookup
+     * @param lookup the lookup scope used when searching for the template
      * @return Attribute key-value pair of Creation templates.  Usage:
      *         
      *         AttrSet a = CM.getCreationTemplateForClass(
@@ -795,7 +794,7 @@ public Set getCreationTemplateNames(Guid guid)
      * 
      * @param guid Organization to look under.
      * @return Set of template name.
-     * @throws ConfigManagerException.
+     * @throws ConfigManagerException if the search template names cannot be retrieved
      */
     public Set getSearchTemplateNames(Guid guid) throws ConfigManagerException {
         return getConfigTemplateNames(guid, SEARCH, TemplateManager.SCOPE_ORG);
@@ -811,8 +810,8 @@ public Set getSearchTemplateNames(Guid guid) throws ConfigManagerException {
      * exist under any other organization except the root.
      * 
      * @return an array of Objectclass/Javaclass pairs.
-     * @exception ConfigManagerException.
-     * 
+     * @exception ConfigManagerException if the class resolver cannot be retrieved
+     *
      * Usage: String[][] a = CM.getClassResolver() Looks up the attributes at
      * the top level /ObjectResolver/templates/iDA Caches it first.
      */
@@ -831,7 +830,7 @@ public String[][] getClassResolver() throws ConfigManagerException {
      * @param guid the GUID it is looking under.
      * @param templateName Name of the template.
      * @param attrSet attribute-values pair to be replaced.
-     * @exception ConfigManagerException.
+     * @exception ConfigManagerException if the creation template cannot be replaced
      */
     public void replaceCreationTemplate(Guid guid, String templateName,
             AttrSet attrSet) throws ConfigManagerException {
diff --git a/openam-core/src/main/java/com/iplanet/ums/DataLayer.java b/openam-core/src/main/java/com/iplanet/ums/DataLayer.java
index 0940430257..5ee97effa1 100644
--- a/openam-core/src/main/java/com/iplanet/ums/DataLayer.java
+++ b/openam-core/src/main/java/com/iplanet/ums/DataLayer.java
@@ -25,6 +25,7 @@
  * $Id: DataLayer.java,v 1.19 2009/11/20 23:52:52 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -418,7 +419,7 @@ public Collection getAttributes(Principal principal, Guid guid, Collection
      * @param principal Authenticated Principal.
      * @param guid Distinguished name.
      * @param attrSet attribute set containing name/value pairs.
-     * @exception AccessRightsException if insufficient access>
+     * @exception AccessRightsException if insufficient access
      * @exception EntryAlreadyExistsException if the entry already exists.
      * @exception UMSException if fail to add entry.
      *
@@ -991,10 +992,8 @@ public SearchResults searchIDs(
      *                insufficient access
      * @exception UMSException
      *                Fail to fetch the schema.
-     * @exception LdapException
-     *                Error with LDAP connection.
      *
-     * 
+     *
      */
     public Schema getSchema(java.security.Principal principal) throws UMSException {
         ResultCode errorCode;
diff --git a/openam-core/src/main/java/com/iplanet/ums/ISearch.java b/openam-core/src/main/java/com/iplanet/ums/ISearch.java
index cf881b4056..debef07dca 100644
--- a/openam-core/src/main/java/com/iplanet/ums/ISearch.java
+++ b/openam-core/src/main/java/com/iplanet/ums/ISearch.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -40,7 +41,6 @@
  * Examples:
  * 

  * To modify a user's telphone number
- * 

  * 
  * 
  *       SearchResults searchResults = 
@@ -55,7 +55,6 @@
  * 
  * 

  * To read data using VLV
- * 

  * 
  * 
  *       SearchControl searchControl = new SearchControl();
@@ -141,7 +140,7 @@ public SearchResults getChildren(SearchTemplate template,
      *            search filter
      * @param searchControl
      *            search control, use default setting if searchControl == null
-     * @exception com.iplanet.ums.UMSException
+     * @exception com.iplanet.ums.UMSException if the search operation cannot be performed.
      * @return An search result class for reading IDs.
      * @exception InvalidSearchFilterException
      *                if search filter is invalid.
@@ -161,8 +160,8 @@ public SearchResults search(String filter, SearchControl searchControl)
      * @param searchControl Search control, use default setting if
      *        searchControl is null.
      * @return An search result class for reading entries.
-     * @exception InvalidSearchFilterException
-     * @exception UMSException
+     * @exception InvalidSearchFilterException if the search filter is invalid.
+     * @exception UMSException if no result matches.
      */
     public SearchResults search(
         String filter,
@@ -179,7 +178,7 @@ public SearchResults search(
      *            search template
      * @param searchControl
      *            search control, use default setting if searchControl == null
-     * @exception com.iplanet.ums.UMSException
+     * @exception com.iplanet.ums.UMSException if the search operation cannot be performed.
      */
     public SearchResults search(SearchTemplate template,
             SearchControl searchControl) throws UMSException;
diff --git a/openam-core/src/main/java/com/iplanet/ums/Organization.java b/openam-core/src/main/java/com/iplanet/ums/Organization.java
index 17d8a9dc71..45b68c8beb 100644
--- a/openam-core/src/main/java/com/iplanet/ums/Organization.java
+++ b/openam-core/src/main/java/com/iplanet/ums/Organization.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -184,7 +185,7 @@ public String getName() throws UMSException {
 
     /**
      * Get roles associated with the organization
-     * 

+     * 

      * TODO: Not yet implemented
      * 
      * @return guid identifying roles object under the organization
@@ -196,7 +197,7 @@ public String getName() throws UMSException {
 
     /**
      * Get groups of which the organization is a member.
-     * 

+     * 

      * TODO: Not yet implemented
      * 
      * @return guids identifying groups that the organization is a member of
@@ -245,13 +246,12 @@ private String getPeopleContainer(User user) throws UMSException {
      * @param filter
      *            filter representation of the rule. Accepts filter string with
      *            the following format:
-     *            

-     * 
+     *
      * 
      * 
-     * <filter> ::= <and> | <item> <and> ::= '(' '&'
-     *            <itemlist> ')' <itemlist> ::= <item> | <item>
-     *            <itemlist> <item> ::= '(' <attr> '=' <value>
+     * <filter> ::= <and> | <item> <and> ::= '(' '&'
+     *            <itemlist> ')' <itemlist> ::= <item> | <item>
+     *            <itemlist> <item> ::= '(' <attr> '=' <value>
      *            ')'
      * 
      * 

diff --git a/openam-core/src/main/java/com/iplanet/ums/PCMappingTable.java b/openam-core/src/main/java/com/iplanet/ums/PCMappingTable.java
index 411b8c2de2..d753b0d32f 100644
--- a/openam-core/src/main/java/com/iplanet/ums/PCMappingTable.java
+++ b/openam-core/src/main/java/com/iplanet/ums/PCMappingTable.java
@@ -25,6 +25,7 @@
  * $Id: PCMappingTable.java,v 1.3 2009/01/28 05:34:50 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -203,9 +204,9 @@ private String getDefault(AttrSet attrSet) {
      * 
      * 
      * 
-     * <filter> ::= <and> | <item> <and> ::= '(' '&'
-     * <itemlist> ')' <itemlist> ::= <item> | <item>
-     * <itemlist> <item> ::= '(' <attr> '=' <value> ')'
+     * <filter> ::= <and> | <item> <and> ::= '(' '&'
+     * <itemlist> ')' <itemlist> ::= <item> | <item>
+     * <itemlist> <item> ::= '(' <attr> '=' <value> ')'
      * 
      * 

      * 
diff --git a/openam-core/src/main/java/com/iplanet/ums/PeopleContainer.java b/openam-core/src/main/java/com/iplanet/ums/PeopleContainer.java
index 7bef4a9d83..8f765bc1f1 100644
--- a/openam-core/src/main/java/com/iplanet/ums/PeopleContainer.java
+++ b/openam-core/src/main/java/com/iplanet/ums/PeopleContainer.java
@@ -25,6 +25,7 @@
  * $Id: PeopleContainer.java,v 1.4 2009/01/28 05:34:50 ww203982 Exp $
  *
  * Portions Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -101,7 +102,7 @@ public PeopleContainer(CreationTemplate template, AttrSet attrSet)
      * 
      * @param user
      *            User object to be added to the container
-     * @exception AccessRightsEsception
+     * @exception AccessRightsException
      *                if an access rights exception occurs
      * @exception EntryAlreadyExistsException
      *                if the entry already exists
@@ -119,7 +120,7 @@ public void addUser(User user) throws AccessRightsException,
      * 
      * @param pc
      *            People Container object to be added to the container
-     * @exception AccessRightsEsception
+     * @exception AccessRightsException
      *                if an access rights exception occurs
      * @exception EntryAlreadyExistsException
      *                if the entry already exists
@@ -138,7 +139,7 @@ public void addChildPeopleContainer(PeopleContainer pc)
      * 
      * @param user
      *            User object to be removed to the container
-     * @exception AccessRightsEsception
+     * @exception AccessRightsException
      *                if an access rights exception occurs
      * @exception UMSException
      *                fails to remove the object 
@@ -154,7 +155,7 @@ public void removeUser(User user) throws AccessRightsException,
      * 
      * @param pc
      *            People Container object to be removed to the container
-     * @exception AccessRightsEsception
+     * @exception AccessRightsException
      *                if an access rights exception occurs
      * @exception EntryNotFoundException
      *                if the entry is not found
diff --git a/openam-core/src/main/java/com/iplanet/ums/PersistentObject.java b/openam-core/src/main/java/com/iplanet/ums/PersistentObject.java
index bb31ede0b7..87e1269b73 100644
--- a/openam-core/src/main/java/com/iplanet/ums/PersistentObject.java
+++ b/openam-core/src/main/java/com/iplanet/ums/PersistentObject.java
@@ -25,6 +25,7 @@
  * $Id: PersistentObject.java,v 1.8 2009/07/02 20:27:01 hengming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -124,13 +125,12 @@ protected PersistentObject() {
     /**
      * Constructor for in memory object to be added to the system. You can make
      * the object persistent two ways:
-     * 

+     * 

      * 
      * 1) call add on parent object (recommended)
-     * 

+     * 

      * 2) call save(...) method after all attributes for in memory object are
      * set up properly.
-     * 

      * 
      * @param template
      *            Object creation template. The template holds all the default
@@ -158,13 +158,12 @@ public PersistentObject(CreationTemplate template, AttrSet attrSet)
     /**
      * Constructor for in memory object to be added to the system. You can make
      * the object persistent two ways:
-     * 

+     * 

      * 
      * 1) call add on parent object (recommended)
-     * 

+     * 

      * 2) call save(...) method after all attributes for in memory object are
      * set up properly.
-     * 

      * 
      * @param template
      *            Object creation template. The template holds all the default
@@ -318,10 +317,9 @@ public AttrSet getAttributes(String attrNames[], Locale locale)
 
     /**
      * Set an attribute value for the entity.
-     * 

+     * 

      * IMPORTANT: To make the changes persistent, you need to call the save
      * method to save the changes.
-     * 

      * 
      * @param attr
      *            Attribute and value
@@ -349,10 +347,9 @@ public void setAttribute(Attr attr) {
 
     /**
      * Sets an attribute value with a given locale for the entity.
-     * 

+     * 

      * IMPORTANT: To make the changes persistent, you need to call the save
      * method to save the changes.
-     * 

      * 
      * @param attr
      *            Attribute and value
@@ -384,8 +381,7 @@ public void setAttribute(Attr attr, Locale locale) {
      * @param attrName password attribute name
      * @param oldPassword old password
      * @param newPassword new password
-     * @throws AMException if an error occurs when changing user password
-     * @throws SSOException If user's single sign on token is invalid.
+     * @throws UMSException if an error occurs when changing the user password.
      */
     public void changePassword(String entryDN, String attrName,
         String oldPassword, String newPassword) throws UMSException {
@@ -396,10 +392,9 @@ public void changePassword(String entryDN, String attrName,
 
     /**
      * Removes attribute value for the entity.
-     * 

+     * 

      * IMPORTANT: To make the changes persistent, you need to call the save
      * method to save the changes.
-     * 

      * 
      * @param attr
      *            Attribute to be removed
@@ -444,10 +439,9 @@ public String[] getAttributeNames() {
 
     /**
      * Modifies attribute values for the entity.
-     * 

+     * 

      * IMPORTANT: To make the changes persistent, you need to call the save
      * method to save the changes.
-     * 

      * 
      * @param modSet
      *            Set of modification of attributes
@@ -493,10 +487,9 @@ public void modify(Collection modSet) {
 
     /**
      * Modifies the values of a single attribute for the entity.
-     * 

+     * 

      * IMPORTANT: To make the changes persistent, you need to call the save
      * method to save the changes.
-     * 

      * 
      * @param attr
      *            Attribute value to be modified
@@ -521,10 +514,9 @@ public void modify(Attr attr, ModificationType modificationType) {
 
     /**
      * Modify a single attribute for the entity.
-     * 

+     * 

      * IMPORTANT: To make the changes persistent, you need to call the save
      * method to save the changes.
-     * 

      * 
      * @param attrName
      *            Attribute name of the attribute to be modified
@@ -611,7 +603,7 @@ public void rename(String newRDN, boolean deleteOldName)
      * Save the modification(s) to the object. Save the changes made so far for
      * the persistent object. In other words, make the changes persistent for
      * the object.
-     * 

+     * 

      * This save method takes no parameter. You use this save method when the
      * object is already instantiated. For example,
      * 
@@ -622,7 +614,6 @@ public void rename(String newRDN, boolean deleteOldName)
      * user.save();
      * 

      * 
-     * 

      * 
      * @throws AccessRightsException
      *             if an access rights exception occurs.
@@ -670,7 +661,6 @@ public void save() throws AccessRightsException, EntryNotFoundException,
      * ldap) component in an object. Subclasses may choose to override this
      * function. For instance, User takes either "uid" or "cn" for its
      * identification
-     * 

      * 
      * @return Attribute name for identification
      *
@@ -871,7 +861,7 @@ public void removeChild(PersistentObject object)
      * child ID is a descendant (something being contained) in "this" object
      * 
      * @param childGuid Unique entry identification for the child to be removed.
-     * @throws AccessRights if an access rights exception occurs.
+     * @throws AccessRightsException if an access rights exception occurs.
      * @throws EntryNotFoundException if the entry is not found.
      * @throws UMSException if failure to remove the entry from the persistent
      *         store. Possible causes include AccessRights violation,
@@ -898,10 +888,9 @@ public void removeChild(Guid childGuid) throws AccessRightsException,
      * at hand from the persistent storage but keeps its internal data so that
      * the ums client can save it to somewhere else or make reference to its
      * internal data
-     * 

      * 
-     * @throws AccessRights
-     *             Exception if an access rights exception occurs.
+     * @throws AccessRightsException
+     *             if an access rights exception occurs.
      * @throws EntryNotFoundException
      *             if the entry is not found
      * @throws UMSException
@@ -975,7 +964,6 @@ public Guid getParentGuid() {
     /**
      * Gets the immediate children, subject to search filter constraints. Only
      * the IDs and object classes of each child are returned.
-     * 

      * 
      * @param filter
      *            Search filter
@@ -1044,10 +1032,9 @@ public SearchResults getChildren(String filter,
      * Gets all immediate children under current node based on search criteria
      * specified in template, and returns attributes specified there. Search
      * behavior is controlled by searchControl.
-     * 

+     * 

      * 
      * Returning attributes are determined by the search template
-     * 

      * 
      * @param template
      *            Search template
@@ -1136,7 +1123,6 @@ public SearchResults search(String filter, String[] resultAttributeNames,
      * Gets the attributes specified in the template for all objects at the
      * current level and below which match the search filter in the template.
      * Search behavior is controlled by searchControl.
-     * 

      * 
      * @param template
      *            Search template
@@ -1275,9 +1261,8 @@ static public String idToDN(
 
     /**
      * Maps a dn to guid
-     * 

+     * 

      * TODO: Not yet implemented
-     * 

      */
     static String dnToGuid(String dn) {
         // TODO: Need to fill in base 64 encoding 

@@ -1287,9 +1272,8 @@ static String dnToGuid(String dn) {
 
     /**
      * Maps a guid to dn
-     * 

+     * 

      * TODO: Not yet implemented
-     * 

      */
     static String guidToDN(String guid) {
         // TODO: Need to fill in base 64 encoding 

diff --git a/openam-core/src/main/java/com/iplanet/ums/SchemaManager.java b/openam-core/src/main/java/com/iplanet/ums/SchemaManager.java
index 1b2dc180dc..0b37739f0f 100644
--- a/openam-core/src/main/java/com/iplanet/ums/SchemaManager.java
+++ b/openam-core/src/main/java/com/iplanet/ums/SchemaManager.java
@@ -25,6 +25,7 @@
  * $Id: SchemaManager.java,v 1.4 2009/01/28 05:34:50 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -48,7 +49,6 @@
  * Examples:
  * 

  * To add/delete schema definitions
- * 

  * 
  * 
  * // Gets the schema manager associated with the login Context
diff --git a/openam-core/src/main/java/com/iplanet/ums/SearchTemplate.java b/openam-core/src/main/java/com/iplanet/ums/SearchTemplate.java
index 8d41c071ef..5ba0ee9233 100644
--- a/openam-core/src/main/java/com/iplanet/ums/SearchTemplate.java
+++ b/openam-core/src/main/java/com/iplanet/ums/SearchTemplate.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -36,7 +37,6 @@
  * purpose of defining guidelines in a search. It defines the search filter and
  * attributes to be returned in a search query. Reusability and flexibility are
  * serving goals in SearchTemplate.
- * 

  * 
  * @see Template
  * @see CreationTemplate
@@ -95,7 +95,7 @@ public SearchTemplate(String name, String[] attributeNames, String filter) {
     /**
      * Sets the filter expression used to search for objects of this type, for
      * example, "objectclass=inetorgperson" or
-     * "(&(objectclass=inetorgperson)(ou=accounting))"
+     * "(&(objectclass=inetorgperson)(ou=accounting))"
      * 
      * @param filter
      *            A UMS search expression (LDAP syntax)
diff --git a/openam-core/src/main/java/com/iplanet/ums/StaticGroup.java b/openam-core/src/main/java/com/iplanet/ums/StaticGroup.java
index 5e724d7b7a..e05223e743 100644
--- a/openam-core/src/main/java/com/iplanet/ums/StaticGroup.java
+++ b/openam-core/src/main/java/com/iplanet/ums/StaticGroup.java
@@ -25,6 +25,7 @@
  * $Id: StaticGroup.java,v 1.4 2009/01/28 05:34:51 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -203,9 +204,8 @@ public void addMembers(Guid[] guids) throws UMSException {
      * Gets the members of the group.
      * 
      * @return SearchResults for members of the group
-     * @exception Not
-     *                thrown by this class
-     * 
+     * @exception UMSException
+     *                if an error occurs while retrieving the member identifiers
      */
     public SearchResults getMemberIDs() throws UMSException {
         return getMembers(LEVEL_DIRECT);
@@ -223,10 +223,8 @@ static int getMaxNestingLevel() {
      * @param level
      *            Nesting level
      * @return SearchResults for members of the group
-     * @exception Not
-     *                thrown by this class
-     * 
-     * 
+     * @exception UMSException
+     *                if an error occurs while retrieving the members
      */
     public SearchResults getMembers(int level) throws UMSException {
         Attr attr = getAttribute(MEMBER_ATTR_NAME);
@@ -282,9 +280,8 @@ public SearchResults getMembers(int level) throws UMSException {
      * Gets the member count.
      * 
      * @return Number of members of the group
-     * @exception Not
-     *                thrown by this class
-     * 
+     * @exception UMSException
+     *                if an error occurs while counting the members
      */
     public int getMemberCount() throws UMSException {
         return getMemberCount(LEVEL_DIRECT);
@@ -296,9 +293,8 @@ public int getMemberCount() throws UMSException {
      * @param level
      *            Nesting level
      * @return Number of members of the group
-     * @exception Not
-     *                thrown by this class
-     * 
+     * @exception UMSException
+     *                if an error occurs while counting the members
      */
     public int getMemberCount(int level) throws UMSException {
 
@@ -329,9 +325,8 @@ public int getMemberCount(int level) throws UMSException {
      * @param index
      *            Zero-based index into the group container
      * @return The unique identifier for a member
-     * @exception Not
-     *                thrown by this class
-     * 
+     * @exception UMSException
+     *                if an error occurs while retrieving the member
      */
     public Guid getMemberIDAt(int index) throws UMSException {
         Attr attr = getAttribute(MEMBER_ATTR_NAME);
@@ -347,9 +342,8 @@ public Guid getMemberIDAt(int index) throws UMSException {
      * @param level
      *            Nesting level
      * @return The unique identifier for a member
-     * @exception Not
-     *                thrown by this class
-     * 
+     * @exception UMSException
+     *                if an error occurs while retrieving the member
      */
     public Guid getMemberIDAt(int index, int level) throws UMSException {
         SearchResults allMembers = getMembers(level);
@@ -421,9 +415,9 @@ public void removeAllMembers() throws UMSException {
      * 
      * @param guid
      *            Identity of member to be checked for membership
-     * @return true if it is a member
-     * @exception   Not thrown by this class
-     * 
+     * @return true if it is a member
+     * @exception UMSException
+     *                if an error occurs while checking membership
      */
     public boolean hasMember(Guid guid) throws UMSException {
         return isMemberAtLevel(guid.getDn(), LEVEL_DIRECT);
@@ -457,9 +451,8 @@ private boolean isMemberAtLevel(String normalizedID, int level)
      * @param level
      *            Nesting level
      * @return true if it is a member
-     * @exception Not
-     *                thrown by this class
-     * 
+     * @exception UMSException
+     *                if an error occurs while checking membership
      */
     public boolean hasMember(Guid guid, int level) throws UMSException {
 
diff --git a/openam-core/src/main/java/com/iplanet/ums/Template.java b/openam-core/src/main/java/com/iplanet/ums/Template.java
index 3a0d982e83..4d95882708 100644
--- a/openam-core/src/main/java/com/iplanet/ums/Template.java
+++ b/openam-core/src/main/java/com/iplanet/ums/Template.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -34,7 +35,6 @@
  * Represents Template objects in UMS. This is the abstract class for
  * CreationTemplate for object creation and SearchTemplate for defining
  * guidelines for searching functionality.
- * 

  * 
  * @see CreationTemplate
  * @see SearchTemplate
diff --git a/openam-core/src/main/java/com/iplanet/ums/TemplateManager.java b/openam-core/src/main/java/com/iplanet/ums/TemplateManager.java
index af975c998b..4aaa6dc4bb 100644
--- a/openam-core/src/main/java/com/iplanet/ums/TemplateManager.java
+++ b/openam-core/src/main/java/com/iplanet/ums/TemplateManager.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -45,7 +46,6 @@
  * 
  * 

  * Example:
- * 

  * 
  * 
  * TemplateManager mgr = TemplateManager.getTemplateManager();
diff --git a/openam-core/src/main/java/com/iplanet/ums/UMSException.java b/openam-core/src/main/java/com/iplanet/ums/UMSException.java
index ddacd6df96..aa3f8957c0 100644
--- a/openam-core/src/main/java/com/iplanet/ums/UMSException.java
+++ b/openam-core/src/main/java/com/iplanet/ums/UMSException.java
@@ -25,6 +25,7 @@
  * $Id: UMSException.java,v 1.5 2009/01/28 05:34:51 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums;
@@ -141,7 +142,7 @@
  * ....... ....... } catch (UMSException ux) {
  * 
  * if (ux.getRootCause() instanceof LDAPException) { PrintWriter pw = new
- * PrintWriter(); ux.log(pw); } else {
+ * PrintWriter(<some file stream>); ux.log(pw); } else {
  * System.out.println(ux.getMessage()); }
  *  }
  * 
@@ -297,9 +298,9 @@ public String toString() {
     }
 
     /**
-     * Prints this exception's stack trace to System.err. If this
+     * Prints this exception's stack trace to System.err. If this
      * exception has a root exception; the stack trace of the root exception is
-     * printed to System.err instead.
+     * printed to System.err instead.
      * 
      */
     public void printStackTrace() {
diff --git a/openam-core/src/main/java/com/iplanet/ums/UMSObject.java b/openam-core/src/main/java/com/iplanet/ums/UMSObject.java
index 0553305d4a..3f0f936390 100644
--- a/openam-core/src/main/java/com/iplanet/ums/UMSObject.java
+++ b/openam-core/src/main/java/com/iplanet/ums/UMSObject.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -41,7 +42,6 @@
  * UMSObject class exposes public methods that serve as the entry points to the
  * UMS SDK. This class is used to replace the public static methods that are
  * previously available in Session class.
- * 

  * 
  * 
  *       // Previous access class with authenticated context
diff --git a/openam-core/src/main/java/com/iplanet/ums/dctree/DomainComponentTree.java b/openam-core/src/main/java/com/iplanet/ums/dctree/DomainComponentTree.java
index baff56d14b..e83b813e2b 100644
--- a/openam-core/src/main/java/com/iplanet/ums/dctree/DomainComponentTree.java
+++ b/openam-core/src/main/java/com/iplanet/ums/dctree/DomainComponentTree.java
@@ -25,6 +25,7 @@
  * $Id: DomainComponentTree.java,v 1.5 2009/01/28 05:34:51 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.ums.dctree;
@@ -55,7 +56,6 @@
  * associate with a organizational DIT (convergence tree as noted in nortel
  * spec). Sample of a dctree that starts at dcroot of "o=internet" will look
  * like this
- * 

  * 
  * 
  *               o=internet
@@ -529,7 +529,6 @@ public String mapDCToDomainName(DomainComponent dc) {
      * This function can be used as a cache function for the complete DCTree.
      * The returning hastable provides all the virtual domain name as keys that
      * maps to organization mapping linked in the domain component dc nodes
-     * 

      * 
      * @return Hashtable of domain names and associated organizations. Each
      *         domain name is associated with one organization but muliple
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/AuthContext.java b/openam-core/src/main/java/com/sun/identity/authentication/AuthContext.java
index 4e5701bfaf..1ba712495f 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/AuthContext.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/AuthContext.java
@@ -25,7 +25,7 @@
  * $Id: AuthContext.java,v 1.25 2009/11/21 01:12:59 qcheng Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.authentication;
 
@@ -1108,7 +1108,7 @@ public boolean hasMoreRequirements() {
      * Returns true if the login process requires more information
      * from the user to complete the authentication.
      *
-     * NOTE: This method has to be called as a condition of a while
+     * NOTE: This method has to be called as a condition of a while
      * loop in order to complete the authentication process and get the correct
      * Status after submitting the requirements.
      *
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/UI/LoginLogoutMapping.java b/openam-core/src/main/java/com/sun/identity/authentication/UI/LoginLogoutMapping.java
index 3cf832d066..35a3346244 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/UI/LoginLogoutMapping.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/UI/LoginLogoutMapping.java
@@ -25,7 +25,7 @@
  * $Id: LoginLogoutMapping.java,v 1.11 2009/06/03 20:46:50 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.authentication.UI;           
 
@@ -126,8 +126,8 @@ public void destroy() {
      *
      * @param request servlet request
      * @param response servlet response
-     * @throws ServletException
-     * @throws java.io.IOException
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws java.io.IOException if an I/O error occurs
      */
     protected void processRequest(
         HttpServletRequest request,
@@ -166,8 +166,8 @@ protected void processRequest(
      *
      * @param request servlet request.
      * @param response servlet response.
-     * @throws ServletException
-     * @throws java.io.IOException
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws java.io.IOException if an I/O error occurs
      */
     protected void doGet(
         HttpServletRequest request,
@@ -180,8 +180,8 @@ protected void doGet(
      * Handles the HTTP POST method.
      * @param request servlet request
      * @param response servlet response
-     * @throws ServletException
-     * @throws java.io.IOException
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws java.io.IOException if an I/O error occurs
      */
     protected void doPost(
         HttpServletRequest request,
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/audit/AbstractAuthenticationEventAuditor.java b/openam-core/src/main/java/com/sun/identity/authentication/audit/AbstractAuthenticationEventAuditor.java
index 6e726c2360..16a4cf3c48 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/audit/AbstractAuthenticationEventAuditor.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/audit/AbstractAuthenticationEventAuditor.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.authentication.audit;
 
@@ -106,9 +107,9 @@ protected String getRealmFromState(LoginState loginState) {
     }
 
     /**
-     * Get the realm from the {@Link SSOToken} of the event.
+     * Get the realm from the {@link SSOToken} of the event.
      *
-     * @param token The {@Link SSOToken} of the event.
+     * @param token The {@link SSOToken} of the event.
      * @return The realm or null if it could not be found.
      */
     protected String getRealmFromToken(SSOToken token) {
@@ -121,7 +122,7 @@ protected String getRealmFromToken(SSOToken token) {
     }
 
     /**
-     * Get the failed username from the {@Link LoginState} of the event.
+     * Get the failed username from the {@link LoginState} of the event.
      *
      * @param loginState The login state of the event.
      * @return The username or null if it could not be found.
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditor.java b/openam-core/src/main/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditor.java
index 03043afe9e..6243732daa 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditor.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditor.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
- * Portions Copyrighted 2023-2025 3A Systems LLC
+ * Portions Copyrighted 2023-2026 3A Systems LLC
  */
 package com.sun.identity.authentication.audit;
 
@@ -141,7 +141,7 @@ public void auditLoginFailure(LoginState loginState, AuthenticationFailureReason
     /**
      * Log a logout event.
      *
-     * @param token The {@Link SSOToken} of the event.
+     * @param token The {@link SSOToken} of the event.
      */
     public void auditLogout(SSOToken token) {
         String realm = getRealmFromToken(token);
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/client/AuthClientUtils.java b/openam-core/src/main/java/com/sun/identity/authentication/client/AuthClientUtils.java
index bec53e2b6a..48a0be60e7 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/client/AuthClientUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/client/AuthClientUtils.java
@@ -26,7 +26,7 @@
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
  * Portions Copyrighted 2019 Open Source Solution Technology Corporation
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.authentication.client;
 
@@ -1947,7 +1947,7 @@ public static Cookie createlbCookie(String cookieDomain) throws AuthException {
     /**
      * Returns the Cookie object created based on the cookieName,
      * Session ID and cookieDomain.
-     * If AuthContext,/code> status is not SUCCESS then
+     * If AuthContext status is not SUCCESS then
      * cookie is created with authentication cookie Name, else AM Cookie Name
      * will be used to create cookie.
      *
@@ -2289,7 +2289,7 @@ public static String getAuthCookieValue(HttpServletRequest request) {
 
     /**
      * @deprecated use {@link #getDomainNameByRequest(
-     * jakarta.servlet.http.HttpServletRequest, java.util.Map)} instead.
+     * jakarta.servlet.http.HttpServletRequest, java.util.Map)} instead.
      */
     public static String getDomainNameByRequest(Map requestHash) {
         String realm = getRealmFromPolicyAdvice(requestHash);
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthConfigUtils.java b/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthConfigUtils.java
index 0411e2c8b6..6a596b8490 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthConfigUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthConfigUtils.java
@@ -25,6 +25,7 @@
  * $Id: AMAuthConfigUtils.java,v 1.5 2008/06/25 05:41:51 qcheng Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.authentication.config;
 
@@ -248,9 +249,9 @@ public static String getAuthConfigName(
      * the configName for getAppConfigurationEntry().
      * function in AMConfiguration.
      *
-     * @param organizationDN  DN for the login organization. 
-     * @param clientType
-     * @return Corresponding authentication configuration name. 
+     * @param organizationDN  DN for the login organization.
+     * @param clientType the client type for which the configuration name is generated
+     * @return Corresponding authentication configuration name.
      */
     public static String getAuthConfigName(
         String organizationDN, 
@@ -521,12 +522,12 @@ public static Set getAllNamedConfig(String orgName, SSOToken token)
      * 

      * Here is a sample XML string for an authentication configuration
      * 
-     * <AttributeValuePair> 

-     * <Value>com.sun.identity.authentication.modules.LDAP required 
-     *    debug=true</Value>

-     * <Value>com.sun.identity.authentication.modules.RADIUS
-     *    optional</Value> 
-     * </AttributeValuePair>
+     * <AttributeValuePair> 

+     * <Value>com.sun.identity.authentication.modules.LDAP required
+     *    debug=true</Value>

+     * <Value>com.sun.identity.authentication.modules.RADIUS
+     *    optional</Value>
+     * </AttributeValuePair>
      * 

      * This means user need to pass a required LDAP Login module, then an 
      * optional RADIUS Login module. 
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthLevelManager.java b/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthLevelManager.java
index f2ab05d50f..d6bf9a6c31 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthLevelManager.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthLevelManager.java
@@ -25,6 +25,7 @@
  * $Id: AMAuthLevelManager.java,v 1.3 2008/06/25 05:41:51 qcheng Exp $
  *
  * Portions Copyrighted 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.config;
@@ -351,11 +352,11 @@ private Set getModuleForLevel(int level, Map map) {
     /**
      * Implements methods in com.sun.identity.sm.ServiceListener
      *
-     * @param serviceName
-     * @param version
-     * @param groupName
-     * @param serviceComponent
-     * @param type
+     * @param serviceName the name of the service whose configuration changed
+     * @param version the version of the service
+     * @param groupName the name of the configuration group that changed
+     * @param serviceComponent the service component that changed
+     * @param type the type of configuration change
      */
     public void globalConfigChanged(
         String serviceName,
@@ -377,12 +378,12 @@ public void globalConfigChanged(
     /**
      * Implements methods in com.sun.identity.sm.ServiceListener.
      *
-     * @param serviceName
-     * @param version
-     * @param orgName
-     * @param groupName
-     * @param serviceComponent
-     * @param type
+     * @param serviceName the name of the service whose configuration changed
+     * @param version the version of the service
+     * @param orgName the name of the organization whose configuration changed
+     * @param groupName the name of the configuration group that changed
+     * @param serviceComponent the service component that changed
+     * @param type the type of configuration change
      */
     public void organizationConfigChanged(
         String serviceName,
@@ -412,8 +413,8 @@ public void organizationConfigChanged(
     /**
      * Implements methods in com.sun.identity.sm.ServiceListener.
      *
-     * @param serviceName
-     * @param version
+     * @param serviceName the name of the service whose schema changed
+     * @param version the version of the service
      */
     public void schemaChanged(String serviceName, String version) {
         if (debug.messageEnabled()) {
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthenticationSchema.java b/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthenticationSchema.java
index 0e6f3e589d..eb2b7e45d8 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthenticationSchema.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/config/AMAuthenticationSchema.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -152,7 +153,7 @@ public Map getAttributeValues(Set names) {
      * @param values A map of the names of AttributeSchema to
      *        modify, and a Set of Values which should replace the default
      *        values of the current schema.
-     * @throws SchemaException
+     * @throws SchemaException if the supplied attribute values are invalid for the schema
      * @throws SMSException if an error occurred while performing the operation
      * @throws SSOException if the single sign on token is invalid or expired
      */
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/config/AMSDKEventListener.java b/openam-core/src/main/java/com/sun/identity/authentication/config/AMSDKEventListener.java
index e203cee4c6..c93bd503e1 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/config/AMSDKEventListener.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/config/AMSDKEventListener.java
@@ -25,6 +25,7 @@
  * $Id: AMSDKEventListener.java,v 1.6 2008/08/19 19:08:51 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.config;
@@ -66,7 +67,7 @@ public String getConfigName() {
     /**
      * Implements com.iplanet.am.sdk.AMEventListener.
      *
-     * @param event
+     * @param event the identity repository event that was fired
      * @see com.iplanet.am.sdk.AMEventListener#objectChanged
      */
     public void objectChanged(AMEvent event) {
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/config/AuthConfigurationEntry.java b/openam-core/src/main/java/com/sun/identity/authentication/config/AuthConfigurationEntry.java
index d8c87faa2f..c15485134d 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/config/AuthConfigurationEntry.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/config/AuthConfigurationEntry.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -164,7 +165,7 @@ public String getOptions() {
 
     /**
      * Sets options.
-     * @param options
+     * @param options the authentication options to set
      */
     public void setOptions(String options) {
         this.options = options;
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/internal/AuthContext.java b/openam-core/src/main/java/com/sun/identity/authentication/internal/AuthContext.java
index 53ab3d5b76..d8404e89fb 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/internal/AuthContext.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/internal/AuthContext.java
@@ -25,6 +25,7 @@
  * $Id: AuthContext.java,v 1.10 2009/01/28 05:34:52 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.internal;
@@ -173,7 +174,7 @@ public final class AuthContext extends Object {
      * getRequirements() and submitRequirements()
      * to pass the credentials needed for authentication by the plugin modules.
      *
-     * @throws LoginException
+     * @throws LoginException if the authentication process fails
      *
      * 
      */
@@ -192,7 +193,7 @@ public AuthContext() throws LoginException {
      *            name of the user to be authenticated
      * @param password
      *            password for the user
-     * @throws LoginException
+     * @throws LoginException if the authentication process fails
      *
      * 
      */
@@ -224,7 +225,7 @@ public AuthContext(Principal principal, char[] password, String hostname,
      *            name of the user to be authenticated
      * @param password
      *            password for the user
-     * @throws LoginException
+     * @throws LoginException if the authentication process fails
      *
      * 
      */
@@ -434,7 +435,7 @@ protected AuthContext(String orgName, AuthSubject subject)
      * would then query for the user name and related information.
      *
      * @param orgName organization name.
-     * @throws LoginException
+     * @throws LoginException if the authentication process fails
      *
      * 
      */
@@ -517,7 +518,7 @@ protected AuthSubject getSubject() {
      * Method to start the login process. This method will
      * read the plug-ins configured for the application and initialize them.
      *
-     * @throws LoginException
+     * @throws LoginException if the login process cannot be started
      *
      * 
      */
@@ -647,7 +648,7 @@ public void submitRequiredInformation(Callback[] info) {
     /**
      * Logs the user out.
      *
-     * @throws LoginException
+     * @throws LoginException if an error occurs while logging out
      *
      * 
      */
@@ -773,7 +774,7 @@ protected String getApplicationName() {
      * token can be used as the authenticated token.
      *
      * @return single-sign-on token.
-     * @throws InvalidAuthContextException
+     * @throws InvalidAuthContextException if the authentication context is invalid or authentication has not completed
      *
      * 
      */
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/internal/server/AuthSPrincipal.java b/openam-core/src/main/java/com/sun/identity/authentication/internal/server/AuthSPrincipal.java
index 190d150eae..de23914ba7 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/internal/server/AuthSPrincipal.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/internal/server/AuthSPrincipal.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -72,7 +73,6 @@ public class AuthSPrincipal implements Principal, java.io.Serializable {
     /**
      * Create an AuthSPrincipal with a username.
      * 
-     * 

      * 
      * @param name
      *            the username for this user.
@@ -93,7 +93,6 @@ public AuthSPrincipal(String name) {
     /**
      * Return the username for this AuthPrincipal.
      * 
-     * 

      * 
      * @return the username for this AuthPrincipal
      */
@@ -104,7 +103,6 @@ public String getName() {
     /**
      * Return the AuthMethod for this AuthPrincipal.
      * 
-     * 

      * 
      * @return the AuthMethod for this AuthPrincipal
      */
@@ -115,7 +113,6 @@ public String getAuthMethod() {
     /**
      * Return the AuthLevel for this AuthPrincipal.
      * 
-     * 

      * 
      * @return the AuthLevel for this AuthPrincipal
      */
@@ -126,7 +123,6 @@ public String getAuthLevel() {
     /**
      * Set the AuthMethod for this AuthPrincipal.
      * 
-     * 

      * 
      * @param auth_method
      *            AuthMethod for this AuthPrincipal
@@ -138,7 +134,6 @@ protected void setAuthMethod(String auth_method) {
     /**
      * Set the AuthLevel for this AuthPrincipal.
      * 
-     * 

      * 
      * @param auth_level
      *            AuthLevel for this AuthPrincipal
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/jaas/LoginContext.java b/openam-core/src/main/java/com/sun/identity/authentication/jaas/LoginContext.java
index 75ffc00a1b..99c22eee07 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/jaas/LoginContext.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/jaas/LoginContext.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
  * Portions Copyrighted 2021 Open Identity Platform Community.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.jaas;
@@ -172,11 +173,10 @@ public Subject getSubject() {
     
     /**
      * Sets next module by module name, allows to modify auth chain during auth
-     * 
-     * @param moduleName
-     * 
+     *
+     * @param moduleName the name of the module to set as the next module
      */
-   
+
     public void setNextModule(String moduleName) {
     	boolean found = false;
     	moduleStackQueue.clear();
@@ -199,11 +199,10 @@ public void setNextModule(String moduleName) {
     
     /**
      * Sets next module by module index in chain, allows to modify auth chain during auth
-     * 
-     * @param moduleName
-     * 
+     *
+     * @param moduleIndex the index in the chain of the module to set as the next module
      */
-    
+
     public void setNextModule(int moduleIndex) {
     	moduleStackQueue.clear();
     	for(int i = 0; i < moduleStack.length; i++ ) {
@@ -243,7 +242,7 @@ public List getModuleInstanceNames() {
      * Resets auth chain to particular module, auth chain starts with this module
      * 
      * @param moduleIndex index of module
-     * @throws ResetAuthChainException 
+     * @throws ResetAuthChainException if resetting the auth chain to the module is denied
      */
     
     public void resetAuthChainToModule(int moduleIndex) throws ResetAuthChainException {
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/server/AuthXMLRequest.java b/openam-core/src/main/java/com/sun/identity/authentication/server/AuthXMLRequest.java
index f752d94e49..76b0b9e7ee 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/server/AuthXMLRequest.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/server/AuthXMLRequest.java
@@ -24,7 +24,7 @@
  *
  * $Id: AuthXMLRequest.java,v 1.10 2009/08/17 21:17:50 mrudul_uchil Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 /*
@@ -169,7 +169,7 @@ public void setRequestVersion(String version) {
     /**
      * Sets the authIdentifier - session ID
      *
-     * @param authIdentifier
+     * @param authIdentifier the authentication identifier (session ID) to set
      */
     public void setAuthIdentifier(String authIdentifier) {
         this.authIdentifier = authIdentifier;
@@ -235,7 +235,7 @@ public void setRequestInformation(String requestInfo) {
     /**
      * Sets the index Type.
      *
-     * @param strIndexType
+     * @param strIndexType the index type name to set
      */
     public void setIndexType(String strIndexType) {
         if (strIndexType.equalsIgnoreCase("service")) {
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthD.java b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthD.java
index 31a61bc660..140e7d8b8d 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthD.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthD.java
@@ -26,7 +26,7 @@
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
  * Portions Copyrighted 2016 Nomura Research Institute, Ltd.
- * Portions Copyrighted 2023-2025 3A Systems LLC
+ * Portions Copyrighted 2023-2026 3A Systems LLC
  */
 package com.sun.identity.authentication.service;
 
@@ -979,9 +979,9 @@ public String getOrgDN(String userOrg) {
      * Returns the dynamic replacement of the URL from the Success or Failure 
      * URLs.
      *
-     * @param URL
-     * @param servletRequest
-     * @return the dynamic replacement of the URL from the Success or Failure 
+     * @param URL the URL to process for dynamic replacement
+     * @param servletRequest the servlet request providing the dynamic variable values
+     * @return the dynamic replacement of the URL from the Success or Failure
      * URLs.
      */
     public String processURL(String URL, HttpServletRequest servletRequest) {
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthLevel.java b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthLevel.java
index 489f07810b..23ad3421c2 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthLevel.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthLevel.java
@@ -25,6 +25,7 @@
  * $Id: AuthLevel.java,v 1.3 2008/06/25 05:42:04 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.service;
@@ -184,7 +185,7 @@ public String getModuleName() {
      * generates choice callback.
      *
      * @return choice callback.
-     * @throws AuthException
+     * @throws AuthException if the choice callback cannot be created
      */
     public Callback[] createChoiceCallback() throws AuthException {
         debug.message("In createChoiceCallback");
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthThreadManager.java b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthThreadManager.java
index 070d82df33..72e4c4bf40 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthThreadManager.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthThreadManager.java
@@ -25,6 +25,7 @@
  * $Id: AuthThreadManager.java,v 1.4 2008/06/25 05:42:04 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -121,7 +122,7 @@ public boolean isLoginTimeout(long lastCallbackSent, long timeout) {
     }
 
     /**
-     * Stores the thread as key and the time out value &
+     * Stores the thread as key and the time out value &
      * last callback sent in a Hashtable 
      * @param currentThread will be stored
      * @param pageTimeOut configured timeout value
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthUtils.java b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthUtils.java
index 38dd1caa88..5102c0a9f3 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/AuthUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/AuthUtils.java
@@ -25,7 +25,7 @@
  * $Id: AuthUtils.java,v 1.33 2009/12/15 16:39:47 qcheng Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.authentication.service;
 
@@ -1209,8 +1209,8 @@ public static void setCallbacksPerState(AuthContextLocal authContext,
 
     /**
      * Get the module service name in either
-     * iplanet-am-auth formatService(old) or
-     * sunAMAuthService format(new).
+     * iplanet-am-auth format{@code }Service(old) or
+     * sunAMAuth{@code }Service format(new).
      */
     public static String getModuleServiceName(String moduleName) {
         String serviceName = (String) moduleService.get(moduleName);
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/CompositeAdvices.java b/openam-core/src/main/java/com/sun/identity/authentication/service/CompositeAdvices.java
index 508cd277bf..e5c2637b77 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/CompositeAdvices.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/CompositeAdvices.java
@@ -25,6 +25,7 @@
  * $Id: CompositeAdvices.java,v 1.6 2008/08/19 19:08:53 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.service;
@@ -178,7 +179,7 @@ public String getModuleName() {
      * Returns array of choice callback.
      * Get module matching the level and generate choice callback.
      * @return array of choice callback.
-     * @throws AuthException
+     * @throws AuthException if the choice callback cannot be created
      */
     public Callback[] createChoiceCallback() throws AuthException {
         debug.message("In createChoiceCallback");
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java b/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java
index d3192ab268..3b442a0e71 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java
@@ -26,7 +26,7 @@
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
  * Portions Copyrighted 2016 Nomura Research Institute, Ltd.
- * Portions Copyrighted 2017-2025 3A Systems LLC
+ * Portions Copyrighted 2017-2026 3A Systems LLC
  */
 
 package com.sun.identity.authentication.service;
@@ -504,7 +504,7 @@ void setReceivedCallback(
      * Sets the callbacks recieved and notify waiting thread.
      * Used in non-jaas thread mode only.
      *
-     * @param callback
+     * @param callback the callbacks received from the authentication module
      */
     public void setReceivedCallback_NoThread(Callback[] callback) {
         submittedCallbackInfo = null;
@@ -1084,11 +1084,11 @@ public String getClientType() {
 
     /**
      * Activates session on successful authentication.
-     * 

+     * 

      * Unless the noSession query parameter was set on the request and then in that case no new permanent session is
      * activated and true.
      *
-     * @param subject
+     * @param subject the authenticated subject whose session is being activated
      * @return true if user session is activated successfully, false if failed to activated
      * or true if the noSession parameter is set to true.
      */
@@ -1812,7 +1812,7 @@ private void createSession(
      * Returns the single sign on token associated with the session.
      *
      * @return the single sign on token associated with the session.
-     * @throws SSOException
+     * @throws SSOException if the single sign on token cannot be retrieved
      */
     public SSOToken getSSOToken() throws SSOException {
         if (null == sessionReference || isNoSession()) {
@@ -1981,8 +1981,8 @@ private InternalSession getReferencedOldSession() {
      * default/Login.jsp
      * 

      * In case of non-HTML client, it will try to find
-     * Login_<charset>.jsp.
-     * If not found, it then try Login.jsp.
+     * Login_<charset>.jsp.
+     * If not found, it then try Login.jsp.
      *
      * @return configured jsp file name
      */
@@ -2459,18 +2459,18 @@ public void populateDefaultUserAttributes() throws AMException {
      * token is superAdmin then return. If more then 1 tokens
      * are found then make sure the user tokens are in
      * iplanet-am-useralias-list
-     * 

+     * 

      * If IndexType is LEVEL, MODULE
      * then there is only 1 user token retrieve the profile for the
      * authenticated user and create profile if dynamic profile creation
      * enabled.
-     * 

+     * 

      * If IndexType is ORG, SERVICE,
      * ROLE then retrieve the user profile for first token, if the
      * profile is found and user-alias-list contains other
      * tokens then continue, else try to retrieve remaining tokens till a match
      * is found.
-     * 

+     * 

      * Checks all the users in the tokenSet are active else error
      * For ROLE based authentication checks if all user belong to the same Role.
      *
@@ -5344,9 +5344,9 @@ public void setCallbacksPerState(String pageState, Callback[] callbacks) {
     }
 
     /**
-     * Returns true if cookie detected.
+     * Returns true if cookie detected.
      *
-     * @return true if cookie detected.
+     * @return true if cookie detected.
      */
     public boolean isCookieDetect() {
         return cookieDetect;
@@ -5561,7 +5561,7 @@ boolean isSessionInvalid() {
      *
      * @param roleName role name.
      * @return AMIdentity object.
-     * @throws AuthException
+     * @throws AuthException if the identity for the role cannot be retrieved
      */
     public AMIdentity getRole(String roleName) throws AuthException {
         try {
@@ -6146,7 +6146,7 @@ public boolean is2faMandatory() {
     
     /**
      * Sets a shared state map from the {@link AMLoginModule}.
-     * @param sharedState
+     * @param sharedState the shared state map from the login module
      */
     public void setSharedState(Map sharedState) {
         this.sharedState = sharedState;
@@ -6185,7 +6185,7 @@ void saveSubjectState() {
      * are successful or not. This differs from the principalList which is generated by the logincontext as that is only
      * generated when all modules have been completed successfully.
      * 
-     * @param principalName
+     * @param principalName the name of the authenticated principal to save
      */
     public void saveAuthenticatedPrincipal(String principalName) {
         authenticatedPrincipals.add(principalName);
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/PagePropertiesCallback.java b/openam-core/src/main/java/com/sun/identity/authentication/service/PagePropertiesCallback.java
index 37d6b19d47..bd6a858816 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/PagePropertiesCallback.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/PagePropertiesCallback.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -60,13 +61,13 @@ public class PagePropertiesCallback implements Callback {
     /**
      * Creates PagePropertiesCallback object.
      *
-     * @param name
-     * @param header
-     * @param image
-     * @param timeOut
-     * @param templateName
-     * @param error
-     * @param page_state
+     * @param name the module name
+     * @param header the header text to display
+     * @param image the image to display
+     * @param timeOut the page timeout in seconds
+     * @param templateName the name of the page template
+     * @param error true if the page represents an error
+     * @param page_state the page state identifier
      */
     public PagePropertiesCallback(
         String name,
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/StreamSubstituter.java b/openam-core/src/main/java/com/sun/identity/authentication/service/StreamSubstituter.java
index 26f46559d9..e40b6efcff 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/service/StreamSubstituter.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/service/StreamSubstituter.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -56,13 +57,13 @@ public class StreamSubstituter {
      * Define a string to substitute.
      * In the content being filtered, all occurrences of ...
      * 
-     *     <subst data="key">otherwise</subst>
+     *     <subst data="key">otherwise</subst>
      * 

      * will be replaced with the value defined for "key".
      * If the key has not been defined,
      * then "otherwise" will be copied to the output stream.
      * More than one date="key" may be specified in the same
-     * <subst> tag in which case they are substituted in order, and
+     * <subst> tag in which case they are substituted in order, and
      * "otherwise" is only copied if none of the keys were found.
      * @param key file name used as key for cache
      * @param val string value for representation of the file 
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/share/AuthXMLUtils.java b/openam-core/src/main/java/com/sun/identity/authentication/share/AuthXMLUtils.java
index 303f194ae8..f5d015c6c7 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/share/AuthXMLUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/share/AuthXMLUtils.java
@@ -25,7 +25,7 @@
  * $Id: AuthXMLUtils.java,v 1.10 2009/06/19 20:39:09 qcheng Exp $
  *
  * Portions Copyrighted 2010-2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.authentication.share;
@@ -1764,7 +1764,7 @@ public static String getSerializedSubject(Subject subject) {
      * Deserializes Subject.
      *
      * @param subjectSerialized Serialized Subject.
-     * @throws Exception
+     * @throws Exception if the serialized subject cannot be decoded and deserialized.
      */
     public static Subject getDeSerializedSubject(String subjectSerialized)
         throws Exception {
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/spi/AMAuthCallBack.java b/openam-core/src/main/java/com/sun/identity/authentication/spi/AMAuthCallBack.java
index 1f7e42346b..7febc9ae2b 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/spi/AMAuthCallBack.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/spi/AMAuthCallBack.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,7 +51,6 @@
  * eventParams.get(TIME_KEY);
  * eventParams.get(USER_KEY);
  * etc.
- * 

  *
  * 
  */
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/spi/AMLoginModule.java b/openam-core/src/main/java/com/sun/identity/authentication/spi/AMLoginModule.java
index b6e8d2fe55..7fef0d8e4a 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/spi/AMLoginModule.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/spi/AMLoginModule.java
@@ -25,7 +25,7 @@
  * $Id: AMLoginModule.java,v 1.22 2009/11/21 01:11:56 222713 Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.authentication.spi;
@@ -1321,9 +1321,8 @@ public int getCurrentState() {
     
     /**
      * Resets the current state in the authentication process
-     * @param state
      */
-    
+
     public void resetCurrentState() {
     	this.currentState = ISAuthConstants.LOGIN_START;
     }
@@ -1802,7 +1801,7 @@ public void setLoginSuccessURL(String url) throws AuthLoginException {
      * module to decide in which domain the user profile should be created.
      *
      * @param orgDN The organization DN.
-     * @throws AuthLoginException
+     * @throws AuthLoginException if the user organization cannot be set
      */
     public void setOrg(String orgDN) throws AuthLoginException {
 /* TODO
@@ -2432,8 +2431,8 @@ public AMIdentityRepository getAMIdentityRepository(String orgDN) {
      * @param userName name of user to be created.
      * @param userAttributes Map of default attributes.
      * @param userRoles Set of default roles.
-     * @throws IdRepoException
-     * @throws SSOException
+     * @throws IdRepoException if the identity cannot be created in the repository
+     * @throws SSOException if the single sign on token is invalid or expired
      */
     public void createIdentity(
         String userName,
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/spi/AMPostAuthProcessInterface.java b/openam-core/src/main/java/com/sun/identity/authentication/spi/AMPostAuthProcessInterface.java
index 01c7bf9187..ed9c7f4666 100755
--- a/openam-core/src/main/java/com/sun/identity/authentication/spi/AMPostAuthProcessInterface.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/spi/AMPostAuthProcessInterface.java
@@ -25,7 +25,7 @@
  * $Id: AMPostAuthProcessInterface.java,v 1.5 2009/01/16 23:31:34 higapa Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.authentication.spi;
@@ -137,7 +137,7 @@ public void onLoginSuccess(
     /**
      * Post processing on failed authentication.
      *
-     * @param requestParamsMap map containing HttpServletRequest
+     * @param requestParamsMap map containing HttpServletRequest
      *        parameters.
      * @param request HttpServletRequest object.
      * @param response HttpServletResponse object.
@@ -155,7 +155,7 @@ public void onLoginFailure(
      * @param request HttpServletRequest object.
      * @param response HttpServletResponse object.
      * @param ssoToken authenticated user's single sign on token.
-     * @throws AuthenticationException
+     * @throws AuthenticationException if an error occurs during logout post processing
      */
     public void onLogout(
         HttpServletRequest request,
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/spi/AuthLoginException.java b/openam-core/src/main/java/com/sun/identity/authentication/spi/AuthLoginException.java
index 3a53fa006b..668356685d 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/spi/AuthLoginException.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/spi/AuthLoginException.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -201,9 +202,7 @@ public String getL10NMessage(Locale locale) {
      * Returns the resource bundle name.
      *
      * @return Resource Bundle Name associated with this error message.
-     * @see #getL10NMessage(java.util.Locale).
-     *
-     * 
+     * @see #getL10NMessage(java.util.Locale)
      */
     public String getResourceBundleName() {
         return _bundleName;
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/spi/HttpCallback.java b/openam-core/src/main/java/com/sun/identity/authentication/spi/HttpCallback.java
index 15b0cb7bff..64a60bf349 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/spi/HttpCallback.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/spi/HttpCallback.java
@@ -24,7 +24,7 @@
  *
  * $Id: HttpCallback.java,v 1.4 2009/07/28 19:40:45 beomsuk Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 
@@ -142,14 +142,14 @@ public String getAuthorization() {
     
     /**
      * Set the authorization string to a HttpCallback object.
-     * @param authorization 
+     * @param authorization the authorization string to set
      */
     public void setAuthorization(String authorization) {
         this.authToken = authorization;
     }
 
     /**
-     * Returns true if the callback is for HTTPBasic.
+     * Returns true if the callback is for HTTPBasic.
      */
     public boolean isForHTTPBasic() {
         return (negoValue != null)
@@ -157,7 +157,7 @@ public boolean isForHTTPBasic() {
     }
 
     /**
-     * Returns true if the callback is for WindowsDesktopSSO.
+     * Returns true if the callback is for WindowsDesktopSSO.
      */
     public boolean isForWindowsDesktopSSO() {
         return (negoValue != null)
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/spi/SetNextModuleException.java b/openam-core/src/main/java/com/sun/identity/authentication/spi/SetNextModuleException.java
index 047656da70..53736aa308 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/spi/SetNextModuleException.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/spi/SetNextModuleException.java
@@ -12,12 +12,13 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2019 Open Identity Platform Community.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.spi;
 
 /**
- * This exception throws form Authentication Module and process by {@link com.sun.identity.authentication.jaas.LoginContext#invoke()}
+ * This exception throws form Authentication Module and process by {@link com.sun.identity.authentication.jaas.LoginContext}
  *   if there's a need to go back in authentcation chain on 
  * @author maximthomas
  *
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/util/AMAuthUtils.java b/openam-core/src/main/java/com/sun/identity/authentication/util/AMAuthUtils.java
index a6aaf4a9c5..f3a619028f 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/util/AMAuthUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/util/AMAuthUtils.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -333,7 +334,7 @@ private static Set parseRealmData(String data, String orgDN) {
     }
     
      /**
-     * Returns a Map with all Auth Module instance names as key
+     * Returns a Map with all Auth Module instance names as key
      * and the time the module was authenticated as value.
      *
      * @param ssoToken valid user's single sign on token.
diff --git a/openam-core/src/main/java/com/sun/identity/authentication/util/ISValidation.java b/openam-core/src/main/java/com/sun/identity/authentication/util/ISValidation.java
index 4edf224871..2432138735 100644
--- a/openam-core/src/main/java/com/sun/identity/authentication/util/ISValidation.java
+++ b/openam-core/src/main/java/com/sun/identity/authentication/util/ISValidation.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -84,9 +85,9 @@ public static boolean validate(String str, String regEx, Debug tmpDebug) {
     /**
      * Returns the index within this string of the first occurrence of the
      * specified substring, starting at the specified index.  The integer
-     * returned is the smallest value k for which:
+     * returned is the smallest value k for which:
      * 
-     *     k >= Math.min(fromIndex, str.length()) &&
+     *     k >= Math.min(fromIndex, str.length()) &&
      *                   this.toString().startsWith(str, k)
      * 

      * If no such value of k exists, then -1 is returned.
diff --git a/openam-core/src/main/java/com/sun/identity/common/AMUserPasswordValidationPlugin.java b/openam-core/src/main/java/com/sun/identity/common/AMUserPasswordValidationPlugin.java
index 3f06fee753..22bdd0ff8f 100644
--- a/openam-core/src/main/java/com/sun/identity/common/AMUserPasswordValidationPlugin.java
+++ b/openam-core/src/main/java/com/sun/identity/common/AMUserPasswordValidationPlugin.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -68,8 +69,8 @@ public AMUserPasswordValidationPlugin() {
      *            source string which should be validated
      * @param envParams
      *            parameters for which the userID validation is enforced.
-     * @throws throws
-     *             AMException when it detects specified pattern within source
+     * @throws AMException
+     *             when it detects specified pattern within source
      *             string which need to be validated OR if source string is null
      */
 
diff --git a/openam-core/src/main/java/com/sun/identity/common/ISLocaleContext.java b/openam-core/src/main/java/com/sun/identity/common/ISLocaleContext.java
index 2882fb0491..59a602f640 100644
--- a/openam-core/src/main/java/com/sun/identity/common/ISLocaleContext.java
+++ b/openam-core/src/main/java/com/sun/identity/common/ISLocaleContext.java
@@ -25,7 +25,7 @@
  * $Id: ISLocaleContext.java,v 1.14 2008/08/19 19:09:00 veiming Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.common;
@@ -223,7 +223,7 @@ public ISLocaleContext(String orgDN) {
      *        AUTH_LOCALE, ACCEPT_LOCALE,
      *        USER_PREFERRED_LOCALE, URL_LOCALE.
      * @param loc Locale value in string example en,
-     *        ja_JP. Warning: This method overrides priority
+     *        ja_JP. Warning: This method overrides priority
      *        lookup mechanism.
      * 
      */
@@ -257,7 +257,6 @@ public void setLocale(int level, java.util.Locale loc) {
      * Returns the locale based on the Http Context supplied.
      *
      * @param context The {@link HttpContext} of the request
-     * @return The locale determined by the request
      */
     public void setLocale(HttpContext context) {
         final String superLocale = context.getParameterAsString("locale");
diff --git a/openam-core/src/main/java/com/sun/identity/common/ISResourceBundle.java b/openam-core/src/main/java/com/sun/identity/common/ISResourceBundle.java
index 8a4717a3f2..7da88d9b83 100644
--- a/openam-core/src/main/java/com/sun/identity/common/ISResourceBundle.java
+++ b/openam-core/src/main/java/com/sun/identity/common/ISResourceBundle.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -128,7 +129,7 @@ protected ISResourceBundle(Map keyValues) {
      * @param locale
      *            Specific locale of ResourceBundle
      * @return ResourceBundle with the key-value pairs.
-     * @throws SSOException
+     * @throws SSOException if the single sign-on token is invalid or expired
      */
     public static ResourceBundle getResourceBundle(SSOToken token,
             String rbName, Locale locale) throws SSOException {
diff --git a/openam-core/src/main/java/com/sun/identity/common/L10NMessageImpl.java b/openam-core/src/main/java/com/sun/identity/common/L10NMessageImpl.java
index 24a8f0f8e7..bae4b57786 100644
--- a/openam-core/src/main/java/com/sun/identity/common/L10NMessageImpl.java
+++ b/openam-core/src/main/java/com/sun/identity/common/L10NMessageImpl.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -94,7 +95,7 @@ public L10NMessageImpl(Throwable ex) {
     /**
      * Returns localized error message.
      * 
-     * @param locale
+     * @param locale the locale in which to render the message.
      * @return localized error message.
      * @see #L10NMessageImpl(String, String, Object[])
      */
diff --git a/openam-core/src/main/java/com/sun/identity/common/ResourceLookup.java b/openam-core/src/main/java/com/sun/identity/common/ResourceLookup.java
index bb9175cd88..66dd57ef35 100644
--- a/openam-core/src/main/java/com/sun/identity/common/ResourceLookup.java
+++ b/openam-core/src/main/java/com/sun/identity/common/ResourceLookup.java
@@ -25,7 +25,7 @@
  * $Id: ResourceLookup.java,v 1.7 2009/05/02 22:12:04 kevinserwin Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.common;
 
@@ -57,11 +57,11 @@ public class ResourceLookup {
      * Returns the first existing resource in the ordered search paths.
      * 
      * @param context Servlet Context Reference.
-     * @param fileRoot
-     * @param locale
-     * @param orgFilePath
-     * @param clientPath
-     * @param filename
+     * @param fileRoot the root directory under which the resource is searched
+     * @param locale the locale used to build locale-specific search paths
+     * @param orgFilePath the organization-specific path segment
+     * @param clientPath the client-specific path segment
+     * @param filename the name of the file to locate
      * @param resourceDir absolute path of template base directory
      * @return String first existing resource in the ordered
      *         search paths.
diff --git a/openam-core/src/main/java/com/sun/identity/common/configuration/AgentConfiguration.java b/openam-core/src/main/java/com/sun/identity/common/configuration/AgentConfiguration.java
index c83ee480bd..918f21fdd7 100644
--- a/openam-core/src/main/java/com/sun/identity/common/configuration/AgentConfiguration.java
+++ b/openam-core/src/main/java/com/sun/identity/common/configuration/AgentConfiguration.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2012-2016 ForgeRock AS.
  * Portions Copyrighted 2012 Open Source Solution Technology Corporation
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.common.configuration;
@@ -1300,7 +1301,6 @@ private static Set getAttributesSchemaNames(AMIdentity amid)
      * @param type AttributeSchema type
      * @return a set of attribute schema names whose schema match a given 
      * type.
-     * @throws IdRepoException if there are Id Repository related errors.
      * @throws SSOException if the Single Sign On token is invalid or has
      *         expired.
      * @throws SMSException if there are errors in service management layers.
diff --git a/openam-core/src/main/java/com/sun/identity/common/configuration/ListValueValidator.java b/openam-core/src/main/java/com/sun/identity/common/configuration/ListValueValidator.java
index 55a64eca8e..84da3e5b3e 100644
--- a/openam-core/src/main/java/com/sun/identity/common/configuration/ListValueValidator.java
+++ b/openam-core/src/main/java/com/sun/identity/common/configuration/ListValueValidator.java
@@ -1,149 +1,150 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2007 Sun Microsystems Inc. All Rights Reserved
- *
- * 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
- * https://opensso.dev.java.net/public/CDDLv1.0.html or
- * opensso/legal/CDDLv1.0.txt
- * See the License for the specific language governing
- * permission and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at opensso/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 Copyrighted [year] [name of copyright owner]"
- *
- * $Id: ListValueValidator.java,v 1.5 2008/06/25 05:42:28 qcheng Exp $
- *
- */
-
-/**
- * Portions Copyrighted 2016 ForgeRock AS.
- */
-package com.sun.identity.common.configuration;
-
-import com.sun.identity.sm.ServiceAttributeValidator;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.forgerock.openam.utils.CollectionUtils;
-
-/**
- * Validates list value in Agent Properties. e.g.
- * com.sun.identity.agents.config.login.form[0]=
- * List values should be Strings of the form:
- *   [0] = some value
- *   [1] = some value
- *   [some sequential index] = some value
- *   etc 
- *   l.h.s is index value surrounded by brackets
- *   separator is mandatory "=" equals sign
- *   r.h.s is some string value, anything since this is not so fined 
- *         grained to test values of any one specific property's value set.
- *   index value should be an integer >= 0
- *   index values can not be duplicates
- *   index values collectively can contain missing mubers
- *   white space is allowed everywhere (except between digits of index value)
- *   blank or empty values are allowed as some props dont have any value 
- *         to be specified
- *
- *   Some examples that would be acceptable values:
- *       blank or empty set
- *       [0] =     (note no value on r.h.s)
- *       
- *
- */
-public class ListValueValidator implements ServiceAttributeValidator {
-
-    private static final Pattern pattern = Pattern.compile("(\\s*\\[\\s*\\d++\\s*\\]\\s*=.*)");
-
-    /**
-     * Returns true if values are of list typed.
-     * 
-     * @param values the set of values to be validated
-     * @return true if values are of list format type.
-     */
-    public boolean validate(Set values) {
-        boolean valid = true; //blank or empty values set are valid
-
-        if (!CollectionUtils.isEmpty(values)) {
-            for (String value : values) {
-
-                if (!valid) {
-                    break;
-                }
-
-                if (value.length() > 0) {
-                    Matcher m = pattern.matcher(value);
-                    valid = m.matches();
-                }
-            }
-
-        }
-        if (valid) {
-            valid = checkForValidIntegerKeyInValue(values);
-        }
-
-        return valid;
-    }
-    
-    /**
-     * Values in set are of the form [integerindex]=somevalue and this integer
-     * index is later used in code which will create a list array with the 
-     * integer index as the lookup key. So we need to check for the case of 
-     * duplicate integers, integers must be >= 0
-     * Note, the integers do not have to be sequential and can skip numbers etc.
-     *
-     * So need to parse values and get the integer index keys and see if valid.
-     *
-     * @param values must be a valid set of inputs. Must be valid in the sense
-     *        that each of its values are like [0]=somevalue
-     *
-     * @return true if set is good and contains no duplicate keys
-     */
-    private boolean checkForValidIntegerKeyInValue(Set values) {
-        boolean valid = true;
-        HashSet keySet = new HashSet<>();
-        int indexNumber = -1;
-        
-        if (!CollectionUtils.isEmpty(values)) {
-
-            for (String val : values) {
-
-                if (!valid) {
-                    break;
-                }
-
-                if (val.length() > 0) {
-                    //extract key from whole value
-                    int startIndex = val.indexOf("[");
-                    int endIndex =   val.indexOf("]");
-                    val = val.substring(startIndex+1, endIndex).trim();
-                    try {
-                        indexNumber = Integer.parseInt(val);
-                    } catch (NumberFormatException nfe) {
-                        valid = false;
-                    }
-                    if (indexNumber <0 ) {
-                        valid = false;
-                    }
-
-                    if (!keySet.add(val)) {
-                        valid = false;
-                    }
-                }
-            }
-        }
-        return valid;
-    }
-}
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2007 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
+ *
+ * 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
+ * https://opensso.dev.java.net/public/CDDLv1.0.html or
+ * opensso/legal/CDDLv1.0.txt
+ * See the License for the specific language governing
+ * permission and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at opensso/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 Copyrighted [year] [name of copyright owner]"
+ *
+ * $Id: ListValueValidator.java,v 1.5 2008/06/25 05:42:28 qcheng Exp $
+ *
+ */
+
+/**
+ * Portions Copyrighted 2016 ForgeRock AS.
+ */
+package com.sun.identity.common.configuration;
+
+import com.sun.identity.sm.ServiceAttributeValidator;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.forgerock.openam.utils.CollectionUtils;
+
+/**
+ * Validates list value in Agent Properties. e.g.
+ * com.sun.identity.agents.config.login.form[0]=
+ * List values should be Strings of the form:
+ *   [0] = some value
+ *   [1] = some value
+ *   [some sequential index] = some value
+ *   etc 
+ *   l.h.s is index value surrounded by brackets
+ *   separator is mandatory "=" equals sign
+ *   r.h.s is some string value, anything since this is not so fined 
+ *         grained to test values of any one specific property's value set.
+ *   index value should be an integer >= 0
+ *   index values can not be duplicates
+ *   index values collectively can contain missing mubers
+ *   white space is allowed everywhere (except between digits of index value)
+ *   blank or empty values are allowed as some props dont have any value 
+ *         to be specified
+ *
+ *   Some examples that would be acceptable values:
+ *       blank or empty set
+ *       [0] =     (note no value on r.h.s)
+ *       
+ *
+ */
+public class ListValueValidator implements ServiceAttributeValidator {
+
+    private static final Pattern pattern = Pattern.compile("(\\s*\\[\\s*\\d++\\s*\\]\\s*=.*)");
+
+    /**
+     * Returns true if values are of list typed.
+     * 
+     * @param values the set of values to be validated
+     * @return true if values are of list format type.
+     */
+    public boolean validate(Set values) {
+        boolean valid = true; //blank or empty values set are valid
+
+        if (!CollectionUtils.isEmpty(values)) {
+            for (String value : values) {
+
+                if (!valid) {
+                    break;
+                }
+
+                if (value.length() > 0) {
+                    Matcher m = pattern.matcher(value);
+                    valid = m.matches();
+                }
+            }
+
+        }
+        if (valid) {
+            valid = checkForValidIntegerKeyInValue(values);
+        }
+
+        return valid;
+    }
+    
+    /**
+     * Values in set are of the form [integerindex]=somevalue and this integer
+     * index is later used in code which will create a list array with the 
+     * integer index as the lookup key. So we need to check for the case of 
+     * duplicate integers, integers must be >= 0
+     * Note, the integers do not have to be sequential and can skip numbers etc.
+     *
+     * So need to parse values and get the integer index keys and see if valid.
+     *
+     * @param values must be a valid set of inputs. Must be valid in the sense
+     *        that each of its values are like [0]=somevalue
+     *
+     * @return true if set is good and contains no duplicate keys
+     */
+    private boolean checkForValidIntegerKeyInValue(Set values) {
+        boolean valid = true;
+        HashSet keySet = new HashSet<>();
+        int indexNumber = -1;
+        
+        if (!CollectionUtils.isEmpty(values)) {
+
+            for (String val : values) {
+
+                if (!valid) {
+                    break;
+                }
+
+                if (val.length() > 0) {
+                    //extract key from whole value
+                    int startIndex = val.indexOf("[");
+                    int endIndex =   val.indexOf("]");
+                    val = val.substring(startIndex+1, endIndex).trim();
+                    try {
+                        indexNumber = Integer.parseInt(val);
+                    } catch (NumberFormatException nfe) {
+                        valid = false;
+                    }
+                    if (indexNumber <0 ) {
+                        valid = false;
+                    }
+
+                    if (!keySet.add(val)) {
+                        valid = false;
+                    }
+                }
+            }
+        }
+        return valid;
+    }
+}
diff --git a/openam-core/src/main/java/com/sun/identity/common/configuration/MapValueValidator.java b/openam-core/src/main/java/com/sun/identity/common/configuration/MapValueValidator.java
index 9286142ca1..ec46892bc9 100755
--- a/openam-core/src/main/java/com/sun/identity/common/configuration/MapValueValidator.java
+++ b/openam-core/src/main/java/com/sun/identity/common/configuration/MapValueValidator.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -69,13 +70,13 @@
 public class MapValueValidator implements ServiceAttributeValidator {
 
     /**
-     *  1)  [[\\S]&&[^\\[]&&[^\\]]]+   means at least one non-whitespace 
+     *  1)  [[\\S]&&[^\\[]&&[^\\]]]+   means at least one non-whitespace 
      *                                 character except not a [ or ]
      *  
-     *  2)  [[^\\[]&&[^\\]]]*          means zero or more of anything 
+     *  2)  [[^\\[]&&[^\\]]]*          means zero or more of anything 
      *                                 except not a [ or ] 
      *
-     *  1 & 2 are combined to match values that have a key
+     *  1 & 2 are combined to match values that have a key
      *
      *  3)  \\s*\\[\\s*\\]\\s*=\\s*    means the case of []=  which is used for 
      *                                 many default map values
diff --git a/openam-core/src/main/java/com/sun/identity/common/configuration/ServerConfiguration.java b/openam-core/src/main/java/com/sun/identity/common/configuration/ServerConfiguration.java
index 7eb02cca37..63b5b05b1e 100644
--- a/openam-core/src/main/java/com/sun/identity/common/configuration/ServerConfiguration.java
+++ b/openam-core/src/main/java/com/sun/identity/common/configuration/ServerConfiguration.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2019 Open Source Solution Technology Corporation.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.common.configuration;
@@ -678,7 +679,6 @@ public static boolean createServerInstance(
      * @throws SMSException if errors access in the service management
      *         datastore.
      * @throws SSOException if the ssoToken is not valid.
-     * @throws UnknownPropertyNameException if property names are unknown.
      * @throws ConfigurationException  if the property name and values are not
      *         valid.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/config/Options.java b/openam-core/src/main/java/com/sun/identity/config/Options.java
index 8c4a3e63d8..6d8438a7b8 100644
--- a/openam-core/src/main/java/com/sun/identity/config/Options.java
+++ b/openam-core/src/main/java/com/sun/identity/config/Options.java
@@ -25,6 +25,7 @@
  * $Id: Options.java,v 1.7 2009/01/05 23:17:09 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.config;
@@ -77,7 +78,7 @@ public void doInit() {
     }
 
     /**
-     * @return boolean If true, the options.htm page will be customized for a new installation,
+     * @return boolean If true, the options.htm page will be customized for a new installation,
      * otherwise it will be customized for an upgrade.
      *
      * Automatic upgrades from 9.5 onwards are supported.
diff --git a/openam-core/src/main/java/com/sun/identity/config/wizard/Step3.java b/openam-core/src/main/java/com/sun/identity/config/wizard/Step3.java
index e2efd62131..b321a8312f 100644
--- a/openam-core/src/main/java/com/sun/identity/config/wizard/Step3.java
+++ b/openam-core/src/main/java/com/sun/identity/config/wizard/Step3.java
@@ -588,7 +588,7 @@ private void setupDSParams(Map data) {
 
     /**
      * Validate an Existing SM Host for Configuration Backend.
-     * @return
+     * @return true if the SM host is valid
      */
     public boolean validateSMHost() {
         Context ctx = getContext();
diff --git a/openam-core/src/main/java/com/sun/identity/coretoken/spi/OpenSSOCoreTokenStore.java b/openam-core/src/main/java/com/sun/identity/coretoken/spi/OpenSSOCoreTokenStore.java
index c574239ee5..6304281c4f 100644
--- a/openam-core/src/main/java/com/sun/identity/coretoken/spi/OpenSSOCoreTokenStore.java
+++ b/openam-core/src/main/java/com/sun/identity/coretoken/spi/OpenSSOCoreTokenStore.java
@@ -25,6 +25,7 @@
  * $Id: OpenSSOCoreTokenStore.java,v 1.1 2009/11/19 00:07:41 qcheng Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.coretoken.spi;
@@ -97,11 +98,11 @@ public class OpenSSOCoreTokenStore implements CoreTokenStore {
 
     /**
      * 
-     * @param subject
-     * @param attributes
+     * @param subject the subject containing the admin token requesting token creation
+     * @param attributes the token attributes in JSON format
      * @return the created token in JSON format
-     * @throws CoreTokenException
-     * @throws JSONException
+     * @throws CoreTokenException if the token cannot be created
+     * @throws JSONException if the JSON attributes cannot be processed
      */
     public String createToken(Subject subject,
         JSONObject attributes)
@@ -145,10 +146,10 @@ public String createToken(Subject subject,
 
     /**
      *
-     * @param adminSubject
-     * @param tokenId
+     * @param adminSubject the admin subject requesting the read
+     * @param tokenId the ID of the token to read
      * @return token value from SM with the given tokenId
-     * @throws CoreTokenException
+     * @throws CoreTokenException if the token cannot be read
      */
     public String readToken(Subject adminSubject, String tokenId)
         throws CoreTokenException {
@@ -177,10 +178,9 @@ public String readToken(Subject adminSubject, String tokenId)
 
     /**
      *
-     * @param subject
-     * @param tokenId
-     * @throws CoreTokenException
-     * @throws JSONException
+     * @param subject the subject containing the admin token requesting deletion
+     * @param tokenId the ID of the token to delete
+     * @throws CoreTokenException if the token cannot be deleted
      */
     public void deleteToken(Subject subject, String tokenId)
         throws CoreTokenException {
@@ -209,10 +209,10 @@ public void deleteToken(Subject subject, String tokenId)
 
     /**
      * 
-     * @param subject
-     * @param queryString
+     * @param subject the subject containing the admin token requesting the search
+     * @param queryString the query string used to match tokens
      * @return JSON array of tokens matching the queryString
-     * @throws CoreTokenException
+     * @throws CoreTokenException if the search cannot be performed
      */
     public JSONArray searchTokens (Subject subject,
         String queryString) throws CoreTokenException {
@@ -246,10 +246,10 @@ public JSONArray searchTokens (Subject subject,
      * Updates a token.
      * @param subject caller subject.
      * @param tokenId token.id of the token to be updated.
-     * @param eTag
-     * @param newVals
-     * @throws CoreTokenException
-     * @throws JSONException
+     * @param eTag the entity tag of the token used for optimistic concurrency
+     * @param newVals the new values to apply to the token in JSON format
+     * @throws CoreTokenException if the token cannot be updated
+     * @throws JSONException if the JSON values cannot be processed
      */
     public void updateToken(Subject subject, String tokenId,
         String eTag, JSONObject newVals)
diff --git a/openam-core/src/main/java/com/sun/identity/delegation/DelegationManager.java b/openam-core/src/main/java/com/sun/identity/delegation/DelegationManager.java
index dc87b6d74c..70df03cd1a 100644
--- a/openam-core/src/main/java/com/sun/identity/delegation/DelegationManager.java
+++ b/openam-core/src/main/java/com/sun/identity/delegation/DelegationManager.java
@@ -25,6 +25,7 @@
  * $Id: DelegationManager.java,v 1.10 2008/06/25 05:43:24 qcheng Exp $
  *
  * Portions Copyrighted 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.delegation;
 
@@ -95,7 +96,7 @@ public final class DelegationManager {
      * the specified realm, or DelegationException will be
      * thrown.
      *
-     * @param token   of the user delegating privileges.
+     * @param token  SSOToken of the user delegating privileges.
      * @param orgName  The name of the realm for which the user delegates
      *         privileges.
      *
diff --git a/openam-core/src/main/java/com/sun/identity/delegation/DelegationUtils.java b/openam-core/src/main/java/com/sun/identity/delegation/DelegationUtils.java
index d50a4a8b5a..35ead7ec33 100644
--- a/openam-core/src/main/java/com/sun/identity/delegation/DelegationUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/delegation/DelegationUtils.java
@@ -25,6 +25,7 @@
  * $Id: DelegationUtils.java,v 1.7 2008/07/06 05:48:31 arviranga Exp $
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.delegation;
@@ -131,7 +132,7 @@ public static void createRealmPrivileges(SSOToken token, String realmName)
      * @param parent parent realm's OrganizationConfigManager
               where default privileges are picked from.
      * @param child realm where default privileges are copied from the
-     *        parent.
+     *        parent.
      */
     public static void copyRealmPrivilegesFromParent(SSOToken token,
             OrganizationConfigManager parent, OrganizationConfigManager child)
diff --git a/openam-core/src/main/java/com/sun/identity/delegation/plugins/DelegationPolicyImpl.java b/openam-core/src/main/java/com/sun/identity/delegation/plugins/DelegationPolicyImpl.java
index 43d813990d..c3b118b9e5 100644
--- a/openam-core/src/main/java/com/sun/identity/delegation/plugins/DelegationPolicyImpl.java
+++ b/openam-core/src/main/java/com/sun/identity/delegation/plugins/DelegationPolicyImpl.java
@@ -394,11 +394,6 @@ public void removePrivilege(SSOToken token, String orgName,
      * @param types a set of subject types. e.g. ROLE, GROUP.
      * @param pattern a filter used to select the subjects.
      *
-     * @return a set of subjects associated with the realm.
-     *
-     * @throws SSOException invalid or expired single-sign-on token
-     * @throws DelegationException for any abnormal condition
-     *
      * @return Set of universal Ids of the subjects associated
      *         with the realm.
      *
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/ConditionDecision.java b/openam-core/src/main/java/com/sun/identity/entitlement/ConditionDecision.java
index 34208bff3f..b3c064f3a2 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/ConditionDecision.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/ConditionDecision.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,7 +51,7 @@ public class ConditionDecision {
 
     /**
      * Constructs an instance of ConditionDecision.
-     * 

+     * 

      * Deprecated, favour the factory methods.
      *
      * @param satisfied
@@ -65,7 +66,7 @@ public ConditionDecision(boolean satisfied, Map> advices) {
 
     /**
      * Constructs an instance of ConditionDecision.
-     * 

+     * 

      * Deprecated, favour the factory methods.
      *
      * @param satisfied
@@ -128,7 +129,7 @@ public long getTimeToLive() {
 
     /**
      * Clears the current advice associated with this ConditionDecision.
-     * 

+     * 

      * Deprecated method as a given instance should be immutable.
      */
     @Deprecated
@@ -138,7 +139,7 @@ public void clearAdvices() {
 
     /**
      * Adds an advice (from another ConditionDecision) to this ConditionDecision.
-     * 

+     * 

      * Deprecated method as a given instance should be immutable.
      *
      * @param decision
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/Entitlement.java b/openam-core/src/main/java/com/sun/identity/entitlement/Entitlement.java
index 2b2f9c6f71..907ab3e3af 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/Entitlement.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/Entitlement.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -63,7 +64,7 @@
  * Or do a sub tree search like this.
  * 
  *     Evaluator evaluator = new Evaluator(adminToken);
- *     List<Entitlement> entitlements = evaluator.getEntitlements(
+ *     List<Entitlement> entitlements = evaluator.getEntitlements(
  *         subject, "http://www.sun.com", Collections.EMPTY_MAP, true);
  *     for (Entitlement e : entitlements) {
  *         String resource = e.getResourceNames();
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementCombiner.java b/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementCombiner.java
index 90b93e1693..e18739ed27 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementCombiner.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementCombiner.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2009 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -73,7 +74,7 @@ public abstract class EntitlementCombiner {
      * @param normalisedResourceName The normalised resource name.
      * @param requestedResourceName The requested resource name.
      * @param actions Action names to be evaluated.
-     * @param isRecursive true< for subtree evaluation.
+     * @param isRecursive true for subtree evaluation.
      */
     public void init(String realm, String applicationName, String normalisedResourceName, String requestedResourceName,
                      Set actions, boolean isRecursive) throws EntitlementException {
@@ -87,7 +88,7 @@ public void init(String realm, String applicationName, String normalisedResource
      * @param normalisedResourceName The normalised resource name.
      * @param requestedResourceName The requested resource name.
      * @param actions Action names to be evaluated.
-     * @param isRecursive true< for subtree evaluation.
+     * @param isRecursive true for subtree evaluation.
      * @param application The defining application.
      */
     public void init(String normalisedResourceName, String requestedResourceName, Set actions,
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementSubject.java b/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementSubject.java
index 4ae15027aa..7cdfc80ddd 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementSubject.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/EntitlementSubject.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2009 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -60,20 +61,20 @@ public interface EntitlementSubject {
     /**
      * Returns attribute names and values that could be used for indexing.
      * These values will be used by the authorization engine to obtain the
-     * applicable policies for a given Subject.
+     * applicable policies for a given Subject.
      *
      * @return a map of key-value pairs that will be used for indexing the
-     * entitlements that contain this EntitlementSubject.
+     * entitlements that contain this EntitlementSubject.
      */
     Map> getSearchIndexAttributes();
 
     /**
      * Returns a set of attribute names that are used for evaluation.
-     * During evaluation, the Evaluator would try to populate
-     * these attributes in the Subject for the 
-     * EntitlementSubject's consumption.
+     * During evaluation, the Evaluator would try to populate
+     * these attributes in the Subject for the 
+     * EntitlementSubject's consumption.
      *
-     * @return a set of attributes that would be required by the EntitlementSubject's implementation.
+     * @return a set of attributes that would be required by the EntitlementSubject's implementation.
      */
     Set getRequiredAttributeNames();
 
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/OrCondition.java b/openam-core/src/main/java/com/sun/identity/entitlement/OrCondition.java
index 3f1759a435..334be1b236 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/OrCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/OrCondition.java
@@ -25,6 +25,7 @@
  * $Id: OrCondition.java,v 1.2 2009/09/05 00:24:04 veiming Exp $
  *
  * Portions Copyrighted 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.entitlement;
 
@@ -70,7 +71,7 @@ public OrCondition(Set eConditions) {
      * @param resourceName Resource name.
      * @param environment Environment parameters.
      * @return the {@link ConditionDecision} having performed the {@link EntitlementCondition}(s) evaluation.
-     * @throws {@link EntitlementException} in case of any error.
+     * @throws EntitlementException in case of any error.
      */
     public ConditionDecision evaluate(String realm, Subject subject, String resourceName,
                                       Map> environment) throws EntitlementException {
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/ReferralPrivilege.java b/openam-core/src/main/java/com/sun/identity/entitlement/ReferralPrivilege.java
index 7b482abb77..9e058aaec6 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/ReferralPrivilege.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/ReferralPrivilege.java
@@ -25,6 +25,7 @@
  * $Id: ReferralPrivilege.java,v 1.7 2010/01/08 23:59:31 veiming Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.entitlement;
@@ -252,7 +253,7 @@ public String getName() {
     /**
      * Sets description.
      *
-     * @param description
+     * @param description the description to set.
      */
     public void setDescription(String description) {
         this.description = description;
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/ResourceSearchIndexes.java b/openam-core/src/main/java/com/sun/identity/entitlement/ResourceSearchIndexes.java
index 02e91613d4..76092a0044 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/ResourceSearchIndexes.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/ResourceSearchIndexes.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2009 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -44,7 +45,7 @@ public class ResourceSearchIndexes {
      *
      * @param hostIndexes Set of host indexes.
      * @param pathIndexes Set of path indexes.
-     * @param parentPathIndexes 
+     * @param parentPathIndexes Set of parent path indexes.
      */
     public ResourceSearchIndexes(
         Set hostIndexes,
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesCollector.java b/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesCollector.java
index 5421e2790c..4e6a17882a 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesCollector.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesCollector.java
@@ -25,6 +25,7 @@
  * $Id: SubjectAttributesCollector.java,v 1.1 2009/08/19 05:40:33 veiming Exp $
  *
  * Portions Copyrighted 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.entitlement;
@@ -64,7 +65,7 @@ public interface SubjectAttributesCollector {
 
     /**
      * Returns the attribute values of the given user represented by
-     * Subject object.
+     * Subject object.
      *
      * @param subject identity of the user
      * @param attrNames requested attribute names
@@ -96,7 +97,7 @@ public Set getAvailableSubjectAttributeNames()
 
     /**
      * Returns the attribute values of the given user represented by
-     * Subject object.
+     * Subject object.
      *
      * @param subject identity of the user.
      * @param attrNames requested attribute names.
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesManager.java b/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesManager.java
index c32a9f33e5..172075fd27 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesManager.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/SubjectAttributesManager.java
@@ -25,6 +25,7 @@
  * $Id: SubjectAttributesManager.java,v 1.3 2009/09/24 22:37:43 hengming Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.entitlement;
@@ -46,9 +47,9 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- * Manages multiple instances of SubjectAttributesCollector,
- * and to be called by Evaluator and 
- * EntitlementSubject implementations to obtain users' attributes and
+ * Manages multiple instances of SubjectAttributesCollector,
+ * and to be called by Evaluator and 
+ * EntitlementSubject implementations to obtain users' attributes and
  * memberships.
  */
 public class SubjectAttributesManager {
@@ -270,7 +271,7 @@ public Set getSubjectSearchFilter(Subject subject, String applicationNam
 
     /**
      * Returns the attribute values of the given user represented by
-     * Subject object.
+     * Subject object.
      * @param subject identity of the user.
      * @param attrNames requested attribute names.
      * @return a map of attribute names and their values.
@@ -325,7 +326,7 @@ public boolean isGroupMembershipSearchIndexEnabled() {
 
     /**
      * Returns the attribute values of the given user represented by
-     * Subject object.
+     * Subject object.
      * @param subject identity of the user.
      * @param attrNames requested attribute names.
      * @return a map of attribute names and their values.
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/ThreadPool.java b/openam-core/src/main/java/com/sun/identity/entitlement/ThreadPool.java
index f432edbf60..6d2c6995a4 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/ThreadPool.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/ThreadPool.java
@@ -25,6 +25,7 @@
  * $Id: ThreadPool.java,v 1.1 2009/08/19 05:40:34 veiming Exp $
  *
  * Portions Copyrighted 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.entitlement;
@@ -95,7 +96,7 @@ private synchronized  void createThreads() {
      * Runs a user defined task.
      * 
      * @param task user defined task.
-     * @throws ThreadPoolException
+     * @throws ThreadPoolException if the task cannot be accepted by the thread pool.
      */
     public final void run(Runnable task)
         throws ThreadPoolException {
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/interfaces/IDebugProvider.java b/openam-core/src/main/java/com/sun/identity/entitlement/interfaces/IDebugProvider.java
index cc0e6a1697..1970064cc7 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/interfaces/IDebugProvider.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/interfaces/IDebugProvider.java
@@ -25,6 +25,7 @@
  * $Id: IDebugProvider.java,v 1.1 2009/08/19 05:40:34 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.entitlement.interfaces;
@@ -37,7 +38,6 @@
  * com.sun.identity.entitlement.interface.IDebug interface
  * together provide the necessary functionality to replace or enhance the
  * Debug service.
- * 

  */
 public interface IDebugProvider {
     /**
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/opensso/Cache.java b/openam-core/src/main/java/com/sun/identity/entitlement/opensso/Cache.java
index c3e3b9c572..aaf736f428 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/opensso/Cache.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/opensso/Cache.java
@@ -25,6 +25,7 @@
  * $Id: Cache.java,v 1.4 2009/12/12 00:03:13 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.entitlement.opensso;
 
@@ -88,13 +89,13 @@
  * Generally, the default load factor (.75) offers a good tradeoff between
  * time and space costs.  Higher values decrease the space overhead but
  * increase the time cost to look up an entry (which is reflected in most
- * Cache operations, including get and put).

+ * Cache operations, including get and put).

  *
  * The capacity controls a tradeoff between wasted space and the
  * need for rehash operations, which are time-consuming.
  * No rehash operations will ever occur if the 
  * capacity is greater than the maximum number of entries the
- * Cache will contain divided by its load factor.  However,
+ * Cache will contain divided by its load factor.  However,
  * setting the capacity too high can waste space.

  *
  * If many entries are to be made into a Cache, 
@@ -217,7 +218,7 @@ public Cache(String name, int initCapacity, int maxSize, float loadFactor) {
 
     /**
      * Constructs a new, empty Cache with the specified capacity and default
-     * load factor, which is 0.75.
+     * load factor, which is 0.75.
      *
      * @param name Name of cache.
      * @param initCapacity
@@ -302,7 +303,7 @@ public synchronized Enumeration elements() {
      *            a value to search for.
      * @return true if and only if some key maps to the
      *         value argument in this Cache as determined by the
-     *         equals method; false otherwise.
+     *         equals method; false otherwise.
      * @exception NullPointerException
      *                if the value is null.
      * @see #containsKey(Object)
@@ -352,7 +353,7 @@ public boolean containsValue(Object value) {
      * @param key
      *            possible key.
      * @return true if and only if the specified object is a key
-     *         in this Cache, as determined by the equals method;
+     *         in this Cache, as determined by the equals method;
      *         false otherwise.
      * @see #contains(Object)
      */
@@ -624,14 +625,14 @@ public void clear() {
     }
 
     /**
-     * Returns a string representation of this Cache object in the
+     * Returns a string representation of this Cache object in the
      * form of a set of entries, enclosed in braces and separated by the ASCII
-     * characters ", " (comma and space). Each entry is
-     * rendered as the key, an equals sign =, and the associated
-     * element, where the toString method is used to convert the key
+     * characters ", " (comma and space). Each entry is
+     * rendered as the key, an equals sign =, and the associated
+     * element, where the toString method is used to convert the key
      * and element to strings.
      * 

-     * Overrides to toString method of Object.
+     * Overrides to toString method of Object.
      * 
      * @return a string representation of this Cache.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PolicyResponseProvider.java b/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PolicyResponseProvider.java
index e956dd727e..f6a64f7607 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PolicyResponseProvider.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PolicyResponseProvider.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2015 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -138,7 +139,7 @@ public void setPropertyValues(Set propertyValues) {
      * @param resourceName The resource name of the policy eval
      * @param environment environment map from the policy eval client
      * @return The attributes (only one since resource attributes are singled)
-     * @throws EntitlementException 
+     * @throws EntitlementException if the response provider fails to evaluate the attributes
      */
     public Map> evaluate(Subject adminSubject, String realm, Subject subject, String resourceName, Map> environment) throws EntitlementException {
         try {
@@ -213,7 +214,7 @@ public String getState() {
 
     /**
      * Given a JSON state representation, updates the class appropriately
-     * @param state 
+     * @param state the JSON representation of the provider state to restore
      */
     public void setState(String state) {
         try {
diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PrivilegeUtils.java b/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PrivilegeUtils.java
index 1df81b34d4..99248516d7 100644
--- a/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PrivilegeUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/entitlement/opensso/PrivilegeUtils.java
@@ -25,6 +25,7 @@
  * $Id: PrivilegeUtils.java,v 1.4 2010/01/07 00:19:11 veiming Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.entitlement.opensso;
@@ -84,7 +85,7 @@
  * Class with utility methods to map from
  * com.sun.identity.entity.Privilege
  * to
- * com.sun.identity.policy.Policy
+ * com.sun.identity.policy.Policy
  */
 public class PrivilegeUtils {
 
diff --git a/openam-core/src/main/java/com/sun/identity/entity/EntityObject.java b/openam-core/src/main/java/com/sun/identity/entity/EntityObject.java
index 209644d06d..abbce6cb6b 100644
--- a/openam-core/src/main/java/com/sun/identity/entity/EntityObject.java
+++ b/openam-core/src/main/java/com/sun/identity/entity/EntityObject.java
@@ -25,6 +25,7 @@
  * $Id: EntityObject.java,v 1.5 2008/06/25 05:43:26 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.entity;
@@ -173,7 +174,7 @@ public Map getEntity(String entityName, String entityType)
      * @param entityType Type of entity being created. eg. Agent The types
      *        supported by SDK are configured in the list of Managed Objects
      *        in the DAI service.
-     * @param entityFilter
+     * @param entityFilter filter used to constrain the entity search
      * @return Set of Entity Names.
      * @throws EntityException if there is an internal error in the AM Store.
      * @throws SSOException if the sign on is no longer valid.
@@ -209,7 +210,7 @@ public Set getEntityNames(
      * @param entityType Type of entity being created. eg. Agent The types
      *        supported by SDK are configured in the list of Managed Objects
      *        in the DAI service.
-     * @param attributes
+     * @param attributes the attribute values to set or replace
      * @throws EntityException if there is an internal error in the AM Store.
      * @throws SSOException if the sign on is no longer valid.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/entity/EntityObjectIF.java b/openam-core/src/main/java/com/sun/identity/entity/EntityObjectIF.java
index fe74cb2d45..7e77da9cb3 100644
--- a/openam-core/src/main/java/com/sun/identity/entity/EntityObjectIF.java
+++ b/openam-core/src/main/java/com/sun/identity/entity/EntityObjectIF.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -142,7 +143,7 @@ public Map getEntity(String ssoToken, String entityName, String entityType,
      *            DAI service.
      * @param entityLocation
      *            Location of the entity creation.eg.www.abc.com
-     * @param entityFilter
+     * @param entityFilter filter used to constrain the entity search
      * @return Set of Entity Names.
      * @throws EntityException if there is an internal error in the AM Store.
      * @throws SSOException if the sign on is no longer valid.
diff --git a/openam-core/src/main/java/com/sun/identity/entity/EntityObjectImpl.java b/openam-core/src/main/java/com/sun/identity/entity/EntityObjectImpl.java
index 7ddd976afb..27ff72f3a7 100644
--- a/openam-core/src/main/java/com/sun/identity/entity/EntityObjectImpl.java
+++ b/openam-core/src/main/java/com/sun/identity/entity/EntityObjectImpl.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -171,7 +172,7 @@ public void deleteEntity(
      * @return Set of Entity objects.
      * @throws EntityException if there is an internal error in the AM Store.
      * @throws SSOException if the sign on is no longer valid.
-     * @throws RemoteException
+     * @throws RemoteException if a remote communication error occurs.
      */
     public Map getEntity(
             String ssoToken,
@@ -194,11 +195,11 @@ public Map getEntity(
      *        in the DAI service.
      * @param entityLocation Location of the entity creation. example
      *        www.abc.com.
-     * @param entityFilter
+     * @param entityFilter the filter used to narrow the returned entity names.
      * @return Set of Entity Names.
      * @throws EntityException if there is an internal error in the AM Store.
      * @throws SSOException if the sign on is no longer valid.
-     * @throws RemoteException
+     * @throws RemoteException if a remote communication error occurs.
      */
     public Set getEntityNames(
             String ssoToken,
@@ -225,7 +226,7 @@ public Set getEntityNames(
      *        www.abc.com.
      * @throws EntityException if there is an internal error in the AM Store.
      * @throws SSOException if the sign on is no longer valid.
-     * @throws RemoteException
+     * @throws RemoteException if a remote communication error occurs.
      */
     public void modifyEntity(
             String ssoToken,
diff --git a/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java b/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java
index 5606b19fb7..74a13df189 100644
--- a/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java
@@ -25,7 +25,7 @@
  * $Id: AMIdentity.java,v 1.37 2009/11/20 23:52:54 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2019-2023 3A Systems LLC.
+ * Portions Copyrighted 2019-2026 3A Systems LLC.
  */
 package com.sun.identity.idm;
 
@@ -71,7 +71,6 @@
  * constructing  AMIdentity  objects by using
  *  AMIdentityRepository
  *  interfaces. For example:
- * 

  *
  * 
  *
@@ -84,7 +83,6 @@
  * single sign-on token passed above. The results obtained from search performed
  * using AMIdentityRepository also return AMIdentity objects. The type of an
  * object can be determined by doing the following:
- * 

  *
  * 
  *
@@ -93,7 +91,6 @@
  * 

  *
  * The name of an object can be determined by:
- * 

  *
  * 
  *
@@ -445,7 +442,7 @@ public Set getAttribute(String attrName) throws IdRepoException,
      *        (String)
      *        to a Set of attribute values (String).
      *        It is arranged as:
-     *        Map::attrMap -->
+     *        Map::attrMap -->
      *        Key: String::AttributeName
      *        Value: Set::AttributeValues (Set of String)
      * @throws IdRepoException
@@ -992,7 +989,7 @@ public void modifyService(String serviceName, Map attrMap)
      * the identity. The attributes for the service are validated
      * against the service schema.
      *
-     * This method is only valid for  object of type User.
+     * This method is only valid for AMIdentity object of type User.
      *
      * @param serviceName Name of the service.
      * @param attrNames Set of attributes name.
diff --git a/openam-core/src/main/java/com/sun/identity/idm/AMIdentityRepository.java b/openam-core/src/main/java/com/sun/identity/idm/AMIdentityRepository.java
index 6604c3c2c5..79c61707f1 100644
--- a/openam-core/src/main/java/com/sun/identity/idm/AMIdentityRepository.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/AMIdentityRepository.java
@@ -25,7 +25,7 @@
  * $Id: AMIdentityRepository.java,v 1.21 2010/01/06 01:58:26 veiming Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.idm;
 
@@ -64,7 +64,6 @@
  * configured. This class provides access to methods which will search, create
  * and delete identities. An instance of this class can be obtained in the
  * following manner:
- * 

  *
  * 
  *
diff --git a/openam-core/src/main/java/com/sun/identity/idm/IdRepo.java b/openam-core/src/main/java/com/sun/identity/idm/IdRepo.java
index 7abb5ab740..971d0fdb63 100644
--- a/openam-core/src/main/java/com/sun/identity/idm/IdRepo.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/IdRepo.java
@@ -25,6 +25,7 @@
  * $Id: IdRepo.java,v 1.8 2009/07/02 20:33:30 hengming Exp $
  *
  * Portions Copyrighted 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.idm;
 
@@ -68,7 +69,9 @@ public abstract class IdRepo {
      * Initialization paramters as configred for a given plugin.
      *
      * @param configParams
+     *     the initialization parameters configured for this plugin
      * @throws IdRepoException
+     *     if the plugin cannot be initialized
      */
     public void initialize(Map> configParams) throws IdRepoException {
         configMap = Collections.unmodifiableMap(configParams);
@@ -99,7 +102,6 @@ public Set getSupportedOperations(IdType type) {
     }
 
     /**
-     * @return Returns a Set of IdTypes supported by this plugin.
      * Returns the supported types of identities for this
      * plugin. If a plugin does not override this method, it
      * returns an empty set.
@@ -452,6 +454,7 @@ public abstract Set getMemberships(SSOToken token, IdType type,
      * @param serviceName
      *     service to assign
      * @param stype
+     *     the schema type of the service attributes
      * @param attrMap
      *     Map of attribute-values.
      * @throws IdRepoException If there are repository related error conditions.
@@ -474,6 +477,7 @@ public abstract void assignService(SSOToken token, IdType type,
      * @param name
      *     Name of the object of interest.
      * @param mapOfServicesAndOCs
+     *     the map of service names to their object classes
      * @return
      *     Set of name of services assigned to name
      * @throws IdRepoException If there are repository related error conditions.
@@ -562,6 +566,7 @@ public abstract Map getBinaryServiceAttributes(SSOToken token,
      * @param serviceName
      *     Name of service.
      * @param sType
+     *     the schema type of the service attributes
      * @param attrMap
      *     map of attribute-values.
      * @throws IdRepoException If there are repository related error conditions.
@@ -577,6 +582,7 @@ public abstract void modifyService(SSOToken token, IdType type,
      * @param token
      *     Single sign on token of identity performing the task.
      * @param listener
+     *     the listener to notify of repository changes
      * @return status code
      * @throws IdRepoException If there are repository related error conditions.
      * @throws SSOException If identity's single sign on token is invalid.
diff --git a/openam-core/src/main/java/com/sun/identity/idm/IdRepoListener.java b/openam-core/src/main/java/com/sun/identity/idm/IdRepoListener.java
index d11f467c15..5e4b6f1436 100644
--- a/openam-core/src/main/java/com/sun/identity/idm/IdRepoListener.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/IdRepoListener.java
@@ -25,6 +25,7 @@
  * $Id: IdRepoListener.java,v 1.16 2009/01/28 05:34:59 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.idm;
 
@@ -221,7 +222,7 @@ public void setConfigMap(Map cMap) {
      * 
      * @param sName service name for which attributes are being set
      * @param attrs service synamic attributes
-     * @throws com.sun.identity.idm.IdRepoException
+     * @throws com.sun.identity.idm.IdRepoException if the service attributes cannot be stored
      */
     public void setServiceAttributes(String sName, Map attrs)
             throws IdRepoException {
diff --git a/openam-core/src/main/java/com/sun/identity/idm/IdUtils.java b/openam-core/src/main/java/com/sun/identity/idm/IdUtils.java
index 4f8681f4d2..4e1a341158 100644
--- a/openam-core/src/main/java/com/sun/identity/idm/IdUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/IdUtils.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.idm;
@@ -539,7 +540,7 @@ private static void initializeSpecialUsers() {
     /**
      * Returns an IdRepoException based on an AMException
      * 
-     * @param ame
+     * @param ame the AMException to convert
      * @return IdRepoException based on ame.
      */
     public static IdRepoException convertAMException(AMException ame) {
@@ -601,7 +602,7 @@ private static Set getMemberSet(Set members) {
      * @param uuid uuid of the user
      * @param orgName the org user is trying to login to
      * @return user name
-     * @throws IdRepoException 
+     * @throws IdRepoException if the org name does not match the realm in the uuid
      */
     public static String getIdentityName(String uuid, String orgName)
         throws IdRepoException {
diff --git a/openam-core/src/main/java/com/sun/identity/idm/plugins/database/JdbcSimpleUserDao.java b/openam-core/src/main/java/com/sun/identity/idm/plugins/database/JdbcSimpleUserDao.java
index e95dcf11eb..cf0b869b63 100755
--- a/openam-core/src/main/java/com/sun/identity/idm/plugins/database/JdbcSimpleUserDao.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/plugins/database/JdbcSimpleUserDao.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2012-2015 ForgeRock AS.
  * Portions Copyrighted 2012 Open Source Solution Technology Corporation
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.idm.plugins.database;
@@ -767,7 +768,7 @@ public Map> getAttributes(String userID,
      *         Callers should be sure to specify which attributes to fetch.
      * @param limit is maximum number of results to return. This is added to the
      *          END of the WHERE clause using mysql LIMIT on a query.
-     *          Default if no limit(if limit<0) is specified is LIMIT=1
+     *          Default if no limit(if limit<0) is specified is LIMIT=1
      *          Limit is ignored in this implementation since it is not
      *          portable SQL
      * @param filterOperand is a string of AND, or OR and is used to add
@@ -1047,7 +1048,7 @@ public Map>>  search(
      * @param userIDAttributeName the name of the attribute which uniquely identifies users, e.g. "uid".
      * @param limit is maximum number of results to return. This is added to the
      *          END of the WHERE clause using mysql LIMIT on a query.
-     *          Default if no limit(if limit<0) is specified is LIMIT=1
+     *          Default if no limit(if limit<0) is specified is LIMIT=1
      *          Limit is ignored in this implementation since it is not
      *          portable SQL
      * @param queryFilter the query filter sent, more or less directly, from a CREST endpoint _queryFilter value.
diff --git a/openam-core/src/main/java/com/sun/identity/idm/remote/IdRemoteEventListener.java b/openam-core/src/main/java/com/sun/identity/idm/remote/IdRemoteEventListener.java
index b5421f6da3..5545af57d1 100644
--- a/openam-core/src/main/java/com/sun/identity/idm/remote/IdRemoteEventListener.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/remote/IdRemoteEventListener.java
@@ -25,6 +25,7 @@
  * $Id: IdRemoteEventListener.java,v 1.7 2009/01/28 05:35:00 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.idm.remote;
@@ -91,7 +92,7 @@ public synchronized static IdRemoteEventListener getInstance() {
     }
 
     /**
-     * Constructor for EventListener. Should be instantiated
+     * Constructor for EventListener. Should be instantiated
      * once by RemoteServicesImpl
      *
      */
@@ -223,7 +224,6 @@ private static void startPollingThreadIfEnabled(int cachePollingInterval) {
      * Sends notifications to listeners added via addListener.
      * The parameter nItem is an XML document having a single
      * notification event, using the following DTD.
-     * 

      * 
      * 
      *       <!-- EventNotification element specifes the change notification
diff --git a/openam-core/src/main/java/com/sun/identity/idm/server/IdRepoJAXRPCObjectImpl.java b/openam-core/src/main/java/com/sun/identity/idm/server/IdRepoJAXRPCObjectImpl.java
index d26f73e4d1..7f73585b9f 100644
--- a/openam-core/src/main/java/com/sun/identity/idm/server/IdRepoJAXRPCObjectImpl.java
+++ b/openam-core/src/main/java/com/sun/identity/idm/server/IdRepoJAXRPCObjectImpl.java
@@ -25,6 +25,7 @@
  * $Id: IdRepoJAXRPCObjectImpl.java,v 1.13 2010/01/06 01:58:27 veiming Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.idm.server;
@@ -81,7 +82,7 @@
 
 /**
  * Provides service side implementation of IdRepo for JAX-RPC interface
- * DirectoryManagerIF. Does not provide implementation for
+ * DirectoryManagerIF. Does not provide implementation for
  * deprecated AMSDK interfaces.
  * Remote clients using openssoclientsdk.jar would be calling these
  * methods using SOAP.
diff --git a/openam-core/src/main/java/com/sun/identity/idsvcs/opensso/IdentityServicesImpl.java b/openam-core/src/main/java/com/sun/identity/idsvcs/opensso/IdentityServicesImpl.java
index 02b73f6727..4155b692b0 100644
--- a/openam-core/src/main/java/com/sun/identity/idsvcs/opensso/IdentityServicesImpl.java
+++ b/openam-core/src/main/java/com/sun/identity/idsvcs/opensso/IdentityServicesImpl.java
@@ -25,6 +25,7 @@
  * $Id: IdentityServicesImpl.java,v 1.20 2010/01/06 19:11:17 veiming Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.idsvcs.opensso;
@@ -435,7 +436,7 @@ public void delete(IdentityDetails identity, SSOToken admin) throws ResourceExce
      * @param searchModifiers The search modifiers
      * @param admin Your SSO token.
      * @return a list of matching identifiers.
-     * @throws ResourceException
+     * @throws ResourceException if the identity repository search fails.
      */
     public List search(CrestQuery crestQuery, Map> searchModifiers, SSOToken admin)
             throws ResourceException {
@@ -490,7 +491,7 @@ public List search(CrestQuery crestQuery, Map> searc
      * @param searchModifiers The search modifiers
      * @param admin Your SSO token.
      * @return a list of matching identities.
-     * @throws ResourceException
+     * @throws ResourceException if the identity repository search fails.
      */
     public List searchIdentityDetails(CrestQuery crestQuery,
                                                        Map> searchModifiers,
diff --git a/openam-core/src/main/java/com/sun/identity/jaxrpc/SOAPClient.java b/openam-core/src/main/java/com/sun/identity/jaxrpc/SOAPClient.java
index a851e77f1a..6ce5ed6606 100644
--- a/openam-core/src/main/java/com/sun/identity/jaxrpc/SOAPClient.java
+++ b/openam-core/src/main/java/com/sun/identity/jaxrpc/SOAPClient.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -125,10 +126,9 @@ public class SOAPClient {
     
     /**
      * Constructor for applications that would like to dynamically set the SOAP
-     * endponts using 
+     * endponts using
      * setUrls(String[] urls) before
-     * invoking either send() or 
-     * call().
+     * invoking either send() or call().
      */
     public SOAPClient() throws IOException {
         // do nothing
diff --git a/openam-core/src/main/java/com/sun/identity/log/LogConstants.java b/openam-core/src/main/java/com/sun/identity/log/LogConstants.java
index 0eb0c87d44..bc618f3bf0 100755
--- a/openam-core/src/main/java/com/sun/identity/log/LogConstants.java
+++ b/openam-core/src/main/java/com/sun/identity/log/LogConstants.java
@@ -27,6 +27,7 @@
  * Portions Copyrighted 2011-2015 ForgeRock AS.
  * Portions Copyrighted 2013 Cybernetica AS.
  * Portions Copyrighted 2014 Nomura Research Institute, Ltd
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.log;
@@ -34,7 +35,7 @@
 import java.util.logging.Level;
 
 /**
- * Defines constants used in the Logging service.  LogConstants 
+ * Defines constants used in the Logging service.  LogConstants 
  * helps in maintaining a central repository of all the constants used in the
  * package.
  * 
diff --git a/openam-core/src/main/java/com/sun/identity/log/LogManager.java b/openam-core/src/main/java/com/sun/identity/log/LogManager.java
index 8e6774ecb8..9508938082 100644
--- a/openam-core/src/main/java/com/sun/identity/log/LogManager.java
+++ b/openam-core/src/main/java/com/sun/identity/log/LogManager.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2013 Cybernetica AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.log;
 
@@ -542,9 +543,9 @@ public final void readConfiguration()
      *  specific attribute changes that would mean logging has
      *  changed to a new location or has re-started.  these are:
      *    1. logging location
-     *    2. new Status == ACTIVE && old Level == OFF &&
+     *    2. new Status == ACTIVE && old Level == OFF &&
      *       new Level != OFF
-     *    3. old Status == INACTIVE && new Status == ACTIVE &&
+     *    3. old Status == INACTIVE && new Status == ACTIVE &&
      *       new Level != OFF
      *    4. old Backend != new Backend (File <-> DB)
      *    5. old Security Status != new Security Status
diff --git a/openam-core/src/main/java/com/sun/identity/log/cli/ISArchiveVerify.java b/openam-core/src/main/java/com/sun/identity/log/cli/ISArchiveVerify.java
index 0bdf7ed157..95bec15b19 100644
--- a/openam-core/src/main/java/com/sun/identity/log/cli/ISArchiveVerify.java
+++ b/openam-core/src/main/java/com/sun/identity/log/cli/ISArchiveVerify.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -99,7 +100,7 @@ static int getToken(String arg) {
     /**
      * Main method for the class. It drives verify procedure by invoking 
      * runCommand method.
-     * @param args
+     * @param args the command line arguments
      * @throws Exception if it fails to processing verification.
      */
     public static void main(String[] args) throws Exception {
diff --git a/openam-core/src/main/java/com/sun/identity/log/handlers/DBFormatter.java b/openam-core/src/main/java/com/sun/identity/log/handlers/DBFormatter.java
index ff3bba8ad7..006b2553f0 100644
--- a/openam-core/src/main/java/com/sun/identity/log/handlers/DBFormatter.java
+++ b/openam-core/src/main/java/com/sun/identity/log/handlers/DBFormatter.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,7 +47,7 @@
  * Database Logging.
  * 

  * Typically this Formatter will be associated with a DBHandler (a handler meant
- * to handle Database logging).  DBFormatter  takes a LogRecord and
+ * to handle Database logging).  DBFormatter  takes a LogRecord and
  * converts it to a Formatted string which DBHandler can understand.
  *
  */
diff --git a/openam-core/src/main/java/com/sun/identity/log/handlers/ELFFormatter.java b/openam-core/src/main/java/com/sun/identity/log/handlers/ELFFormatter.java
index cec8a5b56c..22ae44dc79 100644
--- a/openam-core/src/main/java/com/sun/identity/log/handlers/ELFFormatter.java
+++ b/openam-core/src/main/java/com/sun/identity/log/handlers/ELFFormatter.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -81,9 +82,10 @@ public ELFFormatter() {
     }
 
     /**
-     * Format the given record as per ELF and return a formatted string. 

-     * For ELF Specifications refer 
  •  www.w3.org/TR/WD-logfile.html
    • 
-     * 
+     * Format the given record as per ELF and return a formatted string.
+     * 
    
+     * For ELF Specifications refer to www.w3.org/TR/WD-logfile.html
+     *
      * @param logRecord the log record to be formatted.
      * @return formatted string.
      */
@@ -174,8 +176,8 @@ public String format(java.util.logging.LogRecord logRecord) {
      * specifies the ELF version used followed by a #Fields line which specifies
      * all the fields that are being logged.
      * 
    
-     *  ELFFormatter  uses this method to return back the header
-     * containing these two lines.  FileHandler  checks if the header
+     *  ELFFormatter  uses this method to return back the header
+     * containing these two lines.  FileHandler  checks if the header
      * is already written, if not uses this method to get the header and puts it
      * at the beginning of the file.
      * @param handler The target handler (can be null)
diff --git a/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java b/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java
index d796b68395..06dd203b49 100644
--- a/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java
+++ b/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java
@@ -26,7 +26,7 @@
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2014 Nomura Research Institute, Ltd
- * Portions Copyrighted 2020-2025 3A Systems, LLC.
+ * Portions Copyrighted 2020-2026 3A Systems, LLC.
  */
 
 package com.sun.identity.log.handlers;
@@ -70,10 +70,10 @@
 import java.util.Calendar;
 
 /**
- * This  FileHandler  is very much similar to the
- *  java.util.logging.FileHandler . 
     The  FileHandler 
+ * This  FileHandler  is very much similar to the
+ *  java.util.logging.FileHandler . 
     The  FileHandler 
  * can either write to a specified file, or it can write to a rotating set
- * of files. 
    
+ * of files. 
    
  * For a rotating set of files, as each file reaches the limit
  * ( LogConstants.MAX_FILE_SIZE), it is closed, rotated out, and a
  * new file opened. Successively older files and named by adding "-1", "-2",
@@ -200,15 +200,15 @@ private void setOutputStream(OutputStream out) throws SecurityException,
     }
 
     /**
-     * Set (or change) the character encoding used by this Handler.
-     * The encoding should be set before any LogRecords are written
-     * to the Handler.
+     * Set (or change) the character encoding used by this Handler.
+     * The encoding should be set before any LogRecords are written
+     * to the Handler.
      *
      * @param encoding  The name of a supported character encoding.
      *        May be null, to indicate the default platform encoding.
      * @exception  SecurityException  if a security manager exists and if
      *             the caller does not have
-     *             LoggingPermission("control").
+     *             LoggingPermission("control").
      * @exception UnsupportedEncodingException if the named encoding is
      *           not supported.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/log/handlers/RemoteFormatter.java b/openam-core/src/main/java/com/sun/identity/log/handlers/RemoteFormatter.java
index a7f2d282db..264c8f615b 100644
--- a/openam-core/src/main/java/com/sun/identity/log/handlers/RemoteFormatter.java
+++ b/openam-core/src/main/java/com/sun/identity/log/handlers/RemoteFormatter.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -44,6 +45,7 @@
  * service. This xml string conforms to the logDTD.xml file which is given
  * below.
  *
+ * 
    {@code
  * 
  *
  * 
@@ -68,6 +70,7 @@
  * 
  * 
  * ]
+ * }
    
  */
 public class RemoteFormatter extends Formatter {
 
diff --git a/openam-core/src/main/java/com/sun/identity/log/handlers/SecureELFFormatter.java b/openam-core/src/main/java/com/sun/identity/log/handlers/SecureELFFormatter.java
index 3a33b687cc..0e19f67871 100644
--- a/openam-core/src/main/java/com/sun/identity/log/handlers/SecureELFFormatter.java
+++ b/openam-core/src/main/java/com/sun/identity/log/handlers/SecureELFFormatter.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -84,7 +85,7 @@ public SecureELFFormatter() {
     /**
       * Format the given record as per ELF and return a formatted string. 
    
       *
-      * For ELF Specifications refer 
  •  www.w3.org/TR/WD-logfile.html
    • 
+      * For ELF Specifications refer to www.w3.org/TR/WD-logfile.html
       * @param logRecord The logRecord to be formatted
       * @return The string formed by formatting the logRecord
       */
@@ -186,8 +187,8 @@ public String format(java.util.logging.LogRecord logRecord) {
      * specifies the ELF version used followed by a #Fields line which specifies
      * all the fields that are being logged.
      * 
    
-     *  SecureELFFormatter  uses this method to return back the header
-     * containing these two lines.  FileHandler  checks if the header
+     *  SecureELFFormatter  uses this method to return back the header
+     * containing these two lines.  FileHandler  checks if the header
      * is already written, if not uses this method to get the header and puts it
      * at the beginning of the file.
      * @param handler The target handler (can be null)
diff --git a/openam-core/src/main/java/com/sun/identity/log/handlers/SecureFileHandler.java b/openam-core/src/main/java/com/sun/identity/log/handlers/SecureFileHandler.java
index 3a297fdaf3..2d7c900c04 100644
--- a/openam-core/src/main/java/com/sun/identity/log/handlers/SecureFileHandler.java
+++ b/openam-core/src/main/java/com/sun/identity/log/handlers/SecureFileHandler.java
@@ -25,6 +25,7 @@
  * $Id: SecureFileHandler.java,v 1.12 2009/07/27 22:29:42 hvijay Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.log.handlers;
 
@@ -76,10 +77,10 @@
 import com.sun.identity.security.AdminPasswordAction;
 import com.sun.identity.security.keystore.AMPassword;
 /**
- * This  SecureFileHandler  is very much similar to the
- *  java.util.logging.FileHandler . 
     The  FileHandler 
+ * This  SecureFileHandler  is very much similar to the
+ *  java.util.logging.FileHandler . 
     The  FileHandler 
  * can either write to a specified file, or it can write to a rotating set
- * of files. 
    
+ * of files. 
    
  * For a archiving set of files, as each file reaches the limit
  * ( LogConstants.MAX_FILE_SIZE), it is closed, archived, and a
  * new file opened. Successively older files and named by adding 
@@ -215,15 +216,15 @@ private void setOutputStream(OutputStream out) throws SecurityException,
     }
     
     /**
-     * Set (or change) the character encoding used by this Handler.
-     * The encoding should be set before any LogRecords are written
-     * to the Handler.
+     * Set (or change) the character encoding used by this Handler.
+     * The encoding should be set before any LogRecords are written
+     * to the Handler.
      *
      * @param encoding  The name of a supported character encoding.
      *              May be null, to indicate the default platform encoding.
      * @exception  SecurityException  if a security manager exists and if
-     *             the caller does not have LoggingPermission("control")
-     *             .
+     *             the caller does not have LoggingPermission("control")
+     *             .
      * @exception  UnsupportedEncodingException if the named encoding is
      *             not supported.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/log/s1is/LogConfigReader.java b/openam-core/src/main/java/com/sun/identity/log/s1is/LogConfigReader.java
index ea278729df..f6a067757b 100644
--- a/openam-core/src/main/java/com/sun/identity/log/s1is/LogConfigReader.java
+++ b/openam-core/src/main/java/com/sun/identity/log/s1is/LogConfigReader.java
@@ -27,6 +27,7 @@
  * Portions Copyrighted 2010-2014 ForgeRock AS.
  * Portions Copyrighted 2014 Nomura Research Institute, Ltd
  * Portions Copyrighted 2013 Cybernetica AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.log.s1is;
@@ -56,10 +57,10 @@
 import java.util.TreeSet;
 
 /**
- * LogConfigReader is used to load the configuration from the
+ * LogConfigReader is used to load the configuration from the
  * Directory Server and store the configuration as Properties of
- * LogManager. 
    
- * LogConfigReader is very Speicific to DSAME. 
    
+ * LogManager. 
    
+ * LogConfigReader is very Speicific to DSAME. 
    
  * java.util.logging.config.class System property should point to this class,
  * since LogManager uses this property instantiates this class to load
  * the configuration.
@@ -98,7 +99,7 @@ public class LogConfigReader implements ServiceListener{
      * HOSTNAME, DATA, LEVEL, LOGINID \r\n
      * 
     The input stream hence constructed is converted into a
      * ByteArrayInputStream and is loaded into LogManager.
-     * @throws IOException
+     * @throws IOException if the logging configuration cannot be read
      */
     public LogConfigReader() throws IOException {
         debug = Debug.getInstance("amLog");
diff --git a/openam-core/src/main/java/com/sun/identity/log/service/LogService.java b/openam-core/src/main/java/com/sun/identity/log/service/LogService.java
index 90254987b4..7dd1e88cf5 100644
--- a/openam-core/src/main/java/com/sun/identity/log/service/LogService.java
+++ b/openam-core/src/main/java/com/sun/identity/log/service/LogService.java
@@ -25,7 +25,7 @@
  * $Id: LogService.java,v 1.5 2009/12/15 18:00:14 bigfatrat Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.log.service;
@@ -86,7 +86,7 @@ public class LogService implements RequestHandler {
 
     /**
      * Registers the classes with the SAX parser
-     * @throws Exception
+     * @throws Exception if the SAX parser cannot be initialized.
      */
     @Inject
     public LogService(AuditEventPublisher auditEventPublisher, AuditEventFactory auditEventFactory) throws Exception {
@@ -113,9 +113,9 @@ public LogService(AuditEventPublisher auditEventPublisher, AuditEventFactory aud
     /**
      * The method which accepts the request set, parses the xml request and
      * executes the appropriate log operation.
-     * @param requests
-     * @param servletRequest
-     * @param servletResponse
+     * @param requests the list of log requests to process.
+     * @param servletRequest the HTTP servlet request associated with the operation.
+     * @param servletResponse the HTTP servlet response associated with the operation.
      * @return The response set which contains the result of the log operation.
      */
     public ResponseSet process(PLLAuditor auditor, List requests,
diff --git a/openam-core/src/main/java/com/sun/identity/monitoring/Agent.java b/openam-core/src/main/java/com/sun/identity/monitoring/Agent.java
index 4fc9ded84b..a77dcf70f0 100644
--- a/openam-core/src/main/java/com/sun/identity/monitoring/Agent.java
+++ b/openam-core/src/main/java/com/sun/identity/monitoring/Agent.java
@@ -25,6 +25,7 @@
  * $Id: Agent.java,v 1.9 2009/11/10 01:33:22 bigfatrat Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.monitoring;
@@ -1213,8 +1214,8 @@ public static String getSiteId() {
 
     /**
      * receive Set of site names
-     * @param sNames site name -> primary URL
-     * @param urlSites is opposite... primary URL -> site name
+     * @param sNames site name -> primary URL
+     * @param urlSites is opposite... primary URL -> site name
      */
     public static void siteNames (Map sNames, Map urlSites) {
         String classMethod = "Agent.siteNames:";
diff --git a/openam-core/src/main/java/com/sun/identity/monitoring/MonitoringUtil.java b/openam-core/src/main/java/com/sun/identity/monitoring/MonitoringUtil.java
index 0f5c4925ae..6275843384 100644
--- a/openam-core/src/main/java/com/sun/identity/monitoring/MonitoringUtil.java
+++ b/openam-core/src/main/java/com/sun/identity/monitoring/MonitoringUtil.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2009 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -214,7 +215,7 @@ protected static Map getMonAuthList(String authFilePath) {
      *    byte    6: seconds
      *    byte    7: deci-seconds (will be 0)
      * 
-     * @param date
+     * @param date the date/time string in "YYYY-MM-DD HH:MM:SS" format to convert
      * @return the converted date
      */
     public static Byte[] convertDate(String date) {
diff --git a/openam-core/src/main/java/com/sun/identity/password/ui/PWResetServlet.java b/openam-core/src/main/java/com/sun/identity/password/ui/PWResetServlet.java
index 4ad462b723..a3c1c44342 100644
--- a/openam-core/src/main/java/com/sun/identity/password/ui/PWResetServlet.java
+++ b/openam-core/src/main/java/com/sun/identity/password/ui/PWResetServlet.java
@@ -26,7 +26,7 @@
  *
  * Portions Copyrighted 2012-2015 ForgeRock AS.
  * Portions Copyrighted 2012 Open Source Solution Technology Corporation
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.password.ui;
 
@@ -89,7 +89,7 @@ public PWResetServlet() {
      * Using this callback the character set to be used for
      * decoding POST/GET data will be set.
      * @param requestContext - request context
-     * @throws ServletException 
+     * @throws ServletException if the request cannot be processed.
      */
     protected void onBeforeRequest(RequestContext requestContext)
         throws ServletException
@@ -149,7 +149,7 @@ protected void initializeRequestContext(RequestContext requestContext){
      *
      * @param requestContext  request context
      * @param handlerName  name of handler
-     * @throws ServletException
+     * @throws ServletException if the request cannot be forwarded.
      */
     protected void onRequestHandlerNotFound(
         RequestContext requestContext,
@@ -167,7 +167,7 @@ protected void onRequestHandlerNotFound(
      * Forwards to invalid URL view bean, in case of no handler specified
      *
      * @param requestContext  request context
-     * @throws ServletException
+     * @throws ServletException if the request cannot be forwarded.
      */
     protected void onRequestHandlerNotSpecified(RequestContext requestContext)
         throws ServletException
@@ -185,8 +185,8 @@ protected void onRequestHandlerNotSpecified(RequestContext requestContext)
      *
      * @param requestContext  request context
      * @param e Exception that was not handled by the application.
-     * @throws ServletException
-     * @throws IOException
+     * @throws ServletException if the request cannot be processed.
+     * @throws IOException if an I/O error occurs while responding.
      */
     protected void onUncaughtException(
         RequestContext requestContext,
diff --git a/openam-core/src/main/java/com/sun/identity/password/ui/model/PWResetModel.java b/openam-core/src/main/java/com/sun/identity/password/ui/model/PWResetModel.java
index 545974f6ea..aa1004556d 100644
--- a/openam-core/src/main/java/com/sun/identity/password/ui/model/PWResetModel.java
+++ b/openam-core/src/main/java/com/sun/identity/password/ui/model/PWResetModel.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2012-2015 ForgeRock AS.
  * Portions Copyrighted 2012 Open Source Solution Technology Corporation
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.password.ui.model;
@@ -174,7 +175,6 @@ public interface PWResetModel {
     /**
      * Returns true if message debugging is enabled.
      *
-     * @see com.iplanet.am.util.Debug#messageEnabled
      * @return true if message debugging is enabled
      *        false if message debugging is disabled
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/ActionDecision.java b/openam-core/src/main/java/com/sun/identity/policy/ActionDecision.java
index 1cf3b91023..3512517182 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/ActionDecision.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/ActionDecision.java
@@ -25,6 +25,7 @@
  * $Id: ActionDecision.java,v 1.5 2008/06/25 05:43:43 qcheng Exp $
  *
  * Portions Copyrighted 2011-2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.policy;
 
@@ -83,7 +84,7 @@ public ActionDecision() {
     /**
      * Constructor
      * @param actionName name of the action.
-     * @param values a Set> of String values for the 
+     * @param values a Set of String values for the
      * action
      * 
      */
@@ -139,7 +140,7 @@ public void setValues(Set values) {
     /**
      * Gets the action values for the action.  
      *
-     * @return a Set>/code> of String values
+     * @return a Set of String values
      * 
      */
     public Set getValues() {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/Conditions.java b/openam-core/src/main/java/com/sun/identity/policy/Conditions.java
index c3a746a5a5..f7c2173265 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/Conditions.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/Conditions.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -188,7 +189,7 @@ public String getDescription() {
 
     /**
      * Sets the name for this instance of the
-     * Conditions which contains a collection
+     * Conditions which contains a collection
      * of conditions respresented as Condition.
      *
      * @param name for the collection of conditions
diff --git a/openam-core/src/main/java/com/sun/identity/policy/Policy.java b/openam-core/src/main/java/com/sun/identity/policy/Policy.java
index ab8be59b04..be1542aee4 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/Policy.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/Policy.java
@@ -25,6 +25,7 @@
  * $Id: Policy.java,v 1.9 2010/01/10 01:19:35 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy;
@@ -237,8 +238,10 @@ public Policy(String policyName, String description,
      *
      * @param policyNode XML node in W3C DOM format representing 
      * the policy object which needs to be created.
-     * @exception InvalidFormatException, InvalidNameException,
-     * NameNotFoundException, PolicyException
+     * @exception InvalidFormatException if the policy XML format is invalid
+     * @exception InvalidNameException if the policy name is invalid
+     * @exception NameNotFoundException if a referenced name is not found
+     * @exception PolicyException if the policy cannot be constructed
      */
     public Policy(PolicyManager pm, Node policyNode)
         throws InvalidFormatException, InvalidNameException,
@@ -740,7 +743,7 @@ public void addRealmSubject(SSOToken token, String subjectName,
      *
      *
      * @param subjectName name of the Subject as defined at the realm
-     * @param stm SubjectTypeManager of the realm.
+     * @param stm SubjectTypeManager of the realm.
      *       You have to pass the SubjectTypeManager of realm in which 
      *       you would save the policy. Trying to save the policy at 
      *       a different realm would throw PolicyException.
@@ -1221,14 +1224,11 @@ public ResponseProvider getResponseProvider(String respProvider)
      * @param respProvider ResponseProvider object to be added to 
      *            the policy
      *
-     * @exception NameAlreadyExistsException if a ResponseProvider with the 
+     * @exception NameAlreadyExistsException if a ResponseProvider with the
      *            given name already exists
-     * @exception InvalidNameException if the respProvider
-     *             name is invalid
-     *
      *
      */
-    public void addResponseProvider(String name, ResponseProvider respProvider) 
+    public void addResponseProvider(String name, ResponseProvider respProvider)
             throws NameAlreadyExistsException {
         respProviders.addResponseProvider(name, respProvider);
     }
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicyCache.java b/openam-core/src/main/java/com/sun/identity/policy/PolicyCache.java
index c91afc2943..a89ab8d247 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicyCache.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicyCache.java
@@ -25,6 +25,7 @@
  * $Id: PolicyCache.java,v 1.9 2010/01/10 01:19:35 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy;
@@ -334,7 +335,7 @@ public void globalConfigChanged(String serviceName, String version,
      * 
      * @param serviceName name of the service
      * @param version version of the service
-     * @param groupName
+     * @param groupName configuration grouping name
      * @param orgName organization name as DN
      * @param serviceComponent the name of the service components that
      *                          changed
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicyConfig.java b/openam-core/src/main/java/com/sun/identity/policy/PolicyConfig.java
index 6e1f84d646..81b24ea5c3 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicyConfig.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicyConfig.java
@@ -25,6 +25,7 @@
  * $Id: PolicyConfig.java,v 1.10 2009/01/28 05:35:01 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy;
@@ -64,11 +65,13 @@
  * following keys. This map is passed to the ResourceComparator class while
  * instantiating a ResourceComparator class.
  * The map contains the following keys:
+ * 
      
  * 
    • RESOURCE_COMPARATOR_CLASS
      • 
  * 
    • RESOURCE_COMPARATOR_WILDCARD
      • 
  * 
    • RESOURCE_COMPARATOR_ONE_LEVEL_WILDCARD
      • 
  * 
    • RESOURCE_COMPARATOR_DELIMITER 
      • 
  * 
    • RESOURCE_COMPARATOR_CASE_SENSITIVE
      • 
+ * 
    
  */
 
 public class PolicyConfig implements com.sun.identity.sm.ServiceListener {
@@ -373,7 +376,7 @@ public void globalConfigChanged(String serviceName, String version,
      *
      * @param serviceName name of the service
      * @param version version of the service
-     * @param groupName
+     * @param groupName the configuration grouping name that changed
      * @param orgName organization name as DN
      * @param serviceComponent the name of the service components that
      *                          changed
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicyDecision.java b/openam-core/src/main/java/com/sun/identity/policy/PolicyDecision.java
index 3e25abd596..dcec7a19bf 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicyDecision.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicyDecision.java
@@ -25,6 +25,7 @@
  * $Id: PolicyDecision.java,v 1.3 2008/06/25 05:43:44 qcheng Exp $
  *
  * Portions Copyrighted 2011-2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.policy;
 
@@ -139,10 +140,10 @@ void addActionDecision(ActionDecision newActionDecision, ServiceType
      * action.
      *
      * @param newActionDecision an ActionDecision to be added.
-     * @param trueValue String representing the true
+     * @param trueValue String representing the true
      * value in the action schema.
-     * @param falseValue String representing the 
-     *     false value in the action schema.
+     * @param falseValue String representing the
+     * false value in the action schema.
      * 
      */
     public void addActionDecision(ActionDecision newActionDecision, 
@@ -441,8 +442,8 @@ public long getTimeToLive() {
 
     /**
      * Sets the timeToLive value of the policy decision to the
-     * smallest of timeToLive(s) of contained
-     * ActionDecision(s). Also sets value of
+     * smallest of timeToLive(s) of contained
+     * ActionDecision(s). Also sets value of
      * advicesAreSet. This is set to true
      * if any of the contained action decision(s) has advice defined.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicyEvaluator.java b/openam-core/src/main/java/com/sun/identity/policy/PolicyEvaluator.java
index 3a93b97482..2ec4ec44be 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicyEvaluator.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicyEvaluator.java
@@ -25,6 +25,7 @@
  * $Id: PolicyEvaluator.java,v 1.19 2010/01/14 23:18:35 dillidorai Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy;
@@ -1286,7 +1287,7 @@ private Set getProtectingPolicies(
      *              
  • ResourceResult.SUBTREE_SCOPE
      *              
  • ResourceResult.STRICT_SUBTREE_SCOPE
      *              
  • ResourceResult.SELF_SCOPE
-     *              
      
+     *              
    
      *              If the scope is ResourceResult.SUBTREE_SCOPE,
      *              the method will return a set of ResourceResult
      *              objects, one of them for the resourceName and
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicyLockFactory.java b/openam-core/src/main/java/com/sun/identity/policy/PolicyLockFactory.java
index 5ff476be79..4af1c3d5c8 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicyLockFactory.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicyLockFactory.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.policy;
 
@@ -19,7 +20,7 @@
 
 /**
  * Maintains a singleton instance to the shared lock factory.
- * 
    
+ * 
    
  * This factory is intended to be used when concurrent policy changes are not atomic. The retrieved lock
  * can be used to protect the non-atomic logic, blocking other threads until all operations are completed.
  */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicyManager.java b/openam-core/src/main/java/com/sun/identity/policy/PolicyManager.java
index 2b48c0138a..9be8573f1e 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicyManager.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicyManager.java
@@ -25,6 +25,7 @@
  * $Id: PolicyManager.java,v 1.19 2010/01/25 23:48:15 veiming Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy;
@@ -227,8 +228,8 @@ public PolicyManager(SSOToken token) throws SSOException, PolicyException {
      * The names of the organization, sub organization or the
      * container object could be either "/" separated (as per SMS)
      * or could be the complete DN of the object.
-     * For example: /isp/coke, /isp/pepsi/tacobell,
-     * etc., or "ou=tacobell, o=pepsi, o=isp",
+     * For example: /isp/coke, /isp/pepsi/tacobell,
+     * etc., or "ou=tacobell, o=pepsi, o=isp",
      * "o=coke, o=isp", etc.
      * The constructor also requires a single sign on token.
      * which will be used to perform all data store
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicySSOTokenListener.java b/openam-core/src/main/java/com/sun/identity/policy/PolicySSOTokenListener.java
index 84d00e9fd6..69989d7c67 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicySSOTokenListener.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicySSOTokenListener.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -44,7 +45,7 @@
  * SSOTokenListener interface and is used for maintaining the 
  * policy decision cache , subject evaluation cache, User
  * Role cache maintained by LDAPRoles subject,
- * as well as the user nsRole attribute values cache.
+ * as well as the user nsRole attribute values cache.
  */
 
 public class PolicySSOTokenListener 
diff --git a/openam-core/src/main/java/com/sun/identity/policy/PolicyUtils.java b/openam-core/src/main/java/com/sun/identity/policy/PolicyUtils.java
index 637e406333..8396cfb51e 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/PolicyUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/PolicyUtils.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
  * Portions Copyrighted 2014 Nomura Research Institute, Ltd
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.policy;
 
@@ -952,6 +953,7 @@ public static String getDNDisplayString(String strDN) {
      * to the following DTD. The input string may not be validated against the 
      * dtd for performance reasons.  
 
+     * 
    {@code
          
         
-
+     * }
    
      *
      * @return the map of policy advices parsed from the passed in advicesXML
      *         If the passed in advicesXML is null, null would be returned
@@ -1125,7 +1127,7 @@ public static void createOrReplacePolicies(PolicyManager pm, InputStream xmlPoli
     }
 
     /** 
-     * Returns deep copy of a Map
+     * Returns deep copy of a Map
      * The passed in Map should have String 
      * object as keys and Set of String 
      * objects as values 
diff --git a/openam-core/src/main/java/com/sun/identity/policy/Referrals.java b/openam-core/src/main/java/com/sun/identity/policy/Referrals.java
index acd0f3510c..84e704f29b 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/Referrals.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/Referrals.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -75,8 +76,8 @@ protected Referrals() {
      * @throws InvalidFormatException if the node passed in does not
      * conform to expected format
      * 
-     * @throws InvalidNameException  if the name specified in the 
-     * Node     for Referrals is invalid
+     * @throws InvalidNameException  if the name specified in the
+     * Node for Referrals is invalid
      *
      * @throws NameNotFoundException need to add the situations that would
      * cause this
@@ -193,7 +194,7 @@ public String getDescription() {
 
     /**
      * Sets the name for this instance of the
-     * Referrals which contains a collection
+     * Referrals which contains a collection
      * of referrals respresented as Referral.
      *
      * @param name for the collection of referrals
@@ -205,7 +206,7 @@ public void setName(String name) {
 
     /**
      * Sets the description for this instance of the
-     * Referrals which contains a collection
+     * Referrals which contains a collection
      * of referrals respresented as Referral.
      *
      * @param description description for the collection referrals
diff --git a/openam-core/src/main/java/com/sun/identity/policy/Subjects.java b/openam-core/src/main/java/com/sun/identity/policy/Subjects.java
index c74035f7f1..9d4e8a4c50 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/Subjects.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/Subjects.java
@@ -25,6 +25,7 @@
  * $Id: Subjects.java,v 1.4 2008/06/25 05:43:45 qcheng Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.policy;
 
@@ -74,9 +75,9 @@ protected Subjects() {
      * @throws InvalidFormatException if the node passed in does not
      * conform to expected format
      * 
-     * @throws InvalidNameException 
-     * @throws NameNotFoundException 
-     *         
+     * @throws InvalidNameException if a subject name in the node is invalid
+     * @throws NameNotFoundException if a referenced subject type cannot be found
+     *
      * @throws PolicyException if can not construct Subjects
      */
     protected Subjects(PolicyManager pm, Node usersNode)
@@ -209,7 +210,7 @@ public String getDescription() {
 
     /**
      * Sets the name for this instance of the
-     * Subjects which contains a collection
+     * Subjects which contains a collection
      * of users respresented as Subject.
      *
      * @param name for the collection of subjects
@@ -221,7 +222,7 @@ public void setName(String name) {
 
     /**
      * Sets the description for this instance of the
-     * Subjects which contains a collection
+     * Subjects which contains a collection
      * of users respresented as Subject.
      *
      * @param description description for the collection subjects
diff --git a/openam-core/src/main/java/com/sun/identity/policy/client/ResultsCacheUtil.java b/openam-core/src/main/java/com/sun/identity/policy/client/ResultsCacheUtil.java
index aae0d14b7f..7685aee23a 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/client/ResultsCacheUtil.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/client/ResultsCacheUtil.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -59,7 +60,7 @@ public class ResultsCacheUtil {
       * client that is listening for notifications from policy service
       *
       * @param xml XML notification envelope
-      * @throws PolicyEvaluationException 
+      * @throws PolicyEvaluationException if the notification cannot be processed
       *
       */
     public static void processNotification(String xml)
@@ -82,7 +83,7 @@ public static void processNotification(String xml)
       * client that is listening for notifications from policy service
       *
       * @param message notification as JSON string
-      * @throws PolicyEvaluationException 
+      * @throws PolicyEvaluationException if the notification cannot be processed
       *
       */
     public static void processRESTNotification(String message)
diff --git a/openam-core/src/main/java/com/sun/identity/policy/interfaces/Condition.java b/openam-core/src/main/java/com/sun/identity/policy/interfaces/Condition.java
index 0bc01a87f8..7cdd5fc68e 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/interfaces/Condition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/interfaces/Condition.java
@@ -25,6 +25,7 @@
  * $Id: Condition.java,v 1.7 2009/06/19 22:54:46 mrudul_uchil Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.interfaces;
@@ -616,7 +617,7 @@ public interface Condition extends Cloneable {
      *
      * @param property property name
      *
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property);
 
@@ -631,7 +632,7 @@ public interface Condition extends Cloneable {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name.
-     * @throws PolicyException
+     * @throws PolicyException if the display name cannot be determined.
      */
     public String getDisplayName(String property, Locale locale)
         throws PolicyException;
@@ -685,7 +686,7 @@ public String getDisplayName(String property, Locale locale)
      *
      * @param token single-sign-on SSOToken of the user
      *
-     * @param env request specific environment Map,/code> of key/value 
+     * @param env request specific environment Map of key/value
      *        pairs For example this would contain IP address of remote
      *        client for an IPCondition.
      *
diff --git a/openam-core/src/main/java/com/sun/identity/policy/interfaces/Referral.java b/openam-core/src/main/java/com/sun/identity/policy/interfaces/Referral.java
index b76d641dca..c9538b31d2 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/interfaces/Referral.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/interfaces/Referral.java
@@ -25,6 +25,7 @@
  * $Id: Referral.java,v 1.2 2008/06/25 05:43:47 qcheng Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -104,9 +105,10 @@ public String getDisplayNameForValue(String value, Locale locale)
      * Gets the valid values for this referral 
      * @param token SSOToken
      * @return ValidValues object
-     * @throws SSOException, PolicyException
+     * @throws SSOException if the single sign on token is invalid
+     * @throws PolicyException if the valid values cannot be retrieved
      */
-    ValidValues getValidValues(SSOToken token) 
+    ValidValues getValidValues(SSOToken token)
         throws SSOException, PolicyException;
 
     /**
@@ -115,7 +117,8 @@ ValidValues getValidValues(SSOToken token)
      * @param token SSOToken
      * @param pattern a pattern to match against the value
      * @return ValidValues object
-     * @throws SSOException, PolicyException
+     * @throws SSOException if the single sign on token is invalid
+     * @throws PolicyException if the valid values cannot be retrieved
      */
     ValidValues getValidValues(SSOToken token, String pattern)
         throws SSOException, PolicyException;
@@ -145,8 +148,8 @@ Syntax getValueSyntax(SSOToken token)
      *        Each value is a set of values for the parameter.
      * @return policy decision
      *
-     * @throws PolicyException
-     * @throws SSOException
+     * @throws PolicyException if the policy decision cannot be obtained
+     * @throws SSOException if the single sign on token is invalid
      */
     PolicyDecision getPolicyDecision(SSOToken token, String resourceType,
         String resourceName, Set actionNames, Map envParameters
@@ -168,8 +171,8 @@ PolicyDecision getPolicyDecision(SSOToken token, String resourceType,
      * @return names of sub resources for the given resourceName.
      *         The return value also includes the resourceName.
      *
-     * @throws PolicyException
-     * @throws SSOException
+     * @throws PolicyException if the resource names cannot be retrieved
+     * @throws SSOException if the single sign on token is invalid
      *
      * @see com.sun.identity.policy.ResourceMatch#EXACT_MATCH
      * @see com.sun.identity.policy.ResourceMatch#SUB_RESOURCE_MATCH
diff --git a/openam-core/src/main/java/com/sun/identity/policy/interfaces/ResponseProvider.java b/openam-core/src/main/java/com/sun/identity/policy/interfaces/ResponseProvider.java
index 4f03748a42..0a755e9156 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/interfaces/ResponseProvider.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/interfaces/ResponseProvider.java
@@ -25,6 +25,7 @@
  * $Id: ResponseProvider.java,v 1.5 2008/08/19 19:09:16 veiming Exp $
  *
  * Portions Copyrighted 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.interfaces;
@@ -106,7 +107,7 @@ public interface ResponseProvider extends Cloneable {
      *
      * @param property property name
      *
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property);
 
@@ -121,7 +122,7 @@ public interface ResponseProvider extends Cloneable {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name.
-     * @throws PolicyException
+     * @throws PolicyException if the display name cannot be determined.
      */
     public String getDisplayName(String property, Locale locale)
         throws PolicyException;
@@ -177,7 +178,7 @@ public Set getValidValues(String property) throws
      *          (String).
      *
      * @throws PolicyException if the decision could not be computed
-     * @throws SSOException token is not valid
+     * @throws SSOException if the token is not valid
      *
      */
     public Map getResponseDecision(SSOToken token,  
diff --git a/openam-core/src/main/java/com/sun/identity/policy/interfaces/Subject.java b/openam-core/src/main/java/com/sun/identity/policy/interfaces/Subject.java
index 5bb528d4ee..4083d2b561 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/interfaces/Subject.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/interfaces/Subject.java
@@ -25,6 +25,7 @@
  * $Id: Subject.java,v 1.3 2009/05/05 18:27:47 mrudul_uchil Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -70,10 +71,8 @@ public interface Subject extends Cloneable {
      * @param token the SSOToken that will be used
      * to determine the syntax
      *
-     * @return Set of valid names for the user collection.
-     *
      * @exception SSOException if SSOToken is not valid
-     * @exception PolicyException if unable to get the list of 
+     * @exception PolicyException if unable to get the list of
      * valid names.
      *
      * @return Syntax of the values for the Subject
diff --git a/openam-core/src/main/java/com/sun/identity/policy/interfaces/package-info.java b/openam-core/src/main/java/com/sun/identity/policy/interfaces/package-info.java
index 1d6a733884..a5ffd78472 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/interfaces/package-info.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/interfaces/package-info.java
@@ -25,13 +25,12 @@
  * $Id: package-info.java,v 1.2 2008/06/25 05:43:47 qcheng Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
 /**
  * Deprecated interfaces for writing custom Policy plugins for Conditions,
  * Subjects, Referrals, ResponseProviders and Resources.
- * 
- * @deprecated since 12.0.0
  */
 package com.sun.identity.policy.interfaces;
diff --git a/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermission.java b/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermission.java
index e4d9614ce5..6077258676 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermission.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermission.java
@@ -25,6 +25,7 @@
  * $Id: ISPermission.java,v 1.5 2008/08/19 19:09:17 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.jaas;
@@ -79,11 +80,9 @@
  * sun.security.provider.PolicyFile or defined on the command line 
  * using the -D option.
  *
- * 
    
  * @see java.security.Permission
  * @see javax.security.auth.Subject
  * @see java.security.ProtectionDomain
- * 
    
  *
  * 
  */
@@ -468,17 +467,17 @@ public boolean equals(Object obj){
 
     /**
      * Returns the hash code value for this Permission object.
-     * 
    
+     * 
    
      * The required hashCode behavior for Permission Objects is
-     * the following: 
    
+     * the following:
      * 
      
      * 
    • Whenever it is invoked on the same Permission object more than 
      *     once during an execution of a Java application, the 
      *     hashCode method
      *     must consistently return the same integer. This integer need not 
      *     remain consistent from one execution of an application to another 
-     *     execution of the same application. 
      
-     * 
    • If two Permission objects are equal according to the 
+     *     execution of the same application.
+     * 
    • If two Permission objects are equal according to the
      *     equals 
      *     method, then calling the hashCode method on each of the
      *     two Permission objects must produce the same integer result. 
@@ -519,7 +518,7 @@ public int hashCode() {
     /**
      * Checks if the specified permission's actions are "implied by" 
      * this object's actions.
-     * 
      
+     * 
      
      * The implies method is used by the
      * AccessController to determine whether or not a requested
      * permission is implied by another permission that is known to be valid
diff --git a/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermissionCollection.java b/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermissionCollection.java
index 22d8062706..148b3d7a2a 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermissionCollection.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/jaas/ISPermissionCollection.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -38,7 +39,7 @@
 /**
  * This class represents a collection of ISPermission objects.
  * It extends from PermissionCollection providing implementation 
- * of abstract methods like add, implies
+ * of abstract methods like add, implies, 
  * elements. The rest of the required methods are used from the parent
  * class.
  *
@@ -49,7 +50,6 @@
  *      collection, using the implies method.
  * 
    •  enumerate all the permissions, using the elements method.
  * 
    
- * 
    
  *
  * 
    When it is desirable to group together a number of Permission objects of 
  * the same type, the newPermissionCollection method on that 
@@ -66,7 +66,6 @@
  * @see java.security.Permission
  * @see java.security.PermissionCollection
  * @see java.security.Permissions
- * 
    
  *
  */
 public class ISPermissionCollection extends PermissionCollection {
@@ -128,7 +127,7 @@ public Enumeration elements() {
      * the collection of ISPermission objects held in this 
      * ISPermissionCollection.
      * This method takes in a permission and loops through all the 
-     * permissions in its store and call their implies> to 
+     * permissions in its store and call their implies() to
      * evaluate the result.
      *
      * @param perm the Permission object to compare.
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java
index 54aeda2f7b..e9b5373efa 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2007 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -59,7 +60,7 @@
  * in the environment is a member of at least one AMIdentity 
  * object specified in the Condition.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.AMIdentityMembershipCondition}
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.AMIdentityMembershipCondition}
  * instead.
  */
 @Deprecated
@@ -99,7 +100,7 @@ public List getPropertyNames()
       *
       * @param property property name
       *
-      * @return Syntax for the property name
+      * @return Syntax for the property name
       */
      public Syntax getPropertySyntax(String property)
      {
@@ -116,7 +117,7 @@ public Syntax getPropertySyntax(String property)
       * @param property property name.
       * @param locale locale for which the property name must be customized.
       * @return display name for the property name.
-      * @throws PolicyException
+      * @throws PolicyException if the display name cannot be determined
       */
      public String getDisplayName(String property, Locale locale) 
        throws PolicyException
@@ -145,7 +146,7 @@ public Set getValidValues(String property) throws PolicyException
      *  properties.
      *  @param properties the properties of the condition that governs
      *         whether a policy applies. The properties should
-     *         define value for the key Condition.AM_IDENTITY_NAME. 
+     *         define value for the key Condition.AM_IDENTITY_NAME.
      *         The value should be a Set.
      *         Each element of the Set should be
      *         a String, the uuid of AMIdentity. Please note that
@@ -203,7 +204,7 @@ public Map getProperties() {
      * in the environment is a member of at least one AMIdentity 
      * object specified in the Condition. Invocator uuid would be specified as
      * the value of key Condition.INVOCATOR_PRINCIPAL_UUID in the
-     * environment parameter. The value should be a Set
+     * environment parameter. The value should be a Set
      * of String objects.
      *
      * @param token single sign on token of the user
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentitySubject.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentitySubject.java
index b902dc2652..5e8a5880f8 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentitySubject.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentitySubject.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -71,7 +72,7 @@
  * membership in a set of AMIdentity objects using the underlying
  * Identity repository service.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.subject.IdentitySubject} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.subject.IdentitySubject} instead.
  */
 @Deprecated
 public class AMIdentitySubject implements Subject {
@@ -90,8 +91,8 @@ public AMIdentitySubject() {
      * Initialize the AMIdentitySubject object by using the configuration
      * information passed by the Policy Framework.
      * 
    
-     * This implementation  not need anything out of the configParams 
-     * I/code> so does no operation.
+     * This implementation  not need anything out of the configParams
+     *  so does no operation.
      *
      * @param configParams configuration parameters as a Map.
      *
@@ -114,10 +115,6 @@ public void initialize(Map configParams) throws PolicyException {
      * It returns Syntax.MULTIPLE_CHOICE.
      *
      * @exception SSOException if SSOToken is not valid
-     * @exception PolicyException if unable to get the list of 
-     * valid names.
-     *
-     * @return Syntax of the values for the Subject
      */
     public Syntax getValueSyntax(SSOToken token) throws SSOException {
         return (Syntax.MULTIPLE_CHOICE);
@@ -193,7 +190,7 @@ public String getDisplayNameForValue(String value, Locale locale)
      * Returns the values that was set using the
      * method setValues.
      *
-     * @return SetSet of values that have been set for the user
      * collection
      */
     public Set getValues() {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java
index 53acc50a41..3361b5f62c 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -63,7 +64,7 @@
  * env map, AuthLevel is looked up from single sign on
  * token.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.AuthLevelCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.AuthLevelCondition} instead.
  */
 @Deprecated
 public class AuthLevelCondition implements Condition {
@@ -101,7 +102,7 @@ public List getPropertyNames() {
      * @see com.sun.identity.policy.Syntax
      *
      * @param property property name
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         return Syntax.NONE;
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthRoleCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthRoleCondition.java
index 8832df5444..2683f4341c 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthRoleCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthRoleCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -95,7 +96,7 @@ public List getPropertyNames()
       *
       * @param property property name
       *
-      * @return Syntax for the property name
+      * @return Syntax for the property name
       */
      public Syntax getPropertySyntax(String property)
      {
@@ -112,7 +113,7 @@ public Syntax getPropertySyntax(String property)
       * @param property property name.
       * @param locale locale for which the property name must be customized.
       * @return display name for the property name.
-      * @throws PolicyException
+      * @throws PolicyException if the display name cannot be determined
       */
      public String getDisplayName(String property, Locale locale) 
        throws PolicyException
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java
index 31c933fe7a..3071459f38 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java
@@ -25,6 +25,7 @@
  * $Id: AuthSchemeCondition.java,v 1.6 2009/05/05 18:29:01 mrudul_uchil Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -58,7 +59,7 @@
  * of Condition that lets you define authentication module
  * instances for which a Policy applies.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.AuthSchemeCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.AuthSchemeCondition} instead.
  */
 @Deprecated
 public class AuthSchemeCondition implements Condition {
@@ -82,7 +83,7 @@ public class AuthSchemeCondition implements Condition {
     public static final String FORCE_AUTH_ADVICE = "ForceAuth";
 
     /** 
-     * Constant for representing true for ForceAuth
+     * Constant for representing true for ForceAuth
      */
     public static final String TRUE = "true";
 
@@ -127,7 +128,7 @@ public List getPropertyNames() {
      *
      * @param property property name
      *
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         return Syntax.NONE;
@@ -143,7 +144,7 @@ public Syntax getPropertySyntax(String property) {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name
-     * @throws PolicyException
+     * @throws PolicyException if the display name cannot be retrieved
      */
     public String getDisplayName(String property, Locale locale)
        throws PolicyException {
@@ -215,7 +216,7 @@ public Map getProperties() {
      *        AuthSchemeCondition looks for value of key
      *        REQUEST_AUTH_SCHEHMES in the map.  The value should
      *        be a String. If the env parameter is null or does not
-     *       define the value for , value for
+     *       define the value for REQUEST_AUTH_SCHEMES, value for
      *        REQUEST_AUTH_SCHEMES is computed using
      *        AuthMethod obtained from single sign on token of
      *        the user.
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java
index c200b0dfc0..0701df2c31 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -57,7 +58,7 @@
  * implementation  of Condition that lets you specify 
  * the realm to which user should authenticate for the policy to apply
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.AuthenticateToRealmCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.AuthenticateToRealmCondition} instead.
  */
 @Deprecated
 public class AuthenticateToRealmCondition implements Condition {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java
index e09e0fc891..20fdc05c70 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -58,7 +59,7 @@
  * implementation  of Condition that lets you specify 
  * the service to which user should authenticate for the policy to apply
  *
- * @deprecated See {@link org.forgerock.openam.entitlement.conditions.environment.AuthenticateToServiceCondition}
+ * @deprecated See {@code org.forgerock.openam.entitlement.conditions.environment.AuthenticateToServiceCondition}
  * instead.
  */
 @Deprecated
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedSharedAgentsCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedSharedAgentsCondition.java
index 1401d53355..88d0c4d2aa 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedSharedAgentsCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedSharedAgentsCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -139,7 +140,7 @@ public List getPropertyNames()
      *
      * @param property String representing property name
      *
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
      public Syntax getPropertySyntax(String property)
      {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedUsers.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedUsers.java
index 742546c561..0532f4184c 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedUsers.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticatedUsers.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,7 +47,7 @@
 /**
  * This subject applies to all users with valid SSOToken.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.subject.AuthenticatedUsers} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.subject.AuthenticatedUsers} instead.
  */
 @Deprecated
 public class AuthenticatedUsers implements Subject {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/DSAMERole.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/DSAMERole.java
index eb6b668e95..2a68a0157d 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/DSAMERole.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/DSAMERole.java
@@ -25,6 +25,7 @@
  * $Id: DSAMERole.java,v 1.4 2009/01/28 05:35:01 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.plugins;
@@ -149,11 +150,7 @@ public void initialize(Map configParams) throws PolicyException {
      * @param token the SSOToken that will be used
      * to determine the syntax
      *
-     * @return set of of valid names for the user collection.
-     *
      * @exception SSOException if SSO token is not valid
-     * @exception PolicyException if unable to get the list of valid
-     * names.
      *
      * @return syntax of the values for the Subject
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/HttpURLResourceName.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/HttpURLResourceName.java
index 0eccb9387f..ec2ba2fd9e 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/HttpURLResourceName.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/HttpURLResourceName.java
@@ -25,6 +25,7 @@
  * $Id: HttpURLResourceName.java,v 1.4 2008/06/25 05:43:51 qcheng Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.policy.plugins;
 
@@ -37,7 +38,7 @@
  * This class was no longer in sync with expected policy evaluation and moved away from the behaviour of
  * {@link URLResourceName} which duplicates the behaviour of {@link com.sun.identity.entitlement.URLResourceName}
  * that is used by the server when evaluation a policy request in self mode.
- * 
    
+ * 
    
  * To help reduce the cost of upgrade this class has been modified to ensure it continues with eager normalisation of
  * resource URLs but otherwise delegates directly to its subclass {@link URLResourceName}.
  *
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/IDRepoResponseProvider.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/IDRepoResponseProvider.java
index 6d2db19ede..831e55bf10 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/IDRepoResponseProvider.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/IDRepoResponseProvider.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -169,7 +170,7 @@ public List getPropertyNames()  {
      *
      * @param property property name
      *
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         if (property.equals(STATIC_ATTRIBUTE)) {
@@ -191,7 +192,7 @@ public Syntax getPropertySyntax(String property) {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name.
-     * @throws PolicyException
+     * @throws PolicyException if the display name cannot be retrieved
      */
     public String getDisplayName(String property, Locale locale)
             throws PolicyException {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java
index 8f7ad5a3d9..8d642023dd 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -57,8 +58,8 @@
  * of Condition. This lets you define the IP addresses,
  * IP address ranges and DNS name patterns for which the policy applies
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.IPv4Condition}
- * or {@link org.forgerock.openam.entitlement.conditions.environment.IPv6Condition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.IPv4Condition}
+ * or {@code org.forgerock.openam.entitlement.conditions.environment.IPv6Condition} instead.
  */
 @Deprecated
 public class IPCondition implements Condition {
@@ -107,7 +108,7 @@ public List getPropertyNames() {
      * @see com.sun.identity.policy.Syntax
      *
      * @param property property name
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         return Syntax.NONE;
@@ -123,7 +124,7 @@ public Syntax getPropertySyntax(String property) {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name
-     * @throws PolicyException
+     * @throws PolicyException if the display name cannot be determined.
      */
     public String getDisplayName(String property, Locale locale) throws PolicyException {
         if (ipv6) {
@@ -164,7 +165,6 @@ public Set getValidValues(String property) throws PolicyException {
      *        by IP and DNS_NAME
      * @see #START_IP
      * @see #END_IP
-     * @see #IP_RANGE
      * @see #DNS_NAME
      * @see #REQUEST_IP
      * @see #REQUEST_DNS_NAME
@@ -236,11 +236,9 @@ public Map getProperties() {
      * @see #setProperties(Map)
      * @see #START_IP
      * @see #END_IP
-     * @see #IP_RANGE
      * @see #DNS_NAME
      * @see #REQUEST_IP
      * @see #REQUEST_DNS_NAME
-     * @see com.sun.identity.policy.
      */
     public ConditionDecision getConditionDecision(SSOToken token, Map env) throws PolicyException, SSOException {
         // Determine Request IP address
@@ -257,7 +255,7 @@ public ConditionDecision getConditionDecision(SSOToken token, Map env) throws Po
      *
      * @param env map containing environment description. Note that the type of the value corresponding to REQUEST_IP
      * parameter differs depending upon invocation path. It will be a String when invoked by the agents, but it will be
-     * a Set when invoked via the DecisionResource (GET ws/1/entitlement/entitlements).
+     * a {@code Set} when invoked via the DecisionResource (GET ws/1/entitlement/entitlements).
      * @return the IP that was used
      */
     public static String getRequestIp(Map env) {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java
index 66721ef6a9..a4e72f6237 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java
@@ -25,6 +25,7 @@
  * $Id: LDAPFilterCondition.java,v 1.8 2009/11/20 23:52:55 ww203982 Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.plugins;
@@ -85,7 +86,7 @@
  * in policy configuration service, satisfiies the ldap filter
  * specified in the condition
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.LDAPFilterCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.LDAPFilterCondition} instead.
  */
 @Deprecated
 public class LDAPFilterCondition implements Condition {
@@ -148,7 +149,7 @@ public List getPropertyNames() {
       *
       * @param property name of property for which to get Syntax
       *
-      * @return Syntax for the property name
+      * @return Syntax for the property name
       */
      public Syntax getPropertySyntax(String property) {
          return (Syntax.ANY);
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPGroups.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPGroups.java
index 19e52dc487..5eeeb96ffd 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPGroups.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPGroups.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2012 Open Source Solution Technology Corporation 
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.plugins;
@@ -431,7 +432,7 @@ public void setValues(Set names) throws InvalidNameException {
      * @return true if the user is memeber of the
      * given subject; false otherwise.
      *
-     * @exception SSOException if SSOToken>/code> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if an error occured while
      * checking if the user is a member of this subject
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPRoles.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPRoles.java
index 76f80792c5..9ac75f7070 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPRoles.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPRoles.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2012 Open Source Solution Technology Corporation 
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.plugins;
@@ -259,7 +260,7 @@ public void initialize(Map configParams) throws PolicyException {
      * @param token the SSOToken that will be used
      * to determine the syntax
      * @return set of of valid names for the user collection.
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      */
     public Syntax getValueSyntax(SSOToken token) throws SSOException {
         return (Syntax.MULTIPLE_CHOICE);
@@ -274,7 +275,7 @@ public Syntax getValueSyntax(SSOToken token) throws SSOException {
      *
      * @return ValidValues object
      *
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
@@ -295,7 +296,7 @@ public ValidValues getValidValues(SSOToken token) throws
      *
      * @return ValidValues object
      *
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java
index 06e3323089..89cd5067d8 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -62,7 +63,7 @@
  * env map, AuthLevel is looked up from single sign on
  * token.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.LEAuthLevelCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.LEAuthLevelCondition} instead.
  */
 @Deprecated
 public class LEAuthLevelCondition implements Condition {
@@ -101,7 +102,7 @@ public List getPropertyNames() {
      *
      * @param property property name
      *
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         return Syntax.NONE;
@@ -117,7 +118,7 @@ public Syntax getPropertySyntax(String property) {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name
-     * @throws PolicyException
+     * @throws PolicyException if the display name cannot be determined
      */
     public String getDisplayName(String property, Locale locale)
        throws PolicyException {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/OrgReferral.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/OrgReferral.java
index 6393f93cd9..fb5b75fa58 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/OrgReferral.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/OrgReferral.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -134,7 +135,7 @@ public String getDisplayNameForValue(String value, Locale locale)
      * Gets the valid values for this referral 
      * @param token SSOToken
      * @return ValidValues object
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
@@ -145,8 +146,8 @@ public abstract ValidValues getValidValues(SSOToken token)
      * Gets the valid values for this referral matching a pattern
      * @param token SSOToken
      * @param pattern a pattern to match against the value
-     * @return ValidValues object
-     * @exception SSOException if SSOToken> is not valid
+     * @return ValidValues object
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
@@ -159,7 +160,7 @@ public abstract ValidValues getValidValues(SSOToken token, String pattern)
      * @param token the SSOToken that will be used
      * to determine the syntax
      * @return set of of valid names for the referral.
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      */
     public Syntax getValueSyntax(SSOToken token)
             throws SSOException, PolicyException {
@@ -188,8 +189,8 @@ public Syntax getValueSyntax(SSOToken token)
      *        Each key is an environment parameter name.
      *        Each value is a set of values for the parameter.
      * @return policy decision
-     * @throws SSOException
-         * @throws PolicyException
+     * @throws SSOException if the token is invalid
+         * @throws PolicyException if the policy decision cannot be obtained
      */
     public PolicyDecision getPolicyDecision(SSOToken token, 
             String resourceType, String resourceName, Set actionNames, 
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/PeerOrgReferral.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/PeerOrgReferral.java
index cef1ecea55..9a622549e7 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/PeerOrgReferral.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/PeerOrgReferral.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -68,11 +69,11 @@ public String getReferralTypeName() {
      * Gets the valid values for this referral 
      * @param token SSOToken
      * @return ValidValues object
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
-    public ValidValues getValidValues(SSOToken token) 
+    public ValidValues getValidValues(SSOToken token)
             throws SSOException, PolicyException {
         return getValidValues(token ,"*");
     }
@@ -82,7 +83,7 @@ public ValidValues getValidValues(SSOToken token)
      * @param token SSOToken
      * @param pattern a pattern to match against the value
      * @return ValidValues object
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java
index d439bb2b8f..cbb2610f82 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2009 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -76,7 +77,7 @@
  * resource such as IP address, DNS host name, location, etc.
  * For the first drop, we are only supporting IP address.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.ResourceEnvIPCondition instead}.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.ResourceEnvIPCondition} instead.
  */
 @Deprecated
 public class ResourceEnvIPCondition implements Condition {
@@ -118,7 +119,7 @@ public List getPropertyNames()
       *
       * @param property String property name
       *
-      * @return Syntax for the property name
+      * @return Syntax for the property name
       */
      public Syntax getPropertySyntax(String property)
      {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java
index 916b1dc99c..e2cbb7e513 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java
@@ -25,6 +25,7 @@
  * $Id: SessionCondition.java,v 1.4 2008/06/25 05:43:52 qcheng Exp $
  *
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.plugins;
@@ -64,7 +65,7 @@
  * to terminate the user session if the session time exceeds the
  * maximum allowed.
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.SessionCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.SessionCondition} instead.
  */
 @Deprecated
 public class SessionCondition implements Condition {
@@ -144,7 +145,7 @@ public List getPropertyNames() {
      * Gets the Syntax for a property name.
      *
      * @param property property name
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      *
      * @see com.sun.identity.policy.Syntax
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java
index e08b19083c..518847e62f 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -58,7 +59,7 @@
  * This condition checks whether session properties contain at least 
  * one value of the each property listed in the Condition
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.SessionPropertyCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.SessionPropertyCondition} instead.
  */
 @Deprecated
 public class SessionPropertyCondition implements Condition {
@@ -99,7 +100,7 @@ public List getPropertyNames()
       *
       * @param property String representing property name
       *
-      * @return Syntax for the property name
+      * @return Syntax for the property name
       */
      public Syntax getPropertySyntax(String property)
      {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java
index d9661c5bda..d7ec2638b1 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java
@@ -25,6 +25,7 @@
  * $Id: SimpleTimeCondition.java,v 1.5 2010/01/05 22:00:26 dillidorai Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.plugins;
@@ -49,7 +50,7 @@
  * of Condition. This lets you define the time range
  * of week days and/or date range during which a policy applies. 
  *
- * @deprecated Use {@link org.forgerock.openam.entitlement.conditions.environment.SimpleTimeCondition} instead.
+ * @deprecated Use {@code org.forgerock.openam.entitlement.conditions.environment.SimpleTimeCondition} instead.
  */
 @Deprecated
 public class SimpleTimeCondition implements Condition {
@@ -119,7 +120,7 @@ public List getPropertyNames() {
      *
      * @param property property name
      *
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         return Syntax.NONE;
@@ -712,7 +713,7 @@ private long[] getEffectiveRange(long currentGmt, TimeZone timeZone) {
      *
      * @throws PolicyException if the condition has not been initialized
      *         with a successful call to setProperties(Map) and/or
-     *         the value of keys REQUEST_TIME and/or
+     *         the value of keys REQUEST_TIME and/or
      *         REQUEST_TIME_ZONE are invalid.
      * @throws SSOException if the token is invalid
      * @see #setProperties(Map)
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/SubOrgReferral.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/SubOrgReferral.java
index 2dac6c4a8e..4e8a76b8fe 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/SubOrgReferral.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/SubOrgReferral.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -67,7 +68,7 @@ public String getReferralTypeName() {
      * Gets the valid values for this referral 
      * @param token SSOToken
      * @return ValidValues object
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
@@ -81,7 +82,7 @@ public ValidValues getValidValues(SSOToken token)
      * @param token SSOToken
      * @param pattern a pattern to match against the value
      * @return ValidValues object
-     * @exception SSOException if SSOToken> is not valid
+     * @exception SSOException if SSOToken is not valid
      * @exception PolicyException if unable to get the list of valid
      * names.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/policy/plugins/UserSelfCheckCondition.java b/openam-core/src/main/java/com/sun/identity/policy/plugins/UserSelfCheckCondition.java
index 74fd692dd4..0c584f26ef 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/plugins/UserSelfCheckCondition.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/plugins/UserSelfCheckCondition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -106,7 +107,7 @@ public List getPropertyNames() {
       *
       * @param property String representing property name
       *
-      * @return Syntax for the property name
+      * @return Syntax for the property name
       */
      public Syntax getPropertySyntax(String property)
      {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMRequest.java b/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMRequest.java
index 33ce75022b..cbacdbeb1f 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMRequest.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMRequest.java
@@ -25,6 +25,7 @@
  * $Id: AdvicesHandleableByAMRequest.java,v 1.5 2008/08/19 19:09:19 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.remote;
@@ -35,16 +36,14 @@
  * This AdvicesHandleableByAMRequest class represents a 
  * AdvicesHandleableByAMRequest XML element. The 
  * AdvicesHandleableByAMRequest DTD is defined as the following:
- * 
    
- * 
    + * 
    {@code
  *    
  *
  *    
- * 
    
- * 
    
+ * }
    
  */
 public class AdvicesHandleableByAMRequest {
     static final String ADVICES_HANDLEABLE_BY_AM_REQUEST_XML =
diff --git a/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMResponse.java b/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMResponse.java
index 0b541753d4..64e2faf7bc 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMResponse.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/remote/AdvicesHandleableByAMResponse.java
@@ -25,6 +25,7 @@
  * $Id: AdvicesHandleableByAMResponse.java,v 1.4 2008/08/19 19:09:19 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.policy.remote;
@@ -39,7 +40,6 @@
  * AdvicesHandleableByAMResponse XML element. 
  * The AdvicesHandleableByAMResponse DTD is 
  * defined as the following:
- * 
    
  * 
      *    
  *
- *    
+ *    <!ELEMENT    AdvicesHandleableByAMResponse    (AttributeValuePair?) >
  * 
    
- * 
    
  */
 
 public class AdvicesHandleableByAMResponse {
diff --git a/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyChangeNotification.java b/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyChangeNotification.java
index 20f0cba184..95ae73d23d 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyChangeNotification.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyChangeNotification.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -43,8 +44,7 @@
  * This PolicyChangeNotification class represents a 
  * PolicyChangeNotification XML document. The PolicyChangeNotification
  *  DTD is defined as the following:
- * 
    
- * 
    + * 
    {@code
  * 
  *
  * 
- *
+ * }
  * 
    
- * 
    
  */
 
 public class PolicyChangeNotification {
@@ -160,7 +159,7 @@ void setResourceNames(Set names) {
      * the XML.
      *
      * @param pNode the XML DOM node for the
-     *        PolicyChangeNotification object.
+     *        PolicyChangeNotification object.
      * @return constructed PolicyChangeNotification object.
      */
     public static PolicyChangeNotification parseXML(Node pNode)
diff --git a/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyListenerRequest.java b/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyListenerRequest.java
index 1ae4117333..8975eba160 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyListenerRequest.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/remote/PolicyListenerRequest.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -49,9 +50,8 @@
  * This PolicyListenerRequest class represents an 
  * AddPolicyListener XML document. The AddPolicyListener DTD is 
  * defined as the following:
- * 
    
- * 
    - *    
  *
- *      
- *     
+ *     >
  * 
    
- * 
    
  */
 public class RemoveListenerRequest {
 
diff --git a/openam-core/src/main/java/com/sun/identity/policy/remote/ResourceResultRequest.java b/openam-core/src/main/java/com/sun/identity/policy/remote/ResourceResultRequest.java
index db95343e28..046cf4c2e2 100644
--- a/openam-core/src/main/java/com/sun/identity/policy/remote/ResourceResultRequest.java
+++ b/openam-core/src/main/java/com/sun/identity/policy/remote/ResourceResultRequest.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -45,8 +46,7 @@
  * This ResourceResultRequest class represents a
  * GetResourceResults XML document. The GetResourceResults
  * DTD is defined as the following:
- * 
    
- * 
    + * 
    {@code
  *  Key: String::ServiceName
-     *            Value: Map::svcAttributes Map::svcAttributes --> Key:
+     *            arranged is: Map::attributes --> Key: String::ServiceName
+     *            Value: Map::svcAttributes Map::svcAttributes --> Key:
      *            String::AttributeName Value: Set::AttributeValues
      * 
      * @return organization config manager of the newly created
diff --git a/openam-core/src/main/java/com/sun/identity/sm/PluginConfig.java b/openam-core/src/main/java/com/sun/identity/sm/PluginConfig.java
index 7f1e81c1b6..e3b51bb465 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/PluginConfig.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/PluginConfig.java
@@ -25,6 +25,7 @@
  * $Id: PluginConfig.java,v 1.5 2009/01/28 05:35:03 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.sm;
 
@@ -150,7 +151,7 @@ public Map getAttributes() {
      * @param attrs
      *            the Map where key is the attribute name and
      *            value is the Set of attribute values
-     * @throws SMSException
+     * @throws SMSException if an error occurs while saving the configuration.
      */
     public void setAttributes(Map attrs) throws SMSException, SSOException {
         validatePluginConfig();
@@ -176,7 +177,7 @@ public void setAttributes(Map attrs) throws SMSException, SSOException {
      *            the name of the attribute to add
      * @param values
      *            the set of values to add
-     * @throws SMSException
+     * @throws SMSException if an error occurs while saving the configuration.
      */
     public void addAttribute(String attrName, Set values) throws SMSException,
             SSOException {
@@ -206,7 +207,7 @@ public void addAttribute(String attrName, Set values) throws SMSException,
      * 
      * @param attrName
      *            the name of the attribute to remove
-     * @throws SMSException
+     * @throws SMSException if an error occurs while saving the configuration.
      */
     public void removeAttribute(String attrName) throws SMSException,
             SSOException {
@@ -223,7 +224,7 @@ public void removeAttribute(String attrName) throws SMSException,
      *            the name of the attribute
      * @param values
      *            set of attribute values to remove from the given attribute
-     * @throws SMSException
+     * @throws SMSException if an error occurs while saving the configuration.
      */
     public void removeAttributeValues(String attrName, Set values)
             throws SMSException, SSOException {
@@ -243,7 +244,7 @@ public void removeAttributeValues(String attrName, Set values)
      *            the old value to remove from the attribute
      * @param newValue
      *            the new value to add to the attribute
-     * @throws SMSException
+     * @throws SMSException if an error occurs while saving the configuration.
      */
     public void replaceAttributeValue(String attrName, String oldValue,
             String newValue) throws SMSException, SSOException {
@@ -278,7 +279,7 @@ public void replaceAttributeValue(String attrName, String oldValue,
      *            the set of old values to remove from the attribute
      * @param newValues
      *            the set of new values to add to the attribute
-     * @throws SMSException
+     * @throws SMSException if an error occurs while saving the configuration.
      */
     public void replaceAttributeValues(String attrName, Set oldValues,
             Set newValues) throws SMSException, SSOException {
diff --git a/openam-core/src/main/java/com/sun/identity/sm/SMSEventListenerManager.java b/openam-core/src/main/java/com/sun/identity/sm/SMSEventListenerManager.java
index 22202a1591..2c4912f77a 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/SMSEventListenerManager.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/SMSEventListenerManager.java
@@ -25,6 +25,7 @@
  * $Id: SMSEventListenerManager.java,v 1.12 2009/01/28 05:35:03 ww203982 Exp $
  *
  * Portions Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.sm;
@@ -44,8 +45,8 @@
 
 /**
  * Receives notifications for all SMS object changes from
- * SMSNotificationManager and dispatches the same to 
- * CachedSMSEntry and CachedSubEntries. This class
+ * SMSNotificationManager and dispatches the same to 
+ * CachedSMSEntry and CachedSubEntries. This class
  * also handles the case of sending deleted event for recursive deletes.
  */
 class SMSEventListenerManager implements SMSObjectListener {
diff --git a/openam-core/src/main/java/com/sun/identity/sm/SMSException.java b/openam-core/src/main/java/com/sun/identity/sm/SMSException.java
index 49199df090..0b503c5032 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/SMSException.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/SMSException.java
@@ -25,6 +25,7 @@
  * $Id: SMSException.java,v 1.7 2009/01/28 05:35:03 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.sm;
 
@@ -450,7 +451,6 @@ private String mapLDAPException(ResultCode resultCode) {
     /**
      * If root LDAP cause is an LDAP exception with one of the following error
      * codes then this status is set.
-     * 
    
      * 
      * 
          * 
diff --git a/openam-core/src/main/java/com/sun/identity/sm/SMSNotificationManager.java b/openam-core/src/main/java/com/sun/identity/sm/SMSNotificationManager.java
index 5befdf998b..b6fdebcba5 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/SMSNotificationManager.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/SMSNotificationManager.java
@@ -25,6 +25,7 @@
  * $Id: SMSNotificationManager.java,v 1.14 2009/11/10 21:49:44 hengming Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.sm;
 
@@ -53,7 +54,7 @@
  * 
  * Classes that will register for notifications are:
  * 1) SMSEventListnerManager -- to send notifications to internal objects
- *      Framework classes i.e., Cached* & *Impls that maintain read only caches
+ *      Framework classes i.e., Cached* & *Impls that maintain read only caches
  * 2) SMSJAXRPCObjectImpl -- to send notifications to remote clients
  * 3) SMSLdapObjectImpl -- to clear its internal cache
  * Of the above (2) and (3) would happen only on the Server only.
diff --git a/openam-core/src/main/java/com/sun/identity/sm/SMSPropertiesObserver.java b/openam-core/src/main/java/com/sun/identity/sm/SMSPropertiesObserver.java
index 2ac483b7fc..d84b467c09 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/SMSPropertiesObserver.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/SMSPropertiesObserver.java
@@ -25,6 +25,7 @@
  * $Id: SMSPropertiesObserver.java,v 1.1 2008/07/30 00:50:15 arviranga Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  */
 
@@ -38,7 +39,7 @@
 import org.forgerock.opendj.ldap.LdapException;
 
 /**
- * Listenes to changes to SystemProperties and reinitialized
+ * Listenes to changes to SystemProperties and reinitialized
  * configuration framework. The properties that takes effect upon change are:
  * com.iplanet.am.sdk.caching.enabled
  * com.sun.identity.sm.cache.enabled
diff --git a/openam-core/src/main/java/com/sun/identity/sm/SMSSchema.java b/openam-core/src/main/java/com/sun/identity/sm/SMSSchema.java
index 3f38ddd3a3..76266e324f 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/SMSSchema.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/SMSSchema.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -222,7 +223,7 @@ protected Node getServiceNode() throws SMSException {
      * @param serviceName
      *            name of the service
      * @return service schema in serialized String format
-     * @throws SMSException
+     * @throws SMSException if the schema cannot be retrieved.
      */
     protected String getSchema(String serviceName) throws SMSException {
         String oldServiceName = this.serviceName;
@@ -237,7 +238,7 @@ protected String getSchema(String serviceName) throws SMSException {
      * stored in a directory.
      * 
      * @return service schema in serialized String format
-     * @throws SMSException
+     * @throws SMSException if the schema cannot be retrieved.
      */
     public String getSchema() throws SMSException {
         Node node = null;
@@ -260,7 +261,7 @@ public String getSchema() throws SMSException {
      * @param pluginName
      *            name of the plugin schema name
      * @return service plugin schema in serialized String format
-     * @throws SMSException
+     * @throws SMSException if the plugin schema cannot be retrieved.
      */
     public String getPluginSchema(String serviceName, String pluginName)
             throws SMSException {
@@ -278,7 +279,7 @@ public String getPluginSchema(String serviceName, String pluginName)
      * @param pluginName
      *            name of the plugin schema name
      * @return service plugin schema in serialized String format
-     * @throws SMSException
+     * @throws SMSException if the plugin schema cannot be retrieved.
      */
     public String getPluginSchema(String pluginName) throws SMSException {
         Node parent = getServiceNode();
@@ -303,7 +304,7 @@ public String getPluginSchema(String pluginName) throws SMSException {
      *
      * @param pluginName plugin schema name
      * @return service plugin schema in serialized String format
-     * @throws SMSException
+     * @throws SMSException if the plugin schema cannot be retrieved.
      */
     public String getPluginSchema(Node pluginName) throws SMSException {
         return (PLUGIN_PREFIX_1 + getServiceName() + PLUGIN_PREFIX_2
@@ -429,7 +430,7 @@ Document getDocument() {
     }
 
     /**
-     * The method escapes '&', '<', '>', '"', '''
+     * The method escapes '&', '<', '>', '"', '''
      */
     public static String escapeSpecialCharacters(String txt) {
         if (txt == null) {
diff --git a/openam-core/src/main/java/com/sun/identity/sm/SMSUtils.java b/openam-core/src/main/java/com/sun/identity/sm/SMSUtils.java
index f8d5971fc0..266f0f9fd7 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/SMSUtils.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/SMSUtils.java
@@ -25,6 +25,7 @@
  * $Id: SMSUtils.java,v 1.5 2008/07/11 01:46:21 arviranga Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.sm;
 
@@ -250,7 +251,7 @@ public static ATTRIBUTE_SCHEMA_CHILD valueOfName(String name) {
 
         /**
          * Get the node type name
-         * @return
+         * @return the node type name
          */
         public String getNodeName() {
             return name;
diff --git a/openam-core/src/main/java/com/sun/identity/sm/ServiceAttributeValidator.java b/openam-core/src/main/java/com/sun/identity/sm/ServiceAttributeValidator.java
index ae4eb1f689..af3ca73fa9 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/ServiceAttributeValidator.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/ServiceAttributeValidator.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -44,7 +45,6 @@ public interface ServiceAttributeValidator {
 
     /**
      * Validates the given set of string values.
-     * 
    
      * 
      * 
          *  Example:
diff --git a/openam-core/src/main/java/com/sun/identity/sm/ServiceManager.java b/openam-core/src/main/java/com/sun/identity/sm/ServiceManager.java
index c3de5d0d8e..3194cfb48b 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/ServiceManager.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/ServiceManager.java
@@ -25,6 +25,7 @@
  * $Id: ServiceManager.java,v 1.27 2009/10/28 04:24:26 hengming Exp $
  *
  * Portions Copyrighted 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.sm;
@@ -634,7 +635,7 @@ private boolean validSMSDtdDocType(Document doc) {
     /**
      * Adds a new plugin schema to an existing service
      *
-     * @param pluginDoc 
+     * @param pluginDoc the plugin schema document to add
      * @throws SMSException if an error occurred while performing the operation
      * @throws SSOException if the user's single sign on token is invalid or
      *         expired.
diff --git a/openam-core/src/main/java/com/sun/identity/sm/ServiceSchemaManager.java b/openam-core/src/main/java/com/sun/identity/sm/ServiceSchemaManager.java
index af92f7223b..2c0c486f77 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/ServiceSchemaManager.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/ServiceSchemaManager.java
@@ -25,6 +25,7 @@
  * $Id: ServiceSchemaManager.java,v 1.12 2009/07/25 05:11:55 qcheng Exp $
  *
  * Portions Copyrighted 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.sm;
 
@@ -65,8 +66,8 @@ public class ServiceSchemaManager {
     
     /**
      * Constructor for service's schema manager to manage the attributes and
-     * sub configurations. Assumes service version number to be 1.0
-     * .
+     * sub configurations. Assumes service version number to be 1.0
+     * .
      *
      * @throws SMSException
      *             if an error occurred while trying to perform the operation
diff --git a/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSEnhancedFlatFileObject.java b/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSEnhancedFlatFileObject.java
index 73c2803344..30e594253a 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSEnhancedFlatFileObject.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSEnhancedFlatFileObject.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -663,7 +664,7 @@ public void delete(SSOToken token, String objName)
      * @param token Ignored argument. Access check is assumed to have 
      *        occurred before reaching this method. 
      * @param objName Name of the configuration object to check.
-     * @return true>/code> if the configuration object exists.
+     * @return true if the configuration object exists.
      * @throws IllegalArgumentException if objName is null or empty.
      */
     public boolean entryExists(SSOToken token, String objName) {
diff --git a/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileObject.java b/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileObject.java
index bde22eb55b..5ff9e97b0f 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileObject.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileObject.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2005 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -62,7 +63,7 @@
  * a configuration object is hierarchy levels separated by a comma, 
  * for example "ou=serviceName,ou=services,dc=sun,dc=com". 
  * This object would live in the directory 
- * /dc=com/dc=sun/ou=services/ou=serviceName
+ * {@code }/dc=com/dc=sun/ou=services/ou=serviceName
  * The directory has a file with the object's attributes in 
  * java.util.Properties format. The file name is Attributes.properties.
  * Attributes with multi-values are seperated by a comma. 
@@ -792,7 +793,7 @@ public void delete(SSOToken token, String objName)
      * @param token Ignored argument. Access check is assumed to have 
      *        occurred before reaching this method. 
      * @param objName Name of the configuration object to check.
-     * @return true>/code> if the configuration object exists.
+     * @return true if the configuration object exists.
      * @throws IllegalArgumentException if objName is null or empty.
      */
     public boolean entryExists(SSOToken token, String objName) {
diff --git a/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileTreeNode.java b/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileTreeNode.java
index 8a7b1af2f8..ebb6206218 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileTreeNode.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/flatfile/SMSFlatFileTreeNode.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -101,8 +102,6 @@ public SMSFlatFileTreeNode getParentNode() {
      *
      * @param child Child node.
      * @return true if child is added to the tree.
-     * @throws SMSException if the dn of the child is not prefix with
-     *         this node.
      */
     public boolean addChild(SMSFlatFileTreeNode child) {
         boolean added = false;
diff --git a/openam-core/src/main/java/com/sun/identity/sm/jaxrpc/SMSJAXRPCObjectImpl.java b/openam-core/src/main/java/com/sun/identity/sm/jaxrpc/SMSJAXRPCObjectImpl.java
index 8ac165e0a3..e036ab0b4b 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/jaxrpc/SMSJAXRPCObjectImpl.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/jaxrpc/SMSJAXRPCObjectImpl.java
@@ -25,6 +25,7 @@
  * $Id: SMSJAXRPCObjectImpl.java,v 1.22 2009/10/28 04:24:27 hengming Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.sm.jaxrpc;
@@ -259,7 +260,7 @@ public void delete(String tokenID, String objName) throws SMSException,
     /**
      * Returns the suborganization names. Returns a set of SMSEntry objects that
      * are suborganization names. The paramter numOfEntries
-     * identifies the number of entries to return, if code>0 returns
+     * identifies the number of entries to return, if 0 returns
      * all the entries.
      */
     public Set searchSubOrgNames(String tokenID, String dn, String filter,
@@ -636,7 +637,7 @@ public void deRegisterNotificationURL(String id) throws RemoteException {
      * 
      * @param name DN of the object changed
      * @param type change type
-     * @throws java.rmi.RemoteException
+     * @throws java.rmi.RemoteException if a remote communication error occurs
      */
     public void notifyObjectChanged(String name, int type)
             throws RemoteException {
diff --git a/openam-core/src/main/java/com/sun/identity/sm/ldap/CTSDataLayer.java b/openam-core/src/main/java/com/sun/identity/sm/ldap/CTSDataLayer.java
index a72ee42ed2..7a044cc07f 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/ldap/CTSDataLayer.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/ldap/CTSDataLayer.java
@@ -18,6 +18,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.sm.ldap;
 
@@ -71,7 +72,7 @@ public Connection getConnection() {
     /**
      * Release an obtained Connection back to the pool.
      *
-     * @param ldapConnection
+     * @param ldapConnection the connection to release back to the pool
      */
     public void releaseConnection(Connection ldapConnection) {
         ldapConnection.close();
@@ -81,8 +82,8 @@ public void releaseConnection(Connection ldapConnection) {
      * Release an obtained Connection back to the pool, with a
      * specified return code for clean-up.
      *
-     * @param ldapConnection
-     * @param ldapErrorCode
+     * @param ldapConnection the connection to release back to the pool
+     * @param ldapErrorCode the LDAP return code used during clean-up
      */
     public void releaseConnection(Connection ldapConnection, int ldapErrorCode ) {
         releaseConnection(ldapConnection);
@@ -92,7 +93,7 @@ public void releaseConnection(Connection ldapConnection, int ldapErrorCode ) {
      * Release an obtained Connection back to the pool, with a
      * specified Last LDAP Stack Exception for clean-up.
      *
-     * @param ldapConnection
+     * @param ldapConnection the connection to release back to the pool
      * @param lastLDAPException - Last up Stream LDAP Exception, can be null if no issues arose
      *                          with the connection or operations.
      */
diff --git a/openam-core/src/main/java/com/sun/identity/sm/ldap/LDAPEventManager.java b/openam-core/src/main/java/com/sun/identity/sm/ldap/LDAPEventManager.java
index 9d4585f2ba..fc01100f6e 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/ldap/LDAPEventManager.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/ldap/LDAPEventManager.java
@@ -25,6 +25,7 @@
  * $Id: LDAPEventManager.java,v 1.8 2009/01/28 05:35:04 ww203982 Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.sm.ldap;
@@ -46,8 +47,8 @@
 import org.forgerock.opendj.ldap.SearchScope;
 
 /**
- * This class registers itself as a listener to 
- * com.iplanet.services.ldap.event.EventService which sets up
+ * This class registers itself as a listener to 
+ * com.iplanet.services.ldap.event.EventService which sets up
  * persistant search connections with the event service for any
  * changes to SMS object classes
  */
diff --git a/openam-core/src/main/java/com/sun/identity/sm/ldap/SearchResultIterator.java b/openam-core/src/main/java/com/sun/identity/sm/ldap/SearchResultIterator.java
index 0276a6ee53..0008b2e282 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/ldap/SearchResultIterator.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/ldap/SearchResultIterator.java
@@ -25,6 +25,7 @@
  * $Id: SearchResultIterator.java,v 1.2 2009/04/02 20:22:43 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.sm.ldap;
 
@@ -56,7 +57,7 @@ public class SearchResultIterator implements Iterator {
      * Constructs a SearchResultIterator
      *  @param results LDAP Search Results object.
      * @param excludeDNs a set of distinguished names to be excluded
-     * @param conn
+     * @param conn the LDAP connection backing the search results
      */
     public SearchResultIterator(ConnectionEntryReader results, Set excludeDNs, Connection conn) {
         this.results = results;
diff --git a/openam-core/src/main/java/com/sun/identity/sm/ldap/Statistics.java b/openam-core/src/main/java/com/sun/identity/sm/ldap/Statistics.java
index 885afb9ae5..46a92bac37 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/ldap/Statistics.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/ldap/Statistics.java
@@ -24,6 +24,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted [2010-2012] [ForgeRock AS]
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  */
 package com.sun.identity.sm.ldap;
@@ -90,8 +91,8 @@ private Statistics() {
     
     /**
      * Returns the singleton instance
-     * 
-     * @return 
+     *
+     * @return the singleton Statistics instance
      */
     public static synchronized Statistics getInstance() {
         if (instance == null) {
@@ -298,8 +299,8 @@ public long getDeleteRequestAverageTime() {
     
     /**
      * Get the total number of reads record count
-     * 
-     * @return 
+     *
+     * @return the total number of records read
      */
     public int getTotalReadRecordCount() {
         return totalReadRecordCount;
diff --git a/openam-core/src/main/java/com/sun/identity/sm/model/AMSessionRepositoryDeferredOperation.java b/openam-core/src/main/java/com/sun/identity/sm/model/AMSessionRepositoryDeferredOperation.java
index cf4ff83be9..cf5cb8e042 100644
--- a/openam-core/src/main/java/com/sun/identity/sm/model/AMSessionRepositoryDeferredOperation.java
+++ b/openam-core/src/main/java/com/sun/identity/sm/model/AMSessionRepositoryDeferredOperation.java
@@ -24,6 +24,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted [2010-2012] [ForgeRock AS]
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  */
 package com.sun.identity.sm.model;
@@ -56,8 +57,8 @@ public class AMSessionRepositoryDeferredOperation implements Serializable {
      * Constructor using AMRootEntity, so any Object extending our root object can be
      * used as a payload for our event.
      *
-     * @param operation
-     * @param parameters
+     * @param operation the deferred operation type
+     * @param parameters the parameters for the operation
      */
     public AMSessionRepositoryDeferredOperation(Enum operation, Object[] parameters) {
         this.setOperation(operation);
diff --git a/openam-core/src/main/java/org/forgerock/openam/auditors/ConfigAuditor.java b/openam-core/src/main/java/org/forgerock/openam/auditors/ConfigAuditor.java
index d426541a56..952d3e5917 100644
--- a/openam-core/src/main/java/org/forgerock/openam/auditors/ConfigAuditor.java
+++ b/openam-core/src/main/java/org/forgerock/openam/auditors/ConfigAuditor.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.auditors;
 
@@ -100,7 +101,7 @@ protected ConfigAuditor(Debug debug, AuditEventPublisher auditEventPublisher, Au
     /**
      * Publishes an event with details of the successfully completed configuration creation operation,
      * if the 'config' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      * @param newState The state of the entry which is created
@@ -121,7 +122,7 @@ public void auditCreate(Map newState) {
     /**
      * Publishes an event with details of the successfully completed configuration modification operation,
      * if the 'config' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      * @param finalState The derived final state of the entry
@@ -143,7 +144,7 @@ public void auditModify(Map finalState, String[] modifiedAttribu
     /**
      * Publishes an event with details of the successfully completed configuration deletion operation,
      * if the 'config' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      */
diff --git a/openam-core/src/main/java/org/forgerock/openam/auditors/RepoAuditor.java b/openam-core/src/main/java/org/forgerock/openam/auditors/RepoAuditor.java
index 49eaa540d6..ae0c471399 100644
--- a/openam-core/src/main/java/org/forgerock/openam/auditors/RepoAuditor.java
+++ b/openam-core/src/main/java/org/forgerock/openam/auditors/RepoAuditor.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
- * Portions copyright 2019-2025 3A Systems LLC.
+ * Portions copyright 2019-2026 3A Systems LLC.
  */
 package org.forgerock.openam.auditors;
 
@@ -110,7 +110,7 @@ public RepoAuditor(@Named("amIdm") Debug debug, AuditEventPublisher auditEventPu
     /**
      * Publishes an event with details of the successfully completed configuration creation operation,
      * if the 'config' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      * @param newState The state of the entry which is created
@@ -134,7 +134,7 @@ public void auditCreate(Map newState) {
     /**
      * Publishes an event with details of the successfully completed configuration modification operation,
      * if the 'config' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      * @param finalState The derived final state of the entry
@@ -200,7 +200,7 @@ public void auditSetActive(boolean active) {
     /**
      * Publishes an event with details of the successfully completed configuration deletion operation,
      * if the 'config' topic is audited.
-     * 
    
+     * 
    
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      */
diff --git a/openam-core/src/main/java/org/forgerock/openam/authentication/callbacks/PollingWaitCallback.java b/openam-core/src/main/java/org/forgerock/openam/authentication/callbacks/PollingWaitCallback.java
index 639c673162..f809db5054 100644
--- a/openam-core/src/main/java/org/forgerock/openam/authentication/callbacks/PollingWaitCallback.java
+++ b/openam-core/src/main/java/org/forgerock/openam/authentication/callbacks/PollingWaitCallback.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.authentication.callbacks;
 
@@ -55,7 +56,7 @@ public String getWaitTime() {
 
     /**
      * Gets a new PollingWaitCallbackBuilder to use for construction of a PollingWaitCallback.
-     * @returna new PollingWaitCallbackBuilder object.
+     * @return a new PollingWaitCallbackBuilder object.
      */
     public static PollingWaitCallbackBuilder makeCallback() {
         return new PollingWaitCallbackBuilder();
diff --git a/openam-core/src/main/java/org/forgerock/openam/authentication/service/AuthSessionFactory.java b/openam-core/src/main/java/org/forgerock/openam/authentication/service/AuthSessionFactory.java
index 32b70aec10..6fbbdcb1cd 100644
--- a/openam-core/src/main/java/org/forgerock/openam/authentication/service/AuthSessionFactory.java
+++ b/openam-core/src/main/java/org/forgerock/openam/authentication/service/AuthSessionFactory.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- * Portions Copyrighted 2024-2025 3A Systems LLC
+ * Portions Copyrighted 2024-2026 3A Systems LLC
  */
 
 package org.forgerock.openam.authentication.service;
@@ -55,7 +55,8 @@ public AuthSessionFactory(final @Named(SessionConstants.SESSION_DEBUG) Debug ses
      *
      * @param domain      Authentication Domain
      * @return Non null Authentication SSO Token
-     * @throws Exception If there was any unexpected error which prevented the token from being generated.
+     * @throws SSOException If there was any unexpected error which prevented the token from being generated.
+     * @throws SessionException If the authentication session could not be created.
      */
     public SSOToken getAuthenticationSession(String domain) throws SSOException, SessionException {
             if (authSession == null) {
diff --git a/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteCookie.java b/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteCookie.java
index 5d8a7d7fdd..c63b20fee7 100644
--- a/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteCookie.java
+++ b/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteCookie.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 org.forgerock.openam.authentication.service.protocol;
@@ -255,7 +255,7 @@ public void setValue(String newValue) {
      * Set the version of the cookie, updating the underlying representation if
      * present.
      * 
-     * @param version
+     * @param version the cookie version to set
      */
     public void setVersion(int version) {
         if (cookie != null) 
diff --git a/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteSession.java b/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteSession.java
index d4258ebe0a..8c1b1c73f5 100644
--- a/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteSession.java
+++ b/openam-core/src/main/java/org/forgerock/openam/authentication/service/protocol/RemoteSession.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 org.forgerock.openam.authentication.service.protocol;
@@ -200,7 +200,7 @@ public Object getAttribute(String name) {
      * Same functionality as @see getAttribute.
      *
      * @deprecated
-     * @param name
+     * @param name the name of the attribute to retrieve
      * @return The value of the named attribute or null if not found or non-serializable
      */
     public Object getValue(String name) {
diff --git a/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java b/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java
index ce97649603..40a4647f2f 100644
--- a/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java
+++ b/openam-core/src/main/java/org/forgerock/openam/blacklist/BloomFilterBlacklist.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.blacklist;
@@ -73,7 +74,7 @@ public void onBlacklisted(String id, long expiryTime) {
      * given service configuration. If the bloom filter does not contain a given entry, then we know for definite
      * that it is not blacklisted. Otherwise, we delegate to the given entry blacklist to check if it actually is
      * blacklisted or not, to eliminate false positives.
-     * 
    
+     * 
    
      * In order to ensure that the bloom filter is kept in-sync with the definitive blacklist (to avoid false
      * negatives), this implementation will subscribe to blacklist notifications from the delegate.
      *
diff --git a/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java b/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java
index 2323fb54f2..07f6edea8f 100644
--- a/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java
+++ b/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- * Portions Copyrighted 2022-2025 3A Systems, LLC.
+ * Portions Copyrighted 2022-2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.blacklist;
@@ -54,7 +54,7 @@
  * Entry blacklist that stores blacklisted entries in the CTS until they expire. A stable ID is stored in the CTS
  * for each entry that has been blacklisted. Normal CTS reaper process will remove entries from the blacklist
  * after they have expired.
- * 
    
+ * 
    
  * The fields used by this class are:
  * 
      
  *     
    • {@link CoreTokenField#TOKEN_TYPE} - the CTS token type.
      • 
@@ -65,7 +65,7 @@
  *     
    • {@link CoreTokenField#STRING_ONE} - the ID of the server on which the entry was first
  *     blacklisted. From {@link WebtopNamingQuery#getAMServerID()}.
      • 
  * 
    
- * 
    
+ * 
    
  * In addition to blacklisting entries and checking the blacklist, this class also periodically polls the CTS for
  * blacklist changes made on other servers since the last check. This is used to send local notifications to
  * subscribed blacklist {@link Listener}s for all blacklist entries, not just local ones. This feature is
diff --git a/openam-core/src/main/java/org/forgerock/openam/core/DNWrapper.java b/openam-core/src/main/java/org/forgerock/openam/core/DNWrapper.java
index b4c083bec2..78d474c388 100644
--- a/openam-core/src/main/java/org/forgerock/openam/core/DNWrapper.java
+++ b/openam-core/src/main/java/org/forgerock/openam/core/DNWrapper.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.core;
@@ -20,7 +21,7 @@
 
 /**
  * Wrapper class to remove coupling to DNMapper static methods.
- * 
    
+ * 
    
  * Until DNMapper is refactored, this class can be used to assist with DI.
  */
 public class DNWrapper {
diff --git a/openam-core/src/main/java/org/forgerock/openam/core/realms/RealmLookup.java b/openam-core/src/main/java/org/forgerock/openam/core/realms/RealmLookup.java
index b7f53d4b4e..904040fb37 100644
--- a/openam-core/src/main/java/org/forgerock/openam/core/realms/RealmLookup.java
+++ b/openam-core/src/main/java/org/forgerock/openam/core/realms/RealmLookup.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.core.realms;
@@ -24,7 +25,7 @@
  *     Realms realms = ...;
  *     Realm realm = realms.lookup("/realm/A");
  *     boolean active = realms.isActive(realm);
- * 
    
+ * 
    
  *
  * @since 14.0.0
  */
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthAdapter.java b/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthAdapter.java
index dd0bc6de8c..eaa63f9678 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthAdapter.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthAdapter.java
@@ -58,9 +58,9 @@ public class OAuthAdapter implements TokenAdapter {
      * Default constructor with dependencies exposed.
      *
      * @param tokenIdFactory Non null.
-     * @param serialisation
-     * @param oAuthValues
-     * @param blobUtils
+     * @param serialisation the JSON serialisation helper used to marshal token state
+     * @param oAuthValues the helper used to read OAuth specific values
+     * @param blobUtils the token blob utilities used to read and write the token blob
      */
     @Inject
     public OAuthAdapter(TokenIdFactory tokenIdFactory, JSONSerialisation serialisation,
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypes.java b/openam-core/src/main/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypes.java
index 3e8fc87a8d..be1c03ca99 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypes.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypes.java
@@ -1,5 +1,6 @@
 /**
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * 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
@@ -38,7 +39,7 @@ public class CoreTokenFieldTypes {
      * Validate a collection of key/value mappings.
      *
      * @param types A mapping of CoreTokenField to value. Non null, may be empty.
-     * @throws org.forgerock.openam.sm.datalayer.api.LdapOperationFailedException If one of the values was invalid for the CoreTokenField field.
+     * @throws CoreTokenException If one of the values was invalid for the CoreTokenField field.
      */
     public static void validateTypes(Map types) throws CoreTokenException {
         for (Map.Entry entry : types.entrySet()) {
@@ -51,7 +52,7 @@ public static void validateTypes(Map types) throws CoreT
      *
      * @param field The CoreTokenField to validate against.
      * @param value The value to verify. Non null.
-     * @throws org.forgerock.openam.sm.datalayer.api.LdapOperationFailedException
+     * @throws CoreTokenException If the value was invalid for the CoreTokenField field.
      */
     public static void validateType(CoreTokenField field, Object value) throws CoreTokenException {
         if (value == null) {
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/impl/SAML2CTSPersistentStore.java b/openam-core/src/main/java/org/forgerock/openam/cts/impl/SAML2CTSPersistentStore.java
index 9a494de08f..844cd468c3 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/impl/SAML2CTSPersistentStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/impl/SAML2CTSPersistentStore.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.cts.impl;
 
@@ -38,7 +39,7 @@
 /**
  * This class is used in SAML2 failover mode to store/recover serialized
  * state of Assertion/Response object.
- * 
    
+ * 
    
  * This class acts as a Proxy to perform distinct SAML2
  * operations and allow the CTSPersistentStore implementation
  * to handle the actual CRUD for Tokens.
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandler.java b/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandler.java
index 85b1c26ff0..b8296fe371 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandler.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.cts.impl.queue;
 
@@ -40,7 +41,7 @@
  * once.
  *
  *
- * @param
+ * @param  the type of result handled
  */
 public class AsyncResultHandler implements ResultHandler {
     private static final String NULL_SIGNAL = "--NULL--";
@@ -76,7 +77,7 @@ public AsyncResultHandler(QueueConfiguration config, Debug debug) {
      * Blocking call to wait for the results of processing.
      *
      * @return {@inheritDoc}
-     * @throws CoreTokenException {@inheritDoc}
+     * @throws CoreTokenException if an error occurs while waiting for or retrieving the results
      */
     @SuppressWarnings("unchecked")
     public T getResults() throws CoreTokenException {
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandler.java b/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandler.java
index f5a43b0b0c..95b6bad952 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandler.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandler.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.cts.impl.queue;
 
@@ -32,7 +32,7 @@
  * performs an asynchronous delete operation. This can come in handy if there is a need to find tokens based on
  * secondary storage keys or other arbitrary information and the matching tokens needs to be deleted right away.
  *
- * @see TaskDispatcher#read(String, org.forgerock.openam.sm.datalayer.api.ResultHandler)
+ * @see TaskDispatcher#read(String, org.forgerock.util.Options, org.forgerock.openam.sm.datalayer.api.ResultHandler)
  * @see TaskDispatcher#query(TokenFilter, org.forgerock.openam.sm.datalayer.api.ResultHandler)
  */
 public class DeleteOnQueryResultHandler implements ResultHandler, CoreTokenException> {
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSConnectionMonitoringStore.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSConnectionMonitoringStore.java
index 43aad469fc..89d9976b3a 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSConnectionMonitoringStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSConnectionMonitoringStore.java
@@ -12,13 +12,14 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.cts.monitoring;
 
 /**
  * A data structure for storing monitoring information about CTS connections.
- * 
    
+ * 
    
  * The CTS will use an instance of this data structure to store information about connection attempts
  * and the CTS monitoring framework will us the same instance to pull information out to send to clients
  * as monitoring requests are made.
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSOperationsMonitoringStore.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSOperationsMonitoringStore.java
index 21e41e2dd4..319dd0ad41 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSOperationsMonitoringStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/CTSOperationsMonitoringStore.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.cts.monitoring;
@@ -22,7 +23,7 @@
 
 /**
  * A data structure for storing monitoring information about CTS operations.
- * 
    
+ * 
    
  * The CTS will use an instance of this data structure to store information about operations as and when they occur
  * and then the CTS monitoring framework will us the same instance to pull information out to send to clients
  * as monitoring requests are made.
@@ -33,10 +34,10 @@ public interface CTSOperationsMonitoringStore {
 
     /**
      * Adds a Token operation into the monitoring store.
-     * 
    
+     * 
    
      * The operation is mapped to the type of the token. The operations per configurable period and cumulative count
      * will be updated for the token type and operation.
-     * 
    
+     * 
    
      * Passing in null as the token will mean that the operation is not mapped to a particular token
      * type, this is for operations such as delete and list as the type of token cannot be determined.
      * The operations per configurable period and cumulative count will be updated for the operation.
@@ -49,10 +50,10 @@ public interface CTSOperationsMonitoringStore {
 
     /**
      * Gets the average rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on the specified type token in a given
      * (configurable) period.
-     * 
    
+     * 
    
      * Passing in null as the operation will mean that the method will return the number of the specified
      * operation made on tokens, which the type cannot be determined, i.e. Delete and List operations.
      *
@@ -64,10 +65,10 @@ public interface CTSOperationsMonitoringStore {
 
     /**
      * Gets the minimum rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on the specified type token in a given
      * (configurable) period.
-     * 
    
+     * 
    
      * Passing in null as the operation will mean that the method will return the number of the specified
      * operation made on tokens, which the type cannot be determined, i.e. Delete and List operations.
      *
@@ -79,10 +80,10 @@ public interface CTSOperationsMonitoringStore {
 
     /**
      * Gets the maximum rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on the specified type token in a given
      * (configurable) period.
-     * 
    
+     * 
    
      * Passing in null as the operation will mean that the method will return the number of the specified
      * operation made on tokens, which the type cannot be determined, i.e. Delete and List operations.
      *
@@ -94,10 +95,10 @@ public interface CTSOperationsMonitoringStore {
 
     /**
      * Gets the cumulative count of operations made since server start up.
-     * 
    
+     * 
    
      * Will return the total number of the specified operation made on the specified type of token since the server
      * stared.
-     * 
    
+     * 
    
      * Passing in null as the operation will mean that the method will return the total number of
      * the specified operation made on tokens, which the type cannot be determined, i.e. Delete and List operations.
      *
@@ -109,7 +110,7 @@ public interface CTSOperationsMonitoringStore {
 
     /**
      * Gets the cumulative count of failures of this operation type since server startup.
-     * 
    
+     * 
    
      * Note that failure counts are not distinguished by token type as in most failure cases this information is not
      * available.
      *
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationMonitor.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationMonitor.java
index c2cf246e3b..b879d6f44a 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationMonitor.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationMonitor.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.cts.monitoring.impl.operations;
@@ -66,7 +67,7 @@ private OperationMonitor(final RateTimer timer) {
     /**
      * Increments the cumulative count for an operation and recalculates the rate at which the operation
      * has been made.
-     * 
    
+     * 
    
      * Only synchronizes the count increment, NOT the whole method.
      */
     void increment() {
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStore.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStore.java
index 96976f1016..2ac201c0e8 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/OperationStore.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.cts.monitoring.impl.operations;
@@ -24,7 +25,7 @@
 
 /**
  * A data structure that stores the cumulative count and rate for CTS operations.
- * 
    
+ * 
    
  * Thread-safe: All access to internal data structures are internally synchronised.
  *
  * @since 12.0.0
@@ -55,7 +56,7 @@ public OperationStore() {
 
     /**
      * Adds a Token operation into the monitoring store.
-     * 
    
+     * 
    
      * The operations per configurable period and cumulative count will be updated for the operation.
      *
      * @param operation The operation performed.
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStore.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStore.java
index fe73f074b5..0e1210a54f 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/operations/TokenOperationsStore.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.cts.monitoring.impl.operations;
@@ -27,7 +27,7 @@
 /**
  * An internal data structure for the CTSOperationsMonitoringStore to store monitoring information about operations of
  * tokens.
- * 
    
+ * 
    
  * The token operation monitoring information is split per token type and both a cumulative count and rate is calculated
  * and maintained.
  *
@@ -69,7 +69,7 @@ public TokenOperationsStore() {
 
     /**
      * Adds a Token operation into the monitoring store.
-     * 
    
+     * 
    
      * The operation is mapped to the type of the token. The operations per configurable period and cumulative count
      * will be updated for the token type and operation.
      *
@@ -93,7 +93,7 @@ public void addTokenOperation(TokenType type, CTSOperation operation, boolean su
 
     /**
      * Adds a Token operation into the monitoring store.
-     * 
    
+     * 
    
      * The operation is not mapped to a particular token type, this is for operations such as delete and list as
      * the type of token cannot be determined.
      * The operations per configurable period and cumulative count will be updated for the operation.
@@ -113,7 +113,7 @@ public void addTokenOperation(CTSOperation operation, boolean success) {
 
     /**
      * Gets the average rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on the specified type token in a given
      * (configurable) period.
      *
@@ -130,7 +130,7 @@ public double getAverageOperationsPerPeriod(TokenType type, CTSOperation operati
 
     /**
      * Gets the minimum rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on the specified type token in a given
      * (configurable) period.
      *
@@ -147,7 +147,7 @@ public long getMinimumOperationsPerPeriod(TokenType type, CTSOperation operation
 
     /**
      * Gets the maximum rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on the specified type token in a given
      * (configurable) period.
      *
@@ -164,7 +164,7 @@ public long getMaximumOperationsPerPeriod(TokenType type, CTSOperation operation
 
     /**
      * Gets the average rate of operations made in a given period.
-     * 
    
+     * 
    
      * Returns the overall rate of calls to the given operation for all token types.
      *
      * @param operation The operation to now the average rate for.
@@ -186,7 +186,7 @@ public double getAverageOperationFailuresPerPeriod(CTSOperation operation) {
 
     /**
      * Gets the minimum rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on tokens, which the type cannot be determined,
      * i.e. Delete and List operations.
      *
@@ -209,7 +209,7 @@ public long getMinimumOperationFailuresPerPeriod(CTSOperation operation) {
 
     /**
      * Gets the maximum rate of operations made in a given period.
-     * 
    
+     * 
    
      * Will return the number of the specified operation made on tokens, which the type cannot be determined,
      * i.e. Delete and List operations.
      *
@@ -232,7 +232,7 @@ public long getMaximumOperationFailuresPerPeriod(CTSOperation operation) {
 
     /**
      * Gets the cumulative count of operations made since server start up.
-     * 
    
+     * 
    
      * Will return the total number of the specified operation made on the specified type of token since the server
      * stared.
      *
@@ -249,7 +249,7 @@ public long getOperationsCumulativeCount(TokenType type, CTSOperation operation)
 
     /**
      * Gets the cumulative count of operations made since server start up.
-     * 
    
+     * 
    
      * Will return the total number of the specified operation made on tokens, which the type cannot be determined,
      * i.e. Delete and List operations.
      *
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsDelegate.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsDelegate.java
index 93084e38cd..0578a66963 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsDelegate.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsDelegate.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.cts.monitoring.impl.persistence;
 
@@ -47,7 +47,7 @@ public CtsPersistenceOperationsDelegate(CTSPersistentStore store) {
      *
      * @param tokenType The type of token for which we are gathering results
      * @return Zero or positive integer of the number of tokens in the store.
-     * @throws CoreTokenException
+     * @throws CoreTokenException if there are issues talking with the CTS
      */
     public int countTokenEntries(TokenType tokenType) throws CoreTokenException {
 
@@ -76,7 +76,7 @@ public int countAllTokens() throws CoreTokenException {
      *
      * @param tokenType The type of token for which we are gathering results
      * @return A collection of longs, each of which represents the duration of a token inside the CTS
-     * @throws CoreTokenException
+     * @throws CoreTokenException if there are issues talking with the CTS
      */
     public Collection listDurationOfTokens(TokenType tokenType) throws CoreTokenException {
 
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandler.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandler.java
index daabc210dd..183a34f8ec 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandler.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.cts.monitoring.impl.queue;
 
@@ -43,7 +44,7 @@ public DefaultMonitoringResultHandler(ResultHandler handler, CTSOperations
     /**
      * Defers to wrapped handler.
      * @return {@inheritDoc}
-     * @throws E {@inheritDoc}
+     * @throws E if the wrapped result handler throws it
      */
     @Override
     public T getResults() throws E {
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandler.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandler.java
index e0f35a499d..9eb82db91c 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandler.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.cts.monitoring.impl.queue;
 
@@ -43,7 +44,7 @@ public TokenMonitoringResultHandler(ResultHandler han
 
     /**
      * @return Delegates to wrapped handler.
-     * @throws CoreTokenException {@inheritDoc}
+     * @throws CoreTokenException if the wrapped handler fails to return the results
      */
     @Override
     public Token getResults() throws CoreTokenException {
diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/reaper/ReaperMonitor.java b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/reaper/ReaperMonitor.java
index a634fb830b..a9500fd3ee 100644
--- a/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/reaper/ReaperMonitor.java
+++ b/openam-core/src/main/java/org/forgerock/openam/cts/monitoring/impl/reaper/ReaperMonitor.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.cts.monitoring.impl.reaper;
@@ -29,14 +30,14 @@ public class ReaperMonitor {
     private final List reaperRuns = new ArrayList();
 
     /**
-     * {@inheritDoc}
+     * Records the timing and deletion count of a completed reaper run.
      */
     public void add(final long startTime, final long runTime, final long numberOfDeletedSessions) {
         reaperRuns.add(new ReaperRun(startTime, runTime, numberOfDeletedSessions));
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the average rate of session deletion across the recorded reaper runs.
      */
     public double getRateOfDeletion() {
 
diff --git a/openam-core/src/main/java/org/forgerock/openam/entitlement/SetupInternalNotificationSubscriptions.java b/openam-core/src/main/java/org/forgerock/openam/entitlement/SetupInternalNotificationSubscriptions.java
index 49f7a94015..ddced06532 100644
--- a/openam-core/src/main/java/org/forgerock/openam/entitlement/SetupInternalNotificationSubscriptions.java
+++ b/openam-core/src/main/java/org/forgerock/openam/entitlement/SetupInternalNotificationSubscriptions.java
@@ -12,7 +12,7 @@
  *  information: "Portions copyright [year] [name of copyright owner]".
  *
  *  Copyright 2016 ForgeRock AS.
- *  Portions Copyrighted 2018 3A Systems,LLC
+ *  Portions Copyrighted 2018-2026 3A Systems,LLC
  */
 
 package org.forgerock.openam.entitlement;
@@ -31,7 +31,7 @@
 
 /**
  * Responsible for subscribing to internal policy set notifications.
- * 
    
+ * 
    
  * Internal notification is generated by an OpenAM instance in the cluster when there are any changes to
  * the policySets. The notification is then published to the topic '/internal/policySet'.
  * With the help of this setup listener other OpenAM instances in the cluster receive such notifications and
diff --git a/openam-core/src/main/java/org/forgerock/openam/entitlement/monitoring/EvaluationMonitoringStore.java b/openam-core/src/main/java/org/forgerock/openam/entitlement/monitoring/EvaluationMonitoringStore.java
index 3d70200970..abd695e0fa 100644
--- a/openam-core/src/main/java/org/forgerock/openam/entitlement/monitoring/EvaluationMonitoringStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/entitlement/monitoring/EvaluationMonitoringStore.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2014 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.entitlement.monitoring;
@@ -60,7 +60,7 @@ public EvaluationMonitoringStore(final RateTimer timer) {
     /**
      * Increments the cumulative count of evaluations and recalculates the rate.
      *
-     * 
    
+     * 
    
      * Only synchronizes the count increment, NOT the whole method.
      */
     public void increment() {
diff --git a/openam-core/src/main/java/org/forgerock/openam/entitlement/utils/EntitlementUtils.java b/openam-core/src/main/java/org/forgerock/openam/entitlement/utils/EntitlementUtils.java
index 67908f4ae2..520b9e4c7c 100644
--- a/openam-core/src/main/java/org/forgerock/openam/entitlement/utils/EntitlementUtils.java
+++ b/openam-core/src/main/java/org/forgerock/openam/entitlement/utils/EntitlementUtils.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.entitlement.utils;
 
@@ -215,7 +216,7 @@ public static Application newApplication(String name, ApplicationType applicatio
     }
 
     /**
-     * Converts the map of actions into a set format where the map's key->value combinations are separated by an equals
+     * Converts the map of actions into a set format where the map's key->value combinations are separated by an equals
      * character.
      *
      * @param actions The map of actions that needs to be converted.
diff --git a/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java b/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java
index 3d62075e8f..ef8ea3e478 100644
--- a/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java
+++ b/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java
@@ -27,7 +27,7 @@
  * Portions Copyrighted 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2014-2016 Nomura Research Institute, Ltd
  * Portions Copyrighted 2019 Open Source Solution Technology Corporation
- * Portions Copyrighted 2024-2025 3A Systems LLC
+ * Portions Copyrighted 2024-2026 3A Systems LLC
  */
 
 package org.forgerock.openam.ldap;
@@ -392,9 +392,9 @@ public void shutdown() {
     /**
      * Authenticates to the LDAP server using user input.
      *
-     * @param user
-     * @param password
-     * @exception LDAPUtilException
+     * @param user the user name to authenticate
+     * @param password the password to authenticate with
+     * @exception LDAPUtilException if the authentication fails
      */
     public void authenticateUser(String user, String password)
             throws LDAPUtilException {
@@ -522,7 +522,7 @@ private Connection getAdminConnection() throws LdapException, LDAPUtilException
      * @param oldPwd Current password entered.
      * @param password New password entered.
      * @param confirmPassword Confirm password.
-     * @throws LDAPUtilException
+     * @throws LDAPUtilException if the password cannot be changed
      */
     public void changePassword(
             String oldPwd,
@@ -662,7 +662,7 @@ private ByteString updateADPassword(String password) {
      * Searches and returns user for a specified attribute using parameters
      * specified in constructor and/or by setting properties.
      *
-     * @throws LDAPUtilException
+     * @throws LDAPUtilException if the search for the user fails
      */
     public void searchForUser()
             throws LDAPUtilException {
@@ -1609,7 +1609,7 @@ public Map> getUserAttributeValues() {
      * Sets the value of the dynamic profile creation configured in
      * Authentication service.
      *
-     * @param isEnable
+     * @param isEnable whether dynamic profile creation is enabled
      */
     public void setDynamicProfileCreationEnabled(boolean isEnable) {
         isDynamicUserEnabled = isEnable;
diff --git a/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsEntryImpl.java b/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsEntryImpl.java
index 8c5b04deeb..90bd2458cb 100644
--- a/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsEntryImpl.java
+++ b/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsEntryImpl.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.monitoring.cts;
@@ -25,7 +26,7 @@
 
 /**
  * Implementation of the monitoring endpoints for CTS CRUDL operations (query and delete).
- * 
    
+ * 
    
  * This endpoint should only be used for query(list) and delete operations on the CTS. This is because the token
  * type cannot be determined for these operations. For all other operations use the
  * {@link CtsCRUDOperationsPerTokenTypeEntryImpl}.
diff --git a/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsPerTokenTypeEntryImpl.java b/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsPerTokenTypeEntryImpl.java
index 42a16c8977..1037bfda26 100644
--- a/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsPerTokenTypeEntryImpl.java
+++ b/openam-core/src/main/java/org/forgerock/openam/monitoring/cts/CtsCRUDOperationsPerTokenTypeEntryImpl.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.monitoring.cts;
@@ -28,7 +29,7 @@
 /**
  * Implementation of the monitoring endpoints for CTS CRUDL operations (except query and delete)
  * for specific token type.
- * 
    
+ * 
    
  * This endpoint should not be used for query(list) and delete operations on the CTS. This is because the token
  * type cannot be determined for these operations. For query and delete operations use the
  * {@link CtsCRUDOperationsEntryImpl}.
diff --git a/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java b/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java
index e39209c0b0..de43800518 100644
--- a/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java
+++ b/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -121,7 +122,7 @@ public List getPropertyNames() {
      * @see com.sun.identity.policy.Syntax
      *
      * @param property property name
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         return Syntax.NONE;
@@ -137,7 +138,7 @@ public Syntax getPropertySyntax(String property) {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name
-     * @throws PolicyException
+     * @throws PolicyException if the display name cannot be determined
      */
     public String getDisplayName(String property, Locale locale)
             throws PolicyException {
diff --git a/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java b/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java
index 100aa89dc3..41ec81dee4 100644
--- a/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java
+++ b/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java
@@ -2,6 +2,7 @@
  * DO NOT REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2013-2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -100,7 +101,7 @@ public List getPropertyNames() {
      * @see com.sun.identity.policy.Syntax
      *
      * @param property property name
-     * @return Syntax for the property name
+     * @return Syntax for the property name
      */
     public Syntax getPropertySyntax(String property) {
         return Syntax.NONE;
@@ -116,7 +117,7 @@ public Syntax getPropertySyntax(String property) {
      * @param property property name
      * @param locale locale for which the property name must be customized
      * @return display name for the property name
-     * @throws com.sun.identity.policy.PolicyException
+     * @throws com.sun.identity.policy.PolicyException if the display name cannot be retrieved
      */
     public String getDisplayName(String property, Locale locale)
             throws PolicyException {
diff --git a/openam-core/src/main/java/org/forgerock/openam/oauth2/OAuth2Constants.java b/openam-core/src/main/java/org/forgerock/openam/oauth2/OAuth2Constants.java
index eb285aaac9..4de673437a 100644
--- a/openam-core/src/main/java/org/forgerock/openam/oauth2/OAuth2Constants.java
+++ b/openam-core/src/main/java/org/forgerock/openam/oauth2/OAuth2Constants.java
@@ -258,7 +258,7 @@ public static class UserinfoEndpoint {
     /**
      * 11.3.2. Initial Registry Contents
      *
-     * @see 11.3. The OAuth Authorization Endpoint Response Type
+     * @see 11.3. The OAuth Authorization Endpoint Response Type
      *      Registry
      */
     public static class AuthorizationEndpoint {
@@ -342,7 +342,7 @@ public static class IntrospectionEndpoint {
     public static class Bearer {
         /**
          * 5.2.1. The "Bearer" Authentication Scheme
-         * 
    
+         * 
    
          * Authentication Scheme Name:
          */
         public static final String BEARER = "Bearer";
@@ -385,7 +385,6 @@ public static class MAC {
 
         /**
          * Mac
-         * 
    
          *
          * 
              *  Authorization: MAC id="h480djs93hd8",
@@ -732,10 +731,10 @@ public static class Custom {
          * This optional parameter indicates whether the user should be prompted
          * for re-authentication and consent to grant account access to your
          * application each time he tries to complete a particular action.
-         * 
    
+         * 
    
          * The default value is auto, which indicates that a user would only need
          * to grant access the first time he tried to access a protected resource.
-         * 
    
+         * 
    
          * The parameter value may contain a combination of the following values
          * separated by spaces:
          * 
      
diff --git a/openam-core/src/main/java/org/forgerock/openam/services/cdm/BasicClientTypesManager.java b/openam-core/src/main/java/org/forgerock/openam/services/cdm/BasicClientTypesManager.java
index c81c598b4c..88c99dd6f7 100644
--- a/openam-core/src/main/java/org/forgerock/openam/services/cdm/BasicClientTypesManager.java
+++ b/openam-core/src/main/java/org/forgerock/openam/services/cdm/BasicClientTypesManager.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2010 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -255,7 +256,7 @@ public void setDirty(String clientType, Map data) {
      * _attributes is a comma delimited list of attributes for the client type
      *
      * @param props The properties file to parse
-     * @throws InvalidPropertiesFormatException
+     * @throws InvalidPropertiesFormatException if the properties are missing the required client list or are malformed
      */
     protected void processProps(Properties props)
     throws InvalidPropertiesFormatException {
@@ -278,7 +279,7 @@ protected void processProps(Properties props)
      *
      * @param clientName The name of the client to populate
      * @param props The incoming properties file
-     * @throws InvalidPropertiesFormatException
+     * @throws InvalidPropertiesFormatException if the client properties are malformed
      */
     protected void populateClient(String clientName, Properties props)
     throws InvalidPropertiesFormatException {
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/SessionCuller.java b/openam-core/src/main/java/org/forgerock/openam/session/SessionCuller.java
index 867a8a721d..e5235f9b38 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/SessionCuller.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/SessionCuller.java
@@ -12,12 +12,12 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- * Portions copyright 2023 3A Systems LLC
+ * Portions copyright 2023-2026 3A Systems LLC
  */
 
 package org.forgerock.openam.session;
 
-import static java.security.AccessController.*;
+import java.security.AccessController;
 
 import java.util.Date;
 
@@ -132,7 +132,7 @@ void setIsPolling(boolean b) {
 
     /**
      * Checks if Polling is enabled
-     * @return  true if polling is enabled , false otherwise
+     * @return  true if polling is enabled , false otherwise
      */
     private boolean getIsPolling() {
         return isPolling;
@@ -170,7 +170,7 @@ public void run() {
                     if (sender == null) {
                         sender = new SessionPollerSender(session, this);
                     }
-                    RestrictedTokenContext.doUsing(getContext(),
+                    RestrictedTokenContext.doUsing(AccessController.getContext(),
                             new RestrictedTokenAction() {
                                 public Object run() throws Exception {
                                     try {
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/SessionPollerPool.java b/openam-core/src/main/java/org/forgerock/openam/session/SessionPollerPool.java
index 2d168d0c7c..60ca0577b1 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/SessionPollerPool.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/SessionPollerPool.java
@@ -23,7 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2015-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
 */
 package org.forgerock.openam.session;
 
@@ -90,7 +90,7 @@ private SessionPollerPool() {
     /**
      * Checks if Polling is enabled and initializes the threadpool if it's not already configured.
      *
-     * @return  true if polling is enabled , false otherwise.
+     * @return true if polling is enabled, false otherwise.
      */
     public boolean isPollingEnabled(){
         // This is only a transitional solution before the complete
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/SessionServiceURLService.java b/openam-core/src/main/java/org/forgerock/openam/session/SessionServiceURLService.java
index 7ab43a15ee..3b119e3dbe 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/SessionServiceURLService.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/SessionServiceURLService.java
@@ -23,7 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.session;
@@ -76,7 +76,7 @@ private SessionServiceURLService() {}
      * @param port Session Server port.
      * @param uri Session Server URI.
      * @return URL Session Service URL.
-     * @exception com.iplanet.dpro.session.SessionException
+     * @exception com.iplanet.dpro.session.SessionException if the session service URL cannot be resolved
      */
     public URL getSessionServiceURL(String protocol, String server, String port, String uri)
             throws SessionException {
@@ -100,7 +100,7 @@ public URL getSessionServiceURL(String protocol, String server, String port, Str
      *
      * @param serverID server ID from the platform server list.
      * @return Session Service URL.
-     * @exception SessionException
+     * @exception SessionException if the session service URL cannot be resolved
      */
     public URL getSessionServiceURL(String serverID) throws SessionException {
         try {
@@ -123,7 +123,7 @@ public URL getSessionServiceURL(String serverID) throws SessionException {
      *
      * @param sid Session ID
      * @return Session Service URL.
-     * @exception SessionException
+     * @exception SessionException if the session service URL cannot be resolved
      */
     public URL getSessionServiceURL(SessionID sid) throws SessionException {
         String primaryId;
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/SessionURL.java b/openam-core/src/main/java/org/forgerock/openam/session/SessionURL.java
index cf07893727..e096289042 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/SessionURL.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/SessionURL.java
@@ -23,7 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.session;
@@ -75,7 +75,6 @@ private SessionURL(SessionCookies cookies) {
      * be rewritten in the URL as a query string with entity escaping of
      * ampersand before appending session ID if other query parameters exists in
      * the URL.
-     * 
      
      *
      * @param res HTTP Servlet Response.
      * @param url the URL to be encoded.
@@ -91,7 +90,6 @@ public String encodeURL(HttpServletResponse res, String url, Session session) {
      * be rewritten in the URL as a query string with entity escaping of
      * ampersand before appending session id if other query parameters exists in
      * the URL.
-     * 
      
      *
      * @param res HTTP Servlet Response.
      * @param url  the URL to be encoded.
@@ -232,7 +230,7 @@ public String encodeSessionURL(String url, short encodingScheme, boolean escape,
      * If the encoding scheme is SLASH then the  cookie value would be
      * written in the URL as extra path info in the following format:
      * 
      -     * protocol://server:port/servletpath/<cookieName>=<cookieValue>?
+     * protocol://server:port/servletpath/<cookieName>=<cookieValue>?
      *       queryString
      * 
      
      * 
      
@@ -245,7 +243,7 @@ public String encodeSessionURL(String url, short encodingScheme, boolean escape,
      * If the encoding scheme is SEMICOLON then the cookie value would be
      * written in the URL as extra path info in the following format:
      * 
      -     * protocol://server:port/path;<cookieName=cookieValue>?queryString
+     * protocol://server:port/path;<cookieName=cookieValue>?queryString
      * 
      
      * Note that this is not supported in the servlet specification and
      * some web containers do not support this.
@@ -254,8 +252,8 @@ public String encodeSessionURL(String url, short encodingScheme, boolean escape,
      * If the encoding scheme is QUERY then the cookie value would be
      * written in the URL in the following format:
      * 
      -     * protocol://server:port/path?<cookieName>=<cookieValue>
-     * protocol://server:port/path?queryString&<cookieName>=<cookieValue>
+     * protocol://server:port/path?<cookieName>=<cookieValue>
+     * protocol://server:port/path?queryString&<cookieName>=<cookieValue>
      * 
      
      * 
      
      * This is the default and OpenAM always encodes in this format
@@ -264,12 +262,11 @@ public String encodeSessionURL(String url, short encodingScheme, boolean escape,
      * if the escape is true.  Only the ampersand before appending
      * cookie parameter
      * will be entity escaped.
-     * 
      
      * @param url the url to be encoded
      * @param encodingScheme possible values are QUERY,SLASH,SEMICOLON
      * @param escape entity escaping of ampersand when appending the
      *        SSOToken ID to request query string.
-     * @param cookieName
+     * @param cookieName the name of the session cookie to encode into the URL
      * @return encoded URL with cookie value (session id) based
      *         on the encoding scheme or the url itself if there is an error.
      */
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/authorisation/SessionChangeAuthorizer.java b/openam-core/src/main/java/org/forgerock/openam/session/authorisation/SessionChangeAuthorizer.java
index c6ebae1932..5fd8e53771 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/authorisation/SessionChangeAuthorizer.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/authorisation/SessionChangeAuthorizer.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 org.forgerock.openam.session.authorisation;
 
@@ -84,8 +84,8 @@ public Set getSessionSubjectOrganisations(SessionID sessionID)
      * Returns true if the subject has top level admin role
      *
      * @param actorsSessionID SessionID of the current acting subject.
-     * @throws SessionException
-     * @throws SSOException
+     * @throws SessionException if there is a problem accessing the session
+     * @throws SSOException if the single sign on token is invalid or expired
      */
     public boolean hasTopLevelAdminRole(final SessionID actorsSessionID) throws SessionException, SSOException {
         SSOToken ssoSession = ssoTokenManager.createSSOToken(actorsSessionID.toString());
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/model/AMRootEntity.java b/openam-core/src/main/java/org/forgerock/openam/session/model/AMRootEntity.java
index 130137618b..7a0efe898b 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/model/AMRootEntity.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/model/AMRootEntity.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2012 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -154,7 +155,7 @@ public void setSerializedInternalSessionBlob(byte[] serializedInternalSessionBlo
 
     /**
      * Base64 Encoded Data.
-     * @return
+     * @return the Base64 encoded data
      */
     public String getData() {
         return data;
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/model/DBStatistics.java b/openam-core/src/main/java/org/forgerock/openam/session/model/DBStatistics.java
index fe190e1ac4..bf6c94863f 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/model/DBStatistics.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/model/DBStatistics.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -78,8 +79,8 @@ public synchronized void setNumRecords(int numRecords) {
     
     /**
      * Returns the current uptime (in ms.) of the amsessiondb server
-     * 
-     * @return 
+     *
+     * @return the current uptime of the amsessiondb server, in milliseconds
      */
     public long getUptime() {
         return currentTimeMillis() - startTime;
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/ServicesClusterMonitorHandler.java b/openam-core/src/main/java/org/forgerock/openam/session/service/ServicesClusterMonitorHandler.java
index 5f39db1d77..792eb5a53a 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/service/ServicesClusterMonitorHandler.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/service/ServicesClusterMonitorHandler.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 org.forgerock.openam.session.service;
 
@@ -74,7 +74,7 @@ private ServicesClusterMonitorHandler(final @Named(SessionConstants.SESSION_DEBU
      * @param sid session id
      * @return server id for the server instance determined to be the current
      *         host
-     * @throws SessionException
+     * @throws SessionException if the current host server cannot be determined
      */
     public String getCurrentHostServer(SessionID sid) throws SessionException {
        return getClusterMonitor().getCurrentHostServer(sid);
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/SessionAccessManager.java b/openam-core/src/main/java/org/forgerock/openam/session/service/SessionAccessManager.java
index 2170f8e4e8..5e7ca03555 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/service/SessionAccessManager.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/service/SessionAccessManager.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- * Portions Copyrighted 2024-2025 3A Systems LLC
+ * Portions Copyrighted 2024-2026 3A Systems LLC
  */
 package org.forgerock.openam.session.service;
 
@@ -82,7 +82,6 @@ public void removeSessionId(SessionID sessionID) {
      * @param sessionId The session ID to recover the InternalSession for.
      * @return The InternalSession from the InternalSessionCache or null if the internal session could not be retrieved
      * or recovered.
-     * @throws SessionException If anything goes wrong.
      */
     public InternalSession getInternalSession(SessionID sessionId) {
         if (sessionId == null || StringUtils.isEmpty(sessionId.toString()) || sessionId.isSessionHandle()) {
@@ -166,7 +165,6 @@ public int getInternalSessionCount() {
     /**
      * Remove an internal session from the internal session cache.
      * @param internalSession the session to remove
-     * @return the removed internal session
      */
     public void removeInternalSession(InternalSession internalSession) {
         if (null == internalSession) {
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/access/SessionQueryManager.java b/openam-core/src/main/java/org/forgerock/openam/session/service/access/SessionQueryManager.java
index f3e6e55d64..1f121c90da 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/service/access/SessionQueryManager.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/service/access/SessionQueryManager.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 org.forgerock.openam.session.service.access;
@@ -89,7 +89,7 @@ public Collection getMatchingValidSessions(CrestQuery crestQuery
 
     /**
      * Returns the expiration information of all sessions belonging to a user
-     * (uuid). The returned value will be a Map (sid->expiration_time).
+     * (uuid). The returned value will be a Map (sid->expiration_time).
      *
      * @param uuid
      *            User's universal unique ID.
@@ -106,8 +106,8 @@ public Map getAllSessionsByUUID(String uuid) throws SessionExcepti
      * Gets all valid Internal Sessions, depending on the value of the user's
      * preferences.
      *
-     * @param actingSession
-     * @throws SessionException
+     * @param actingSession the session on whose behalf valid sessions are retrieved
+     * @throws SessionException if the valid sessions cannot be retrieved
      */
     public SearchResults getValidSessions(Session actingSession, String pattern) throws SessionException {
         if (actingSession.getState(false) != VALID) {
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStore.java b/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStore.java
index ed83a34271..8530c01bd2 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStore.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.session.service.access.persistence;
@@ -69,7 +70,6 @@ public interface InternalSessionStore {
      *
      * @param session Non null SessionID.
      * @exception SessionPersistenceException If the storage operation failed.
-     * @return The InternalSession that was removed from the cache.
      */
     void remove(InternalSession session) throws SessionPersistenceException;
 
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreStep.java b/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreStep.java
index b4ce7c93e8..d14c5bd48c 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreStep.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreStep.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.session.service.access.persistence;
@@ -70,7 +71,6 @@ public interface InternalSessionStoreStep {
      *
      * @param session Non null SessionID.
      * @exception SessionPersistenceException If the storage operation failed.
-     * @return The InternalSession that was removed from the cache.
      */
     void remove(InternalSession session, InternalSessionStore next) throws SessionPersistenceException;
 
diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/SessionPersistenceStore.java b/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/SessionPersistenceStore.java
index 77d3ec1709..7d8e6ea1ce 100644
--- a/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/SessionPersistenceStore.java
+++ b/openam-core/src/main/java/org/forgerock/openam/session/service/access/persistence/SessionPersistenceStore.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2016 ForgeRock AS.
  * Portions Copyrighted 2022 Open Identity Platform Community
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.session.service.access.persistence;
@@ -300,7 +300,7 @@ public InternalSession getByRestrictedID(SessionID sessionID) {
 
     /**
      * Returns the expiration information of all sessions belonging to a user
-     * (uuid). The returned value will be a Map (sid->expiration_time).
+     * (uuid). The returned value will be a {@code Map (sid->expiration_time)}.
      *
      * @param uuid
      *            User's universal unique ID.
diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/config/ConfigTransformer.java b/openam-core/src/main/java/org/forgerock/openam/sm/config/ConfigTransformer.java
index dba9ba3851..f7fc024734 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sm/config/ConfigTransformer.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sm/config/ConfigTransformer.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sm.config;
@@ -20,7 +21,7 @@
 
 /**
  * Provides a custom transformation to the attribute values.
- * 
      
+ * 
      
  * The transformed type should be the same type as that of parameter being passed via the setter.
  *
  * @since 13.0.0
diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/config/ConsoleConfigBuilder.java b/openam-core/src/main/java/org/forgerock/openam/sm/config/ConsoleConfigBuilder.java
index cdea04a0f7..b93ba6973c 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sm/config/ConsoleConfigBuilder.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sm/config/ConsoleConfigBuilder.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sm.config;
@@ -21,7 +22,7 @@
 
 /**
  * Builder to construct the config object represented.
- * 
      
+ * 
      
  * The builder needs to declare which service configuration sources to pull on using
  * {@link ConfigSource} and each setter needs to declare which attribute to be
  * populated with using {@link ConfigAttribute}.
diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/config/DefaultConfigTransformer.java b/openam-core/src/main/java/org/forgerock/openam/sm/config/DefaultConfigTransformer.java
index 3522472382..b3ec7e794e 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sm/config/DefaultConfigTransformer.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sm/config/DefaultConfigTransformer.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.sm.config;
@@ -24,7 +24,7 @@
 
 /**
  * Provides the default transformations if a specific transformation class is not defined.
- * 
      
+ * 
      
  * Default transformations handles common primitive types and set and list. In the case
  * of set and list, the expectation is that the parameter type is a set or list of strings;
  * anything other will need a custom transformation.
diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/ConnectionFactory.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/ConnectionFactory.java
index 6c4d3d89bd..cbea26a7ff 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/ConnectionFactory.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/ConnectionFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sm.datalayer.api;
@@ -22,7 +23,7 @@
 
 /**
  * Creates connections of type T either asynchronously or synchronously.
- * @param 
+ * @param  the type of connection produced by this factory
  */
 public interface ConnectionFactory extends Closeable {
 
diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchBuilder.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchBuilder.java
index 564c8f39c2..82b4dea9af 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchBuilder.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchBuilder.java
@@ -12,6 +12,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2016 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC
 */
 package org.forgerock.openam.sm.datalayer.impl.ldap;
 
@@ -37,7 +38,7 @@ public class CTSDJLDAPv3PersistentSearchBuilder {
     /**
      * Generates a new builder.
      *
-     * @param connectionFactory 
+     * @param connectionFactory the connection factory used to create LDAP connections for the persistent search
      */
     public CTSDJLDAPv3PersistentSearchBuilder(ConnectionFactory connectionFactory) {
         Reject.ifNull(connectionFactory);
diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/tasks/PartialQueryTask.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/tasks/PartialQueryTask.java
index 8af2f55373..cac80104d5 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/tasks/PartialQueryTask.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/tasks/PartialQueryTask.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.sm.datalayer.impl.tasks;
 
@@ -49,7 +50,7 @@ public PartialQueryTask(TokenFilter tokenFilter, ResultHandler
+ * 
      
  * This factory provider is aware of two main use cases for the service management layer (also known
  * as Data Layer).
- * 
      
+ * 
      
  * Default - Uses the service management configuration for connections. This will connect to the
  * defined LDAP server, whether that is embedded or external.
- * 
      
+ * 
      
  * External - Uses CTS Configuration for CTS connections which are pointed towards an external
  * LDAP server. Uses service management configuration for {@link StoreMode#DEFAULT} connections.
  */
diff --git a/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapper.java b/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapper.java
index ec62f08fa5..1b29875dd3 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapper.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapper.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.sso.providers.stateless;
 
@@ -44,7 +45,7 @@
 import com.iplanet.dpro.session.share.SessionInfo;
 
 /**
- * Responsible for converting {@link SessionInfo} objects to/from JWT with optional signing &/or encryption.
+ * Responsible for converting {@link SessionInfo} objects to/from JWT with optional signing &/or encryption.
  *
  * @since 13.0.0
  */
diff --git a/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManager.java b/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManager.java
index 7057e07b95..1aa2635c92 100644
--- a/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManager.java
+++ b/openam-core/src/main/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManager.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.sso.providers.stateless;
@@ -107,7 +107,7 @@ public boolean containsJwt(SessionID sid) {
      *
      * @param tokenId Non null TokenID to use for parsing.
      * @return A non null StatelessSessionID.
-     * @throws SessionException
+     * @throws SessionException if the stateless session cannot be generated
      */
     public StatelessSession generate(String tokenId) throws SessionException {
         return generate(new SessionID(tokenId));
diff --git a/openam-core/src/main/java/org/forgerock/openam/utils/RealmNormaliser.java b/openam-core/src/main/java/org/forgerock/openam/utils/RealmNormaliser.java
index 6c514f6bb3..a1d434911e 100644
--- a/openam-core/src/main/java/org/forgerock/openam/utils/RealmNormaliser.java
+++ b/openam-core/src/main/java/org/forgerock/openam/utils/RealmNormaliser.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.utils;
@@ -39,7 +39,7 @@ public class RealmNormaliser {
 
     /**
      * Normalises the realm.
-     * 
      
+     * 
      
      * If the specified realm is {@code null} or an empty String, '/' is returned. Otherwise the specified realm is
      * checked for its validity and returned in "/" separated format . 
      *
diff --git a/openam-core/src/main/java/org/forgerock/openam/utils/RecoveryCodeGenerator.java b/openam-core/src/main/java/org/forgerock/openam/utils/RecoveryCodeGenerator.java
index 21216778a6..3695b65853 100644
--- a/openam-core/src/main/java/org/forgerock/openam/utils/RecoveryCodeGenerator.java
+++ b/openam-core/src/main/java/org/forgerock/openam/utils/RecoveryCodeGenerator.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 org.forgerock.openam.utils;
 
@@ -74,7 +74,7 @@ public RecoveryCodeGenerator(SecureRandom secureRandom) {
      * source of random characters.
      *
      * @param alphabet The alpha to use from which to pick characters. Must not be null.
-     * @param length The size of the produced codes. Must be > 0.
+     * @param length The size of the produced codes. Must be > 0.
      *
      * @return a randomly generated code.
      */
@@ -100,7 +100,7 @@ public String generateCode(CodeGeneratorSource alphabet, int length) {
      * @param alphabet The alpha to use from which to pick characters. Must not be null.
      * @param groups The groupings of characters. For example, {@code {4, 4}} will produce two sets
      *               of four characters with a {@code delimiter} between them. Must not be null. Must have at least
-     *               one entry. Entries must be > 0.
+     *               one entry. Entries must be > 0.
      * @param delimiter The character to use between each of the groups.
      *
      * @return a randomly generated, delimited code.
@@ -134,7 +134,7 @@ public String generateDelimitedCode(CodeGeneratorSource alphabet, char delimiter
      * @param alphabet The alpha to use from which to pick characters. Must not be null.
      * @param groups The groupings of characters. For example, {@code {4, 4}} will produce two sets
      *               of four characters with a {@code delimiter} between them. Must not be null. Must have at least
-     *               one entry. Entries must be > 0.
+     *               one entry. Entries must be > 0.
      * @param delimiter The character to use between each of the groups. Must not be null.
      * @param specifics A map used to specify characters to use at a given location.
      *
@@ -158,7 +158,7 @@ public String generateDelimitedCodeWithSpecifics(CodeGeneratorSource alphabet, c
     /**
      * Generate a set of codes using the provided alphabet of the default length.
      *
-     * @param numCodes The number of codes to generate. Must be > 0.
+     * @param numCodes The number of codes to generate. Must be > 0.
      * @param alphabet The alphabet to use from which to select characters. Must not be null.
      * @param allowDuplicates Whether to allow duplicates in the result set.
      *
@@ -173,9 +173,9 @@ public String[] generateCodes(int numCodes, CodeGeneratorSource alphabet, boolea
     /**
      * Generate a set of codes using the provided alphabet of the provided length.
      *
-     * @param numCodes Number of recovery codes to generate. Must be > 0.
+     * @param numCodes Number of recovery codes to generate. Must be > 0.
      * @param alphabet The alphabet to use from which to select characters. Must not be null.
-     * @param length The length of produced codes. Must be > 0.
+     * @param length The length of produced codes. Must be > 0.
      * @param allowDuplicates Whether or not to allow duplicates in the result set.
      *
      * @throws CodeException if duplicate codes were produced, disallowed and the number of retries was exceeded.
@@ -214,11 +214,11 @@ public String[] generateCodes(int numCodes, CodeGeneratorSource alphabet, int le
      * source of random characters. The generated codes will have random characters for the
      * size of each of the supplied {@code groups}, with a {@code delimiter} between them.
      *
-     * @param numCodes Number of recovery codes to generate. Must be > 0.
+     * @param numCodes Number of recovery codes to generate. Must be > 0.
      * @param alphabet The alphabet to use from which to select numbers. Must not be null.
      * @param groups The groupings of lengths of characters. For example, {@code {4, 4}} will produce two set
      *               of four characters with a {@code delimiter} between them. Must not be null. Must have at least
-     *               one entry. Entries must be > 0.
+     *               one entry. Entries must be > 0.
      * @param delimiter The character to use between each of the groups.
      * @param allowDuplicates Whether or not to allow duplicates in the result set.
      *
@@ -261,11 +261,11 @@ public String[] generateDelimitedCodes(int numCodes, CodeGeneratorSource alphabe
      * The provided specifics map can then be used to replace individual character indexes with a
      * specific character.
      *
-     * @param numCodes The number of codes to generate. Must be > 0.
+     * @param numCodes The number of codes to generate. Must be > 0.
      * @param alphabet The alphabet to use from which to pick characters. Must not be null.
      * @param groups The groupings of lengths of characters. For example, {@code {4, 4}} will produce two sets
      *               of four characters with a {@code delimiter} between them. Must not be null. Must have at least
-     *               one entry. Entries must be > 0.
+     *               one entry. Entries must be > 0.
      * @param delimiter The character to use between each of the groups.
      * @param specifics A map used to specify characters to use at a given location.
      * @param allowDuplicates Whether to allow duplicate codes.
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionEventDispatcher.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionEventDispatcher.java
index 6081167fdc..82bf63a671 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionEventDispatcher.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionEventDispatcher.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click;
@@ -64,7 +65,7 @@
  * This method registers the Control's action listener with the
  * ActionEventDispatcher. The ClickServlet will subsequently invoke the registered
  * {@link ActionListener#onAction(Control)} method after all the Page controls
- * onProcess() method have been invoked.
+ * onProcess() method have been invoked.
  */
 public class ActionEventDispatcher {
 
@@ -149,7 +150,7 @@ public static ActionEventDispatcher getThreadLocalDispatcher() {
     /**
      * Returns true if an ActionEventDispatcher instance is available on the
      * current thread, false otherwise.
-     * 
      
+     * 
      
      * Unlike {@link #getThreadLocalDispatcher()} this method can safely be used
      * and will not throw an exception if an ActionEventDispatcher is not
      * available on the current thread.
@@ -216,7 +217,7 @@ protected void errorOccurred(Throwable throwable) {
     /**
      * Fire the actions for the given listener list and event source list which
      * return true if the page should continue processing.
-     * 
      
+     * 
      
      * This method can be overridden if you need to customize the way events
      * are fired.
      *
@@ -246,7 +247,7 @@ protected boolean fireActionEvents(Context context,
     /**
      * Fire the action for the given listener and event source which
      * return true if the page should continue processing.
-     * 
      
+     * 
      
      * This method can be overridden if you need to customize the way events
      * are fired.
      *
@@ -264,7 +265,7 @@ protected boolean fireActionEvent(Context context, Control source,
     /**
      * Fire the AjaxBehaviors for the given control set and return true if the page
      * should continue processing, false otherwise.
-     * 
      
+     * 
      
      * This method can be overridden if you need to customize the way
      * AjaxBehaviors are fired.
      *
@@ -298,7 +299,7 @@ protected boolean fireAjaxBehaviors(Context context, Set ajaxBbehaviorS
      * page should continue processing, false otherwise. AjaxBehaviors will
      * only fire if their {@link org.openidentityplatform.openam.click.ajax.AjaxBehavior#isAjaxTarget(Context) isAjaxTarget()}
      * method returns true.
-     * 
      
+     * 
      
      * This method can be overridden if you need to customize the way
      * AjaxBehaviors are fired.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionListener.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionListener.java
index a7ca79b482..4fb5142e33 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionListener.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionListener.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click;
@@ -23,13 +24,13 @@
 
 /**
  * Provides a listener interface for receiving control action events.
- * The usage model is similar to the java.awt.event.ActionListener
+ * The usage model is similar to the java.awt.event.ActionListener
  * interface.
- * 
      
+ * 
      
  * The class that is interested in processing an action event
  * implements this interface, and the object created with that class is
- * registered with a control, using the control's setActionListener
- * method. When the action event occurs, that object's onAction method
+ * registered with a control, using the control's setActionListener
+ * method. When the action event occurs, that object's onAction method
  * is invoked.
  *
  * 
      Listener Example
      
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionResult.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionResult.java
index 60ac4b9c70..d5a4a6ebdb 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionResult.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/ActionResult.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click;
 
@@ -35,13 +36,13 @@
  * Provides an ActionResult that is returned by Page Actions and AjaxBehaviors.
  * ActionResults are often used to return a partial response to the browser
  * instead of the full page content.
- * 
      
+ * 
      
  * An ActionResult can consist of a String (HTML, JSON, XML, plain text) or a byte
  * array (jpg, gif, png, pdf or excel documents). The ActionResult {@link #contentType}
  * must be set appropriately in order for the browser to recognize the action result.
- * 
      
+ * 
      
  * ActionResults are returned by {@link org.apache.click.ajax.AjaxBehavior Ajax Behaviors}
- * and Page Action methods.
+ * and Page Action methods.
  *
  * 
      Ajax Behavior
      
  *
@@ -69,7 +70,7 @@
  *
  * 
      Page Action
      
  *
- * A Page Action is a method on a Page that can be invoked directly
+ * A Page Action is a method on a Page that can be invoked directly
  * from the browser. The Page Action method returns an ActionResult instance that
  * is rendered to the browser, thus bypassing the rendering of the Page template.
  *
@@ -99,9 +100,9 @@
  *
  * The {@link #contentType} of the ActionResult must be set to the appropriate type
  * in order for the client to recognize the response. ActionResult provides constants
- * for some of the common content types, including: {@link #XML text/xml},
+ * for some of the common content types, including: {@link #XML text/xml},
  * {@link #HTML text/html}, {@link #JSON application/json}, {@link #TEXT text/plain}.
- * 
      
+ * 
      
  * For example:
  * 
        * ActionResult actionResult = new ActionResult("alert('hello world');", ActionResult.JAVASCRIPT);
@@ -124,22 +125,22 @@ public class ActionResult {
 
     // Constants --------------------------------------------------------------
 
-    /** The plain text content type constant: text/plain. */
+    /** The plain text content type constant: text/plain. */
     public static final String TEXT = "text/plain";
 
-    /** The html content type constant: text/html. */
+    /** The html content type constant: text/html. */
     public static final String HTML = "text/html";
 
-    /** The The xhtml content type constant: application/xhtml+xml. */
+    /** The The xhtml content type constant: application/xhtml+xml. */
     public static final String XHTML = "application/xhtml+xml";
 
-    /** The json content type constant: text/json. */
+    /** The json content type constant: text/json. */
     public static final String JSON = "application/json";
 
-    /** The javascript content type constant: text/javascript. */
+    /** The javascript content type constant: text/javascript. */
     public static final String JAVASCRIPT = "text/javascript";
 
-    /** The xml content type constant: text/xml. */
+    /** The xml content type constant: text/xml. */
     public static final String XML = "text/xml";
 
     /** The ActionResult writer buffer size. */
@@ -181,10 +182,10 @@ public class ActionResult {
 
     /**
      * Construct the ActionResult for the given template and model.
-     * 
      
+     * 
      
      * When the ActionResult is rendered the template and model will be merged and
      * the result will be streamed back to the client.
-     * 
      
+     * 
      
      * For example:
      * 
            * public class MyPage extends Page {
@@ -263,7 +264,7 @@ public ActionResult(byte[] bytes, String contentType) {
 
     /**
      * Construct the ActionResult for the given content. The
-     * {@link jakarta.servlet.http.HttpServletResponse#setContentType(java.lang.String) response content type}
+     * {@link jakarta.servlet.http.HttpServletResponse#setContentType(java.lang.String) response content type}
      * will default to {@link #TEXT}, unless overridden.
      *
      * @param content the content to stream back to the client
@@ -274,7 +275,7 @@ public ActionResult(String content) {
 
     /**
      * Construct a new empty ActionResult. The
-     * {@link jakarta.servlet.http.HttpServletResponse#setContentType(java.lang.String) response content type}
+     * {@link jakarta.servlet.http.HttpServletResponse#setContentType(java.lang.String) response content type}
      * will default to {@link #TEXT}, unless overridden.
      */
     public ActionResult() {
@@ -285,7 +286,7 @@ public ActionResult() {
     /**
      * Set whether the action result should be cached by the client browser or
      * not.
-     * 
      
+     * 
      
      * If false, Click will set the following headers to prevent browsers
      * from caching the result:
      * 
      @@ -441,7 +442,7 @@ public Map getModel() {
 
     /**
      * Set the model of the ActionResult template to render.
-     * 
      
+     * 
      
      * If the {@link #template} property is set, the template and {@link #model}
      * will be merged and the result will be streamed back to the client.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/Behavior.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/Behavior.java
index 58ac8527e0..1099202204 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/Behavior.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/Behavior.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click;
 
@@ -22,28 +23,28 @@
  * Behaviors provide a mechanism for changing how Controls behave at runtime.
  * Behaviors are added to a Control and provides interceptor methods to decorate
  * and enhance the source Control.
- * 
      
+ * 
      
  * Behaviors provide interceptor methods for specific Control life cycle events.
  * These interceptor methods can be implemented to further process and decorate
  * the control or its children.
- * 
      
+ * 
      
  * The following interceptor methods are defined:
  *
  * 
        
  * 
      • preResponse - occurs before the control markup is written to the response
        • 
- * 
      • preRenderHeadElements - occurs after preResponse but before the control
+ * 
      • preRenderHeadElements - occurs after preResponse but before the control
  * {@link Control#getHeadElements() HEAD elements} are written to the response
        • 
  * 
      • preDestroy - occurs before the Control {@link Control#onDestroy() onDestroy}
  * event handler.
        • 
  * 
      
  *
- * These interceptor methods allow the Behavior to decorate a control,
+ * These interceptor methods allow the Behavior to decorate a control,
  * for example:
  *
  * 
        
  * 
      • add or remove Control HEAD elements such as JavaScript and CSS dependencies
  * and setup scripts
        • 
- * 
      • add or remove Control attributes such as "class", "style" etc.
        • 
+ * 
      • add or remove Control attributes such as "class", "style" etc.
        • 
  * 
      
  */
 public interface Behavior {
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickRequestWrapper.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickRequestWrapper.java
index 482c832c77..cc146cd0d8 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickRequestWrapper.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickRequestWrapper.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click;
 
@@ -43,14 +44,14 @@
 class ClickRequestWrapper extends HttpServletRequestWrapper {
 
     /**
-     * The FileItem objects for "multipart" POST requests.
+     * The FileItem objects for "multipart" POST requests.
      */
     private final Map fileItemMap;
 
     /** The request is a multi-part file upload POST request. */
     private final boolean isMultipartRequest;
 
-    /** The map of "multipart" request parameter values. */
+    /** The map of "multipart" request parameter values. */
     private final Map multipartParameterMap;
 
     /** The wrapped servlet request. */
@@ -133,11 +134,11 @@ class ClickRequestWrapper extends HttpServletRequestWrapper {
     // Public Methods ---------------------------------------------------------
 
     /**
-     * Returns a map of FileItem arrays keyed on request parameter
+     * Returns a map of FileItem arrays keyed on request parameter
      * name for "multipart" POST requests (file uploads). Thus each map entry
-     * will consist of one or more FileItem objects.
+     * will consist of one or more FileItem objects.
      *
-     * @return map of FileItem arrays keyed on request parameter name
+     * @return map of FileItem arrays keyed on request parameter name
      * for "multipart" POST requests
      */
     public Map getFileItemMap() {
@@ -223,9 +224,9 @@ public Map getParameterMap() {
     // Package Private Methods ------------------------------------------------
 
     /**
-     * Return the map of "multipart" request parameter map.
+     * Return the map of "multipart" request parameter map.
      *
-     * @return the "multipart" request parameter map
+     * @return the "multipart" request parameter map
      */
     @SuppressWarnings("unchecked")
     Map getMultipartParameterMap() {
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickServlet.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickServlet.java
index e8ff6b2fe8..8019ff4335 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickServlet.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/ClickServlet.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click;
@@ -63,12 +64,12 @@
 
 /**
  * Provides the Click application HttpServlet.
- * 
      
- * Generally developers will simply configure the ClickServlet and
+ * 
      
+ * Generally developers will simply configure the ClickServlet and
  * will not use it directly in their code. For a Click web application to
- * function the ClickServlet must be configured in the web
- * application's /WEB-INF/web.xml file. A simple web application which
- * maps all *.htm requests to a ClickServlet is provided below.
+ * function the ClickServlet must be configured in the web
+ * application's /WEB-INF/web.xml file. A simple web application which
+ * maps all *.htm requests to a ClickServlet is provided below.
  *
  * 
        * <web-app>
@@ -83,8 +84,8 @@
  *    </servlet-mapping>
  * </web-app> 
      
  *
- * By default the ClickServlet will attempt to load an application
- * configuration file using the path:   /WEB-INF/click.xml
+ * By default the ClickServlet will attempt to load an application
+ * configuration file using the path:   /WEB-INF/click.xml
  *
  * 
      Servlet Mapping
      
  * By convention all Click page templates should have a .htm extension, and
@@ -93,13 +94,13 @@
  * and they will not be processed as Click pages.
  *
  * 
      Load On Startup
      
- * Note you should always set load-on-startup element to be 0 so the
+ * Note you should always set load-on-startup element to be 0 so the
  * servlet is initialized when the server is started. This will prevent any
  * delay for the first client which uses the application.
- * 
      
- * The ClickServlet performs as much work as possible at startup to
+ * 
      
+ * The ClickServlet performs as much work as possible at startup to
  * improve performance later on. The Click start up and caching strategy is
- * configured with the Click application mode in the "click.xml" file.
+ * configured with the Click application mode in the "click.xml" file.
  * See the User Guide for information on how to configure the application mode.
  *
  * 
      ConfigService
      
@@ -115,20 +116,20 @@ public class ClickServlet extends HttpServlet {
     private static final long serialVersionUID = 1L;
 
     /**
-     * The mock page reference request attribute: key:  
-     * mock_page_reference.
-     * 
      
+     * The mock page reference request attribute: key:  
+     * mock_page_reference.
+     * 
      
      * This attribute stores the each Page instance as a request attribute.
-     * 
      
-     * Note: a page is only stored as a request attribute
+     * 
      
+     * Note: a page is only stored as a request attribute
      * if the {@link #MOCK_MODE_ENABLED} attribute is set.
      */
     static final String MOCK_PAGE_REFERENCE = "mock_page_reference";
 
     /**
-     * The mock mode request attribute: key:  
-     * mock_mode_enabled.
-     * 
      
+     * The mock mode request attribute: key:  
+     * mock_mode_enabled.
+     * 
      
      * If this attribute is set (the value does not matter) certain features
      * will be enabled which is needed for running Click in a mock environment.
      */
@@ -136,23 +137,23 @@ public class ClickServlet extends HttpServlet {
 
     /**
      * The click application configuration service classname init parameter name:
-     *   "config-service-class".
+     *   "config-service-class".
      */
     protected final static String CONFIG_SERVICE_CLASS = "config-service-class";
 
     /**
      * The custom TypeConverter classname as an init parameter name:
-     * &nbps; "type-converter-class".
+     * &nbps; "type-converter-class".
      */
     protected final static String TYPE_CONVERTER_CLASS = "type-converter-class";
 
     /**
-     * The forwarded request marker attribute:   "click-forward".
+     * The forwarded request marker attribute:   "click-forward".
      */
     protected final static String CLICK_FORWARD = "click-forward";
 
     /**
-     * The Page to forward to request attribute:   "click-page".
+     * The Page to forward to request attribute:   "click-page".
      */
     protected final static String FORWARD_PAGE = "forward-page";
 
@@ -297,10 +298,10 @@ protected void doPost(HttpServletRequest request,
     /**
      * Handle the given servlet request and render the results to the
      * servlet response.
-     * 
      
+     * 
      
      * If an exception occurs within this method the exception will be delegated
      * to:
-     * 
      
+     * 
      
      * {@link #handleException(HttpServletRequest, HttpServletResponse, boolean, Throwable, Class)}
      *
      * @param request the servlet request to process
@@ -428,7 +429,7 @@ protected void handleRequest(HttpServletRequest request,
     /**
      * Provides the application exception handler. The application exception
      * will be delegated to the configured error page. The default error page is
-     * {@link ErrorPage} and the page template is "click/error.htm" 
      
+     * {@link ErrorPage} and the page template is "click/error.htm" 
      
      * Applications which wish to provide their own customized error handling
      * must subclass ErrorPage and specify their page in the
      * "/WEB-INF/click.xml" application configuration file. For example:
@@ -535,7 +536,7 @@ public void processField(String fieldName, Object fieldValue) {
     /**
      * Process the given page invoking its "on" event callback methods
      * and directing the response.
-     * 
      
+     * 
      
      * This method does not invoke the "onDestroy()" callback method.
      *
      * @see #processPageEvents(Page, Context)
@@ -561,7 +562,7 @@ protected void processPage(Page page) throws Exception {
     /**
      * Process the given page events, invoking the "on" event callback methods
      * and directing the response.
-     * 
      
+     * 
      
      * This method does not invoke the "onDestroy()" callback method.
      *
      * @param page the Page which events to process
@@ -914,11 +915,11 @@ protected void performRender(Page page, Context context, ActionResult actionResu
 
     /**
      * Render the Velocity template defined by the page's path.
-     * 
      
+     * 
      
      * This method creates a Velocity Context using the Page's model Map and
      * then merges the template with the Context writing the result to the
      * HTTP servlet response.
-     * 
      
+     * 
      
      * This method was adapted from org.apache.velocity.servlet.VelocityServlet.
      *
      * @param page the page template to merge
@@ -1112,8 +1113,8 @@ protected Page createPage(Context context) {
     }
 
     /**
-     * Process the given pages controls onDestroy methods, reset the pages
-     * navigation state and process the pages onDestroy method.
+     * Process the given pages controls onDestroy methods, reset the pages
+     * navigation state and process the pages onDestroy method.
      *
      * @param page the page to process
      * @param startTime the start time to log if greater than 0 and not in
@@ -1203,22 +1204,22 @@ protected void processPageOnDestroy(Page page, long startTime) {
      * Initialize a new page instance using
      * {@link #newPageInstance(String, Class, HttpServletRequest)} method and
      * setting format, headers and the forward if a JSP.
-     * 
      
+     * 
      
      * This method will also automatically register any public Page controls
      * in the page's model. When the page is created any public visible
      * page Control variables will be automatically added to the page using
      * the method {@link Page#addControl(Control)} method. If the controls name
      * is not defined it is set to the member variables name before it is added
      * to the page.
-     * 
      
+     * 
      
      * This feature saves you from having to manually add the controls yourself.
      * If you don't want the controls automatically added, simply declare them
      * as non public variables.
-     * 
      
+     * 
      
      * An example auto control registration is provided below. In this example
      * the Table control is automatically added to the model using the name
-     * "table", and the ActionLink controls are added using the names
-     * "editDetailsLink" and "viewDetailsLink".
+     * "table", and the ActionLink controls are added using the names
+     * "editDetailsLink" and "viewDetailsLink".
      *
      * 
            * public class OrderDetailsPage extends Page {
@@ -1318,8 +1319,8 @@ public void processField(String fieldName, Object fieldValue) {
      * Process the page binding any request parameters to any public Page
      * fields with the same name which are "primitive" types. These types
      * include string, numbers and booleans.
-     * 
      
-     * Type conversion is performed using the TypeConverter
+     * 
      
+     * Type conversion is performed using the TypeConverter
      * returned by the {@link #getTypeConverter()} method.
      *
      * @param page the page whose fields are to be processed
@@ -1373,7 +1374,7 @@ protected void processPageRequestParams(Page page) throws OgnlException {
 
     /**
      * Return a new Page instance for the given page path, class and request.
-     * 
      
+     * 
      
      * The default implementation of this method simply creates new page
      * instances:
      * 
      @@ -1385,10 +1386,10 @@ protected void processPageRequestParams(Page page) throws OgnlException {
      *
      * This method is designed to be overridden by applications providing their
      * own page creation patterns.
-     * 
      
+     * 
      
      * A typical example of this would be with Inversion of Control (IoC)
      * frameworks such as Spring or HiveMind. For example a Spring application
-     * could override this method and use a ApplicationContext to instantiate
+     * could override this method and use a ApplicationContext to instantiate
      * new Page objects:
      * 
            * protected Page newPageInstance(String path, Class pageClass,
@@ -1421,7 +1422,7 @@ protected Page newPageInstance(String path, Class pageClass,
     /**
      * Provides an extension point for ClickServlet sub classes to activate
      * stateful page which may have been deserialized.
-     * 
      
+     * 
      
      * This method does nothing and is designed for extension.
      *
      * @param page the page instance to activate
@@ -1431,7 +1432,7 @@ protected void activatePageInstance(Page page) {
 
     /**
      * Return a new VelocityContext for the given pages model and Context.
-     * 
      
+     * 
      
      * The following values automatically added to the VelocityContext:
      * 
        
      * 
      • any public Page fields using the fields name
        • 
@@ -1610,13 +1611,13 @@ public void processField(String fieldName, Object fieldValue) {
     }
 
     /**
-     * Return the request parameters OGNL TypeConverter. This method
+     * Return the request parameters OGNL TypeConverter. This method
      * performs a lazy load of the TypeConverter object, using the classname
-     * defined in the Servlet init parameter type-converter-class,
+     * defined in the Servlet init parameter type-converter-class,
      * if this parameter is not defined this method will return a
      * {@link RequestTypeConverter} instance.
      *
-     * @return the request parameters OGNL TypeConverter
+     * @return the request parameters OGNL TypeConverter
      * @throws RuntimeException if the TypeConverter instance could not be created
      */
     @SuppressWarnings("unchecked")
@@ -1643,10 +1644,10 @@ protected TypeConverter getTypeConverter() throws RuntimeException {
     /**
      * Creates and returns a new Context instance for this path, class and
      * request.
-     * 
        
+     * 
        
      * The default implementation of this method simply creates a new Context
      * instance.
-     * 
        
+     * 
        
      * Subclasses can override this method to provide a custom Context.
      *
      * @param request the page request
@@ -1686,13 +1687,13 @@ protected ControlRegistry createControlRegistry() {
 
     /**
      * Creates and returns a new ErrorPage instance.
-     * 
        
-     * This method creates the custom page as specified in click.xml,
+     * 
        
+     * This method creates the custom page as specified in click.xml,
      * otherwise the default ErrorPage instance.
-     * 
        
+     * 
        
      * Subclasses can override this method to provide custom ErrorPages tailored
      * for specific exceptions.
-     * 
        
+     * 
        
      * Note you can safely use {@link Context} in this
      * method.
      *
@@ -1719,7 +1720,7 @@ protected ConfigService getConfigService() {
 
     /**
      * Return a new Page instance for the given path. The path must start with
-     * a "/".
+     * a "/".
      *
      * @param path the path which maps to a Page class
      * @param request the Page request
@@ -1927,15 +1928,15 @@ protected boolean processAjaxTargetControls(Context context,
 
     /**
      * Provides an Ajax exception handler. Exceptions are wrapped inside a
-     * div element and streamed back to the browser. The response status
+     * div element and streamed back to the browser. The response status
      * is set to an {@link jakarta.servlet.http.HttpServletResponse#SC_INTERNAL_SERVER_ERROR HTTP 500 error}
      * which allows the JavaScript that initiated the Ajax request to handle
      * the error as appropriate.
-     * 
        
-     * If Click is running in development modes the exception stackTrace
-     * will be rendered, in production modes an error message is
+     * 
        
+     * If Click is running in development modes the exception stackTrace
+     * will be rendered, in production modes an error message is
      * rendered.
-     * 
        
+     * 
        
      * Below is an example error response:
      *
      * 
        @@ -1989,10 +1990,10 @@ protected void handleAjaxException(HttpServletRequest request,
     // ------------------------------------------------ Package Private Methods
 
     /**
-     * Return the OGNL MemberAccess. This method performs a lazy load
+     * Return the OGNL MemberAccess. This method performs a lazy load
      * of the MemberAccess object, using a {@link DefaultMemberAccess} instance.
      *
-     * @return the OGNL MemberAccess
+     * @return the OGNL MemberAccess
      */
     MemberAccess getMemberAccess() {
         if (memberAccess == null) {
@@ -2023,10 +2024,10 @@ ConfigService createConfigService(ServletContext servletContext)
     }
 
     /**
-     * Initialize the Click application ConfigService instance and bind
+     * Initialize the Click application ConfigService instance and bind
      * it as a ServletContext attribute using the key
-     * "org.apache.click.service.ConfigService".
-     * 
        
+     * "org.apache.click.service.ConfigService".
+     * 
        
      * This method will use the configuration service class specified by the
      * {@link #CONFIG_SERVICE_CLASS} parameter, otherwise it will create a
      * {@link org.apache.click.service.XmlConfigService} instance.
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/Context.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/Context.java
index ac6ddbe9b4..7d13127473 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/Context.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/Context.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click;
 
@@ -51,7 +52,7 @@ public class Context {
 
     // -------------------------------------------------------------- Constants
 
-    /** The user's session Locale key:   locale. */
+    /** The user's session Locale key:   locale. */
     public static final String LOCALE = "locale";
 
     /**
@@ -170,12 +171,12 @@ public static Context getThreadLocalContext() {
      * false otherwise. Unlike {@link #getThreadLocalContext()} this method
      * can safely be used and will not throw an exception if Context is not
      * available on the current thread.
-     * 
        
+     * 
        
      * This method is very useful inside a {@link Control} constructor which
      * might need access to the Context. As Controls could potentially be
      * instantiated during Click startup (in order to deploy their resources),
      * this check can be used to determine whether Context is available or not.
-     * 
        
+     * 
        
      * For example:
      *
      * 
        @@ -254,7 +255,7 @@ public HttpSession getSession() {
     /**
      * Return the page resource path from the request. For example:
      * 
        -     * http://www.mycorp.com/banking/secure/login.htm  ->  /secure/login.htm 
        
+     * http://www.mycorp.com/banking/secure/login.htm  ->  /secure/login.htm 
        
      *
      * @return the page resource path from the request
      */
@@ -292,18 +293,18 @@ public boolean isGet() {
 
     /**
      * Return true is this is an Ajax request, false otherwise.
-     * 
        
-     * An Ajax request is identified by the presence of the request header
-     * or request parameter: "X-Requested-With".
-     * "X-Requested-With" is the de-facto standard identifier used by
+     * 
        
+     * An Ajax request is identified by the presence of the request header
+     * or request parameter: "X-Requested-With".
+     * "X-Requested-With" is the de-facto standard identifier used by
      * Ajax libraries.
-     * 
        
-     * Note: incoming requests that contains a request parameter
-     * "X-Requested-With" will result in this method returning true, even
-     * though the request itself was not initiated through a XmlHttpRequest
+     * 
        
+     * Note: incoming requests that contains a request parameter
+     * "X-Requested-With" will result in this method returning true, even
+     * though the request itself was not initiated through a XmlHttpRequest
      * object. This allows one to programmatically enable Ajax requests. A common
      * use case for this feature is when uploading files through an IFrame element.
-     * By specifying "X-Requested-With" as a request parameter the IFrame
+     * By specifying "X-Requested-With" as a request parameter the IFrame
      * request will be handled like a normal Ajax request.
      *
      * @return true if this is an Ajax request, false otherwise
@@ -360,9 +361,9 @@ public boolean hasRequestParameter(String name) {
 
     /**
      * Return the named request parameter. This method supports
-     * "multipart/form-data" POST requests and should be used in
-     * preference to the HttpServletRequest method
-     * getParameter().
+     * "multipart/form-data" POST requests and should be used in
+     * preference to the HttpServletRequest method
+     * getParameter().
      *
      * @see org.apache.click.control.Form#onProcess()
      * @see #isMultipartRequest()
@@ -385,9 +386,9 @@ public String getRequestParameter(String name) {
      * Returns an array of String objects containing all of the values the given
      * request parameter has, or null if the parameter does not exist.
      *
-     * @param name a String containing the name of the parameter whose
+     * @param name a String containing the name of the parameter whose
      *     value is requested
-     * @return an array of String objects containing the parameter's values
+     * @return an array of String objects containing the parameter's values
      */
     public String[] getRequestParameterValues(String name) {
         if (name == null) {
@@ -401,10 +402,10 @@ public String[] getRequestParameterValues(String name) {
 
     /**
      * Return the named session attribute, or null if not defined.
-     * 
        
+     * 
        
      * If the session is not defined this method will return null, and a
      * session will not be created.
-     * 
        
+     * 
        
      * This method supports {@link FlashAttribute} which when accessed are then
      * removed from the session.
      *
@@ -429,7 +430,7 @@ public Object getSessionAttribute(String name) {
 
     /**
      * This method will set the named object in the HttpSession.
-     * 
        
+     * 
        
      * This method will create a session if one does not already exist.
      *
      * @param name the storage name for the object in the session
@@ -472,7 +473,7 @@ public boolean hasSession() {
 
     /**
      * This method will set the named object as a flash HttpSession object.
-     * 
        
+     * 
        
      * The flash object will exist in the session until it is accessed once,
      * and then removed. Flash objects are typically used to display a message
      * once.
@@ -506,7 +507,6 @@ public String getCookieValue(String name) {
 
     /**
      * Sets the given cookie value in the servlet response with the path "/".
-     * 
        
      * @see ClickUtils#setCookie(HttpServletRequest, HttpServletResponse, String, String, int, String)
      *
      * @param name the cookie name
@@ -539,7 +539,7 @@ public void invalidateCookie(String name) {
 
     /**
      * Return a new Page instance for the given path.
-     * 
        
+     * 
        
      * This method can be used to create a target page for the
      * {@link org.apache.click.Page#setForward(org.apache.click.Page)}, for example:
      *
@@ -549,7 +549,7 @@ public void invalidateCookie(String name) {
      *
      * setForward(userEdit); 
        
      *
-     * The given page path must start with a '/'.
+     * The given page path must start with a '/'.
      *
      * @param path the Page path as configured in the click.xml file
      * @return a new Page object
@@ -569,7 +569,7 @@ public  T createPage(String path) {
 
     /**
      * Return a new Page instance for the given class.
-     * 
        
+     * 
        
      * This method can be used to create a target page for the
      * {@link org.apache.click.Page#setForward(org.apache.click.Page)}, for example:
      *
@@ -601,7 +601,7 @@ public String getPagePath(Class pageClass) {
     }
 
     /**
-     * Return the page Class for the given path.
+     * Return the page Class for the given path.
      *
      * @param path the page path
      * @return the page class for the given path
@@ -614,7 +614,7 @@ public Class getPageClass(String path) {
 
     /**
      * Return the Click application mode value:  
-     * ["production", "profile", "development", "debug", "trace"].
+     * ["production", "profile", "development", "debug", "trace"].
      *
      * @return the application mode value
      */
@@ -624,7 +624,7 @@ public String getApplicationMode() {
 
     /**
      * Return the Click application charset or ISO-8859-1 if not is defined.
-     * 
        
+     * 
        
      * The charset is defined in click.xml through the charset attribute
      * on the click-app element.
      *
@@ -660,11 +660,11 @@ public Map createMessagesMap(Class baseClass, String globalRe
     }
 
     /**
-     * Returns a map of FileItem arrays keyed on request parameter
+     * Returns a map of FileItem arrays keyed on request parameter
      * name for "multipart" POST requests (file uploads). Thus each map entry
-     * will consist of one or more FileItem objects.
+     * will consist of one or more FileItem objects.
      *
-     * @return map of FileItem arrays keyed on request parameter name
+     * @return map of FileItem arrays keyed on request parameter name
      * for "multipart" POST requests
      */
     public Map getFileItemMap() {
@@ -675,7 +675,7 @@ public Map getFileItemMap() {
      * Returns the value of a request parameter as a FileItem, for
      * "multipart" POST requests (file uploads), or null if the parameter
      * is not found.
-     * 
        
+     * 
        
      * If there were multivalued parameters in the request (ie two or more
      * file upload fields with the same name), the first fileItem
      * in the array is returned.
@@ -702,14 +702,14 @@ public FileItem getFileItem(String name) {
 
     /**
      * Return the users Locale.
-     * 
        
+     * 
        
      * If the users Locale is stored in their session this will be returned.
      * Else if the click-app configuration defines a default Locale this
      * value will be returned, otherwise the request's Locale will be returned.
-     * 
        
+     * 
        
      * To override the default request Locale set the users Locale using the
      * {@link #setLocale(Locale)} method.
-     * 
        
+     * 
        
      * Pages and Controls obtain the users Locale using this method.
      *
      * @return the users Locale in the session, or if null the request Locale
@@ -733,7 +733,7 @@ public Locale getLocale() {
     /**
      * This method stores the given Locale in the users session. If the given
      * Locale is null, the "locale" attribute will be removed from the session.
-     * 
        
+     * 
        
      * The Locale object is stored in the session using the {@link #LOCALE}
      * key.
      *
@@ -760,10 +760,10 @@ public boolean isMultipartRequest() {
     /**
      * Return a rendered Velocity template and model for the given
      * class and model data.
-     * 
        
-     * This method will merge the class .htm Velocity template and
+     * 
        
+     * This method will merge the class .htm Velocity template and
      * model data using the applications Velocity Engine.
-     * 
        
+     * 
        
      * An example of the class template resolution is provided below:
      * 
              * // Full class name
@@ -800,7 +800,7 @@ public String renderTemplate(Class templateClass, Map model) {
 
     /**
      * Return a rendered Velocity template and model data.
-     * 
        
+     * 
        
      * Example method usage:
      * 
              * public String toString() {
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/Control.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/Control.java
index 96d0c9d548..940ebad6aa 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/Control.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/Control.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click;
@@ -32,22 +33,22 @@
 /**
  * Provides the interface for Page controls. Controls are also referred to
  * as components or widgets.
- * 
        
+ * 
        
  * When a Page request event is processed Controls may perform server side event
  * processing through their {@link #onProcess()} method. Controls are generally
- * rendered in a Page by calling their toString() method.
- * 
        
+ * rendered in a Page by calling their toString() method.
+ * 
        
  * The Control execution sequence is illustrated below:
- * 
        
+ * 
        
  * 
  *
  * 
        HTML HEAD Elements
        
  *
  * Control HTML HEAD elements can be included in the Page by overriding the
  * {@link #getHeadElements()} method.
- * 
        
+ * 
        
  * Below is an example of a custom TextField control specifying that the
- * custom.js file should be included in the HTML HEADer:
+ * custom.js file should be included in the HTML HEADer:
  *
  * 
          * public class CustomField extends TextField {
@@ -66,31 +67,31 @@
  *     ..
  * } 
        
  *
- * 
+ * 
  * 
        Deploying Resources
        
  *
- * The Click framework uses the Velocity Tools WebappResourceLoader for loading templates.
- * This avoids issues associate with using the Velocity ClasspathResourceLoader and
- * FileResourceLoader on J2EE application servers.
+ * The Click framework uses the Velocity Tools WebappResourceLoader for loading templates.
+ * This avoids issues associate with using the Velocity ClasspathResourceLoader and
+ * FileResourceLoader on J2EE application servers.
  * To make preconfigured resources (templates, JavaScript, stylesheets, etc.)
  * available to web applications Click automatically deploys configured classpath
- * resources to the /click directory at startup
+ * resources to the /click directory at startup
  * (existing files will not be overwritten).
- * 
        
+ * 
        
  * Click supports two ways of deploying pre-configured resources. The recommended
  * deployment strategy (which also the simplest) relies on packaging resources
- * into a special folder of the JAR, called 'META-INF/resources'. At
+ * into a special folder of the JAR, called 'META-INF/resources'. At
  * startup time Click will scan this folder for resources and deploy them to the
  * web application. This deployment strategy is the same approach taken by the
  * Servlet 3.0 specification. Please see the section
  * Deploying Custom Resources
  * for more details.
- * 
        
+ * 
        
  * An alternative approach to deploying static resources on startup is provided
  * by the Control interface through the {@link #onDeploy(ServletContext)} method.
- * 
        
- * Continuing our example, the CustomField control deploys its
- * custom.js file to the /click directory:
+ * 
        
+ * Continuing our example, the CustomField control deploys its
+ * custom.js file to the /click directory:
  *
  * 
          * public class CustomField extends TextField {
@@ -102,8 +103,8 @@
  *     }
  * } 
        
  *
- * Controls using the onDeploy() method must be registered in the
- * application WEB-INF/click.xml for them to be invoked.
+ * Controls using the onDeploy() method must be registered in the
+ * application WEB-INF/click.xml for them to be invoked.
  * For example:
  *
  * 
        @@ -118,9 +119,9 @@
  * When the Click application starts up it will deploy any control elements
  * defined in the following files in sequential order:
  * 
          
- *  
        • /click-controls.xml
- *  
        • /extras-controls.xml
- *  
        • WEB-INF/click.xml
+ *  
        • /click-controls.xml
+ *  
        • /extras-controls.xml
+ *  
        • WEB-INF/click.xml
  * 
        
  *
  * Please note {@link org.apache.click.control.AbstractControl} provides
@@ -132,7 +133,7 @@
 public interface Control extends Serializable {
 
     /**
-     * The global control messages bundle name:   click-control.
+     * The global control messages bundle name:   click-control.
      */
     public static final String CONTROL_MESSAGES = "click-control";
 
@@ -154,13 +155,13 @@ public interface Control extends Serializable {
      * {@link org.apache.click.element.JsScript JsScript},
      * {@link org.apache.click.element.CssImport CssImport} and
      * {@link org.apache.click.element.CssStyle CssStyle}.
-     * 
        
+     * 
        
      * Controls can contribute their own list of HEAD elements by implementing
      * this method.
-     * 
        
+     * 
        
      * The recommended approach when implementing this method is to use
-     * lazy loading to ensure the HEAD elements are only added
-     * once and when needed. For example:
+     * lazy loading to ensure the HEAD elements are only added
+     * once and when needed. For example:
      *
      * 
              * public MyControl extends AbstractControl {
@@ -202,13 +203,13 @@ public interface Control extends Serializable {
      * One can also add HEAD elements from event handler methods such as
      * {@link #onInit()}, {@link #onProcess()}, {@link #onRender()}
      * etc.
-     * 
        
+     * 
        
      * The order in which JS and CSS files are included will be preserved in the
      * page.
-     * 
        
+     * 
        
      * Note: this method must never return null. If no HEAD elements
      * are available this method must return an empty {@link java.util.List}.
-     * 
        
+     * 
        
      * Also note: a common problem when overriding getHeadElements in
      * subclasses is forgetting to call super.getHeadElements. Consider
      * carefully whether you should call super.getHeadElements or not.
@@ -228,13 +229,13 @@ public interface Control extends Serializable {
 
     /**
      * Set the controls event listener.
-     * 
        
+     * 
        
      * The method signature of the listener is:
          
      * 
        • must have a valid Java method name
          • 
      * 
        • takes no arguments
          • 
      * 
        • returns a boolean value
          • 
      * 
        
-     * 
        
+     * 
        
      * An example event listener method would be:
      *
      * 
        @@ -253,9 +254,9 @@ public interface Control extends Serializable {
     public void setListener(Object listener, String method);
 
     /**
-     * Return the localized messages Map of the Control.
+     * Return the localized messages Map of the Control.
      *
-     * @return the localized messages Map of the Control
+     * @return the localized messages Map of the Control
      */
     public Map getMessages();
 
@@ -270,7 +271,7 @@ public interface Control extends Serializable {
     /**
      * Set the name of the Control. Each control name must be unique in the
      * containing Page model or the parent container.
-     * 
        
+     * 
        
      * Please note: changing the name of a Control after it has been
      * added to its parent container is undefined. Thus it is  best not
      * to change the name of a Control once its been set.
@@ -298,7 +299,7 @@ public interface Control extends Serializable {
      * The on deploy event handler, which provides classes the
      * opportunity to deploy static resources when the Click application is
      * initialized.
-     * 
        
+     * 
        
      * For example:
      * 
              * public void onDeploy(ServletContext servletContext) throws IOException {
@@ -308,7 +309,7 @@ public interface Control extends Serializable {
      * Please note: a common problem when overriding onDeploy in
      * subclasses is forgetting to call super.onDeploy. Consider
      * carefully whether you should call super.onDeploy or not.
-     * 
        
+     * 
        
      * Click also supports an alternative deployment strategy which relies on
      * packaging resource (stylesheets, JavaScript, images etc.) following a
      * specific convention. See the section
@@ -322,11 +323,11 @@ public interface Control extends Serializable {
     /**
      * The on initialize event handler. Each control will be initialized
      * before its {@link #onProcess()} method is called.
-     * 
        
+     * 
        
      * {@link org.apache.click.control.Container} implementations should recursively
      * invoke the onInit method on each of their child controls ensuring that
      * all controls receive this event.
-     * 
        
+     * 
        
      * Please note: a common problem when overriding onInit in
      * subclasses is forgetting to call super.onInit(). Consider
      * carefully whether you should call super.onInit() or not,
@@ -338,20 +339,20 @@ public interface Control extends Serializable {
     /**
      * The on process event handler. Each control will be processed when the
      * Page is requested.
-     * 
        
+     * 
        
      * ClickServlet will process all Page controls in the order they were added
      * to the Page.
-     * 
        
+     * 
        
      * {@link org.apache.click.control.Container} implementations should recursively
      * invoke the onProcess method on each of their child controls ensuring that
      * all controls receive this event. However when a control onProcess method
      * return false, no other controls onProcess method should be invoked.
-     * 
        
+     * 
        
      * When a control is processed it should return true if the Page should
      * continue event processing, or false if no other controls should be
      * processed and the {@link org.apache.click.Page#onGet()} or {@link Page#onPost()} methods
      * should not be invoked.
-     * 
        
+     * 
        
      * Please note: a common problem when overriding onProcess in
      * subclasses is forgetting to call super.onProcess(). Consider
      * carefully whether you should call super.onProcess() or not,
@@ -365,16 +366,16 @@ public interface Control extends Serializable {
     /**
      * The on render event handler. This event handler is invoked prior to the
      * control being rendered, and is useful for providing pre rendering logic.
-     * 
        
+     * 
        
      * The on render method is typically used to populate tables performing some
      * database intensive operation. By putting the intensive operations in the
      * on render method they will not be performed if the user navigates away
      * to a different page.
-     * 
        
+     * 
        
      * {@link org.apache.click.control.Container} implementations should recursively
      * invoke the onRender method on each of their child controls ensuring that
      * all controls receive this event.
-     * 
        
+     * 
        
      * Please note: a common problem when overriding onRender in
      * subclasses is forgetting to call super.onRender(). Consider
      * carefully whether you should call super.onRender() or not,
@@ -386,14 +387,14 @@ public interface Control extends Serializable {
     /**
      * The on destroy request event handler. Control classes should use this
      * method to add any resource clean up code.
-     * 
        
+     * 
        
      * This method is guaranteed to be called before the Page object reference
      * goes out of scope and is available for garbage collection.
-     * 
        
+     * 
        
      * {@link org.apache.click.control.Container} implementations should recursively
      * invoke the onDestroy method on each of their child controls ensuring that
      * all controls receive this event.
-     * 
        
+     * 
        
      * Please note: a common problem when overriding onDestroy in
      * subclasses is forgetting to call super.onDestroy(). Consider
      * carefully whether you should call super.onDestroy() or not,
@@ -406,7 +407,7 @@ public interface Control extends Serializable {
      * Render the control's HTML representation to the specified buffer. The
      * control's {@link java.lang.Object#toString()} method should delegate the
      * rendering to the render method for improved performance.
-     * 
        
+     * 
        
      * An example implementation:
      * 
              * public class Border extends AbstractContainer {
@@ -436,11 +437,11 @@ public interface Control extends Serializable {
     public void render(HtmlStringBuffer buffer);
 
     /**
-     * Returns true if this control has any
-     * Behaviors registered, false otherwise.
+     * Returns true if this control has any
+     * Behaviors registered, false otherwise.
      *
-     * @return true if this control has any
-     * Behaviors registered, false otherwise
+     * @return true if this control has any
+     * Behaviors registered, false otherwise
      */
     public boolean hasBehaviors();
 
@@ -452,22 +453,22 @@ public interface Control extends Serializable {
     public Set getBehaviors();
 
     /**
-     * Returns true if this control is an Ajax target, false
+     * Returns true if this control is an Ajax target, false
      * otherwise.
-     * 
        
+     * 
        
      * In order for a Control to be considered as an Ajax target it must be
      * registered through {@link org.apache.click.ControlRegistry#registerAjaxTarget(org.apache.click.Control) ControlRegistry.registerAjaxTarget}.
-     * 
        
+     * 
        
      * When the Click handles an Ajax request it iterates the Controls
      * registered with the {@link org.apache.click.ControlRegistry ControlRegistry}
      * and checks if one of them is the Ajax target by calling
-     * {@link #isAjaxTarget(org.openidentityplatform.openam.click.Context) isAjaxTarget}. If isAjaxTarget
+     * {@link #isAjaxTarget(org.openidentityplatform.openam.click.Context) isAjaxTarget}. If isAjaxTarget
      * returns true, Click will process that Control's {@link #getBehaviors() behaviors}.
-     * 
        
+     * 
        
      * Please note: there can only be one target control, so the first
      * Control that is identified as the Ajax target will be processed, the other
      * controls will be skipped.
-     * 
        
+     * 
        
      * The most common way to check whether a Control is the Ajax target is to
      * check if its {@link #getId ID} is available as a request parameter:
      *
@@ -486,10 +487,10 @@ public interface Control extends Serializable {
      * ID attribute, as that would lead to duplicate IDs, which isn't allowed by
      * the HTML specification. Control implementations has to cater for how the
      * control will be targeted. In the case of ActionLink it might check against
-     * its id, and if that isn't available check against its name.
+     * its id, and if that isn't available check against its name.
      *
      * @param context the request context
-     * @return true if this control is an Ajax target, false
+     * @return true if this control is an Ajax target, false
      * otherwise
      */
     public boolean isAjaxTarget(Context context);
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/ControlRegistry.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/ControlRegistry.java
index ecc271bb5e..1195abd8ba 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/ControlRegistry.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/ControlRegistry.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click;
@@ -32,16 +33,16 @@
 /**
  * Provides a centralized registry where Controls can be registered and interact
  * with the Click runtime.
- * 
        
+ * 
        
  * The primary use of the ControlRegistry is for Controls to register themselves
- * as potential targets of Ajax requests
- * (If a control is an Ajax request target, it's onProcess()
+ * as potential targets of Ajax requests
+ * (If a control is an Ajax request target, it's onProcess()
  * method is invoked while other controls are not processed).
- * 
        
+ * 
        
  * Registering controls as Ajax targets serves a dual purpose. In addition to
  * being potential Ajax targets, these controls will have all their Behaviors
  * processed by the Click runtime.
- * 
        
+ * 
        
  * Thus the ControlRegistry provides the Click runtime  with easy access to Controls
  * that want to be processed for Ajax requests. It also provides quick access
  * to Controls that have Behaviors, and particularly AjaxBehaviors that want to
@@ -139,7 +140,7 @@ public static ControlRegistry getThreadLocalRegistry() {
     /**
      * Returns true if a ControlRegistry instance is available on the current
      * thread, false otherwise.
-     * 
        
+     * 
        
      * Unlike {@link #getThreadLocalRegistry()} this method can safely be used
      * and will not throw an exception if a ControlRegistry is not available on
      * the current thread.
@@ -161,7 +162,7 @@ public static boolean hasThreadLocalRegistry() {
      * {@link Control#isAjaxTarget(Context)} method returns true.
      * Once a target control is identified, Click invokes its
      * {@link Control#onProcess()} method.
-     * 
        
+     * 
        
      * This method serves a dual purpose as all controls registered here
      * will also have their Behaviors (if any) processed. Processing
      * {@link Behavior Behaviors}
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/Page.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/Page.java
index aa65de9e1d..ec8f2e6d4c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/Page.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/Page.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click;
 
@@ -35,7 +36,7 @@
 
 /**
  * Provides the Page request event handler class.
- * 
        
+ * 
        
  * The Page class plays a central role in Click applications defining how the
  * application's pages are processed and rendered. All application pages
  * must extend the base Page class, and provide a no arguments constructor.
@@ -71,7 +72,7 @@
  *   after all the dependencies have been set. This is where you should put
  *   any "dynamic" page initialization code which depends upon the request or any
  *   other dependencies.
- *   
        
+ *   
        
  *   Form and field controls must be fully initialized by the time this method
  *   has completed.
  * 
@@ -82,7 +83,7 @@
  * 
  * 
      • 
  *   {@link #onGet()} method called for any additional GET related processing.
- *   
        
+ *   
        
  *   Form and field controls should NOT be created or initialized at this
  *   point as the control processing stage has already been completed.
  * 
        • 
@@ -90,7 +91,7 @@
  *   {@link #onRender()} method called for any pre-render processing. This
  *   method is often use to perform database queries to load information for
  *   rendering tables.
- *   
        
+ *   
        
  *   Form and field controls should NOT be created or initialized at this
  *   point as the control processing stage has already been completed.
  * 
@@ -109,12 +110,12 @@
  * For POST requests the default execution path is identical, except the
  * {@link #onPost()} method is called instead of {@link #onGet()}. The POST
  * request page execution sequence is illustrated below:
- * 
        
+ * 
        
  * 
  *
- * 
        
+ * 
        
  * A good way to see the page event execution order is to view the log when
- * the application mode is set to trace:
+ * the application mode is set to trace:
  *
  * 
          * [Click] [debug] GET http://localhost:8080/quickstart/home.htm
@@ -145,12 +146,12 @@ public class Page implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * The global page messages bundle name:   click-page.
+     * The global page messages bundle name:   click-page.
      */
     public static final String PAGE_MESSAGES = "click-page";
 
     /**
-     * The Page action request parameter:   "pageAction".
+     * The Page action request parameter:   "pageAction".
      */
     public final static String PAGE_ACTION = "pageAction";
 
@@ -217,17 +218,17 @@ public class Page implements Serializable {
      * The on Security Check event handler. This event handler is invoked after
      * the pages constructor has been called and all the page properties have
      * been set.
-     * 
        
+     * 
        
      * Security check provides the Page an opportunity to check the users
      * security credentials before processing the Page.
-     * 
        
+     * 
        
      * If security check returns true the Page is processed as
      * normal. If the method returns then no other event handlers are invoked
-     * (except onDestroy() and no page controls are processed.
-     * 
        
+     * (except onDestroy() and no page controls are processed.
+     * 
        
      * If the method returns false, the forward or redirect property should be
      * set to send the request to another Page.
-     * 
        
+     * 
        
      * By default this method returns true, subclass may override this method
      * to provide their security authorization/authentication mechanism.
      *
@@ -240,35 +241,35 @@ public boolean onSecurityCheck() {
     /**
      * The on Initialization event handler. This event handler is invoked after
      * the {@link #onInit()} method has been called.
-     * 
        
+     * 
        
      * Subclasses should place any initialization code which has dependencies
      * on the context or other properties in this method. Generally light
      * weight initialization code should be placed in the Pages constructor.
-     * 
        
+     * 
        
      * Time consuming operations such as fetching the results of a database
      * query should not be placed in this method. These operations should be
      * performed in the {@link #onRender()}, {@link #onGet()} or
      * {@link #onPost()} methods so that other event handlers may take
      * alternative execution paths without performing these expensive operations.
-     * 
        
+     * 
        
      * Please Note however the qualifier for the previous statement is
      * that all form and field controls must be fully initialized before they
-     * are processed, which is after the onInit() method has
-     * completed. After this point their onProcess() methods will be
-     * invoked by the ClickServlet.
-     * 
        
+     * are processed, which is after the onInit() method has
+     * completed. After this point their onProcess() methods will be
+     * invoked by the ClickServlet.
+     * 
        
      * Select controls in particular must have their option list values populated
      * before the form is processed otherwise field validations cannot be performed.
-     * 
        
+     * 
        
      * For initializing page controls the best practice is to place all the
      * control creation code in the pages constructor, and only place any
-     * initialization code in the onInit() method which has an external
+     * initialization code in the onInit() method which has an external
      * dependency to the context or some other object. By following this practice
      * it is easy to see what code is "design time" initialization code and what
      * is "runtime initialization code".
-     * 
        
-     * When subclassing pages which also use the onInit() method is
-     * is critical you call the super.onInit() method first, for
+     * 
        
+     * When subclassing pages which also use the onInit() method is
+     * is critical you call the super.onInit() method first, for
      * example:
      * 
              * public void onInit() {
@@ -284,11 +285,11 @@ public void onInit() {
     /**
      * The on Get request event handler. This event handler is invoked if the
      * HTTP request method is "GET".
-     * 
        
+     * 
        
      * The event handler is invoked after {@link #onSecurityCheck()} has been
      * called and all the Page {@link #controls} have been processed. If either
      * the security check or one of the controls cancels continued event
-     * processing the onGet() method will not be invoked.
+     * processing the onGet() method will not be invoked.
      *
      * 
        Important Note
        
      *
@@ -304,11 +305,11 @@ public void onGet() {
     /**
      * The on Post request event handler. This event handler is invoked if the
      * HTTP request method is "POST".
-     * 
        
+     * 
        
      * The event handler is invoked after {@link #onSecurityCheck()} has been
      * called and all the Page {@link #controls} have been processed. If either
      * the security check or one of the controls cancels continued event
-     * processing the onPost() method will not be invoked.
+     * processing the onPost() method will not be invoked.
      *
      * 
        Important Note
        
      *
@@ -324,17 +325,17 @@ public void onPost() {
     /**
      * The on render event handler. This event handler is invoked prior to the
      * page being rendered.
-     * 
        
+     * 
        
      * This method will not be invoked if either the security check or one of
      * the controls cancels continued event processing.
-     * 
        
+     * 
        
      * The on render method is typically used to populate tables performing some
      * database intensive operation. By putting the intensive operations in the
      * on render method they will not be performed if the user navigates away
      * to a different page.
-     * 
        
-     * If you have code which you are using in both the onGet() and
-     * onPost() methods, use the onRender() method instead.
+     * 
        
+     * If you have code which you are using in both the onGet() and
+     * onPost() methods, use the onRender() method instead.
      *
      * 
        Important Note
        
      *
@@ -350,7 +351,7 @@ public void onRender() {
     /**
      * The on Destroy request event handler. Subclasses may override this method
      * to add any resource clean up code.
-     * 
        
+     * 
        
      * This method is guaranteed to be called before the Page object reference
      * goes out of scope and is available for garbage collection.
      */
@@ -363,7 +364,7 @@ public void onDestroy() {
      * Add the control to the page. The control will be added to the page model
      * using the control name as the key. The Controls parent property will
      * also be set to the page instance.
-     * 
        
+     * 
        
      * Please note: if the page contains a control with the same name as
      * the given control, that control will be replaced by the given control.
      * If a control has no name defined it cannot be replaced.
@@ -450,12 +451,12 @@ public Context getContext() {
 
     /**
      * Return the HTTP response content type. By default this method returns
-     * "text/html".
-     * 
        
+     * "text/html".
+     * 
        
      * If the request specifies a character encoding via
      * If {@link jakarta.servlet.ServletRequest#getCharacterEncoding()}
-     * then this method will return "text/html; charset=encoding".
-     * 
        
+     * then this method will return "text/html; charset=encoding".
+     * 
        
      * The ClickServlet uses the pages content type for setting the
      * HttpServletResponse content type.
      *
@@ -474,9 +475,9 @@ public String getContentType() {
 
     /**
      * Return the Velocity template formatter object.
-     * 
        
+     * 
        
      * The ClickServlet adds the format object to the Velocity context using
-     * the key "format" so that it can be used in the page template.
+     * the key "format" so that it can be used in the page template.
      *
      * @return the Velocity template formatter object
      */
@@ -495,12 +496,12 @@ public void setFormat(Format value) {
 
     /**
      * Return the path to forward the request to.
-     * 
        
+     * 
        
      * If the {@link #forward} property is not null it will be used to forward
      * the request to in preference to rendering the template defined by the
      * {@link #path} property. The request is forwarded using the
      * RequestDispatcher.
-     * 
        
+     * 
        
      * See also {@link #getPath()}, {@link #getRedirect()}
      *
      * @return the path to forward the request to
@@ -511,18 +512,18 @@ public String getForward() {
 
     /**
      * Set the path to forward the request to.
-     * 
        
+     * 
        
      * If the {@link #forward} property is not null it will be used to forward
      * the request to in preference to rendering the template defined by the
      * {@link #path} property. The request is forwarded using the Servlet
      * RequestDispatcher.
-     * 
        
+     * 
        
      * If forward paths start with a "/"
      * character the forward path is
      * relative to web applications root context, otherwise the path is
      * relative to the requests current location.
-     * 
        
-     * For example given a web application deployed to context mycorp
+     * 
        
+     * For example given a web application deployed to context mycorp
      * with the pages:
      * 
              *  /index.htm
@@ -530,17 +531,17 @@ public String getForward() {
      *  /customer/details.htm
      *  /customer/management/add-customer.htm 
        
      *
-     * To forward to the customer search.htm page from
+     * To forward to the customer search.htm page from
      * the web app root you could set forward as
-     * setForward("/customer/search.htm")
-     * or setForward("customer/search.htm").
-     * 
        
-     * If a user was currently viewing the add-customer.htm
+     * setForward("/customer/search.htm")
+     * or setForward("customer/search.htm").
+     * 
        
+     * If a user was currently viewing the add-customer.htm
      * to forward to customer details.htm you could
      * set forward as
-     * setForward("/customer/details.htm")
-     * or setForward("../details.htm").
-     * 
        
+     * setForward("/customer/details.htm")
+     * or setForward("../details.htm").
+     * 
        
      * See also {@link #setPath(String)}, {@link #setRedirect(String)}
      *
      * @param value the path to forward the request to
@@ -651,13 +652,13 @@ public final String getHtmlImports() {
      * {@link org.apache.click.element.JsScript JsScript},
      * {@link org.apache.click.element.CssImport CssImport} and
      * {@link org.apache.click.element.CssStyle CssStyle}.
-     * 
        
+     * 
        
      * Pages can contribute their own list of HEAD elements by overriding
      * this method.
-     * 
        
+     * 
        
      * The recommended approach when overriding this method is to use
-     * lazy loading to ensure the HEAD elements are only added
-     * once and when needed. For example:
+     * lazy loading to ensure the HEAD elements are only added
+     * once and when needed. For example:
      *
      * 
              * public MyPage extends Page {
@@ -698,13 +699,13 @@ public final String getHtmlImports() {
      * One can also add HEAD elements from event handler methods such as
      * {@link #onInit()}, {@link #onGet()}, {@link #onPost()}, {@link #onRender()}
      * etc.
-     * 
        
+     * 
        
      * The order in which JS and CSS files are included will be preserved in the
      * page.
-     * 
        
+     * 
        
      * Note: this method must never return null. If no HEAD elements
      * are available this method must return an empty {@link java.util.List}.
-     * 
        
+     * 
        
      * Also note: a common problem when overriding getHeadElements in
      * subclasses is forgetting to call super.getHeadElements. Consider
      * carefully whether you should call super.getHeadElements or not.
@@ -722,11 +723,11 @@ public List getHeadElements() {
      * Return the localized Page resource message for the given resource
      * name or null if not found. The resource message returned will use the
      * Locale obtained from the Context.
-     * 
        
+     * 
        
      * Pages can define text properties files to store localized messages. These
      * properties files must be stored on the Page class path with a name
      * matching the class name. For example:
-     * 
        
+     * 
        
      * The page class:
      * 
              *  package com.mycorp.pages;
@@ -746,13 +747,13 @@ public List getHeadElements() {
      * 
              *  /click-page.properties 
        
      *
-     * To define global page messages simply add click-page.properties
+     * To define global page messages simply add click-page.properties
      * file to your application's class path. Message defined in this properties
      * file will be available to all of your application pages.
-     * 
        
+     * 
        
      * Note messages in your page class properties file will override any
-     * messages in the global click-page.properties file.
-     * 
        
+     * messages in the global click-page.properties file.
+     * 
        
      * Page messages can be accessed directly in the page template using
      * the $messages reference. For examples:
      *
@@ -777,7 +778,7 @@ public String getMessage(String name) {
      * Return the formatted page message for the given resource name and
      * message format arguments or null if no message was found. The resource
      * message returned will use the Locale obtained from the Context.
-     * 
        
+     * 
        
      * {@link #getMessage(java.lang.String)} is invoked to retrieve the message
      * for the specified name.
      *
@@ -816,7 +817,7 @@ public Map getMessages() {
 
     /**
      * Add the named object value to the Pages model map.
-     * 
        
+     * 
        
      * Please note: if the Page contains an object with a matching name,
      * that object will be replaced by the given value.
      *
@@ -852,20 +853,20 @@ public Map getModel() {
 
     /**
      * Return the Page header imports.
-     * 
        
+     * 
        
      * PageImports are used define the CSS and JavaScript imports and blocks
      * to be included in the page template.
-     * 
        
+     * 
        
      * The PageImports object will be included in the Page template when the
      * following methods are invoked:
      * 
          
      * 
        • {@link ClickServlet#createTemplateModel(Page)} - for template pages
          • 
      * 
        • {@link ClickServlet#setRequestAttributes(Page)} - for JSP pages
          • 
      * 
        
-     * 
        
+     * 
        
      * If you need to tailor the page imports rendered, override this method
      * and modify the PageImports object returned.
-     * 
        
+     * 
        
      * If you need to create a custom PageImports, override the method
      * {@link ClickServlet#createPageImports(org.openidentityplatform.openam.click.Page)}
      *
@@ -879,21 +880,21 @@ public PageImports getPageImports() {
 
     /**
      * Set the Page header imports.
-     * 
        
+     * 
        
      * PageImports are used define the CSS and JavaScript imports and blocks
      * to be included in the page template.
-     * 
        
+     * 
        
      * The PageImports references will be included in the Page model when the
      * following methods are invoked:
      * 
          
      * 
        • {@link ClickServlet#createTemplateModel(Page)} - for template pages
          • 
      * 
        • {@link ClickServlet#setRequestAttributes(Page)} - for JSP pages
          • 
      * 
        
-     * 
        
+     * 
        
      * If you need to tailor the page imports rendered, override the
      * {@link #getPageImports()} method and modify the PageImports object
      * returned.
-     * 
        
+     * 
        
      * If you need to create a custom PageImports, override the method
      * {@link ClickServlet#createPageImports(org.openidentityplatform.openam.click.Page)}
      *
@@ -907,11 +908,11 @@ public void setPageImports(PageImports pageImports) {
 
     /**
      * Return the path of the Template or JSP to render.
-     * 
        
-     * If this method returns null, Click will not perform any rendering.
+     * 
        
+     * If this method returns null, Click will not perform any rendering.
      * This is useful when you want to stream or write directly to the
      * HttpServletResponse.
-     * 
        
+     * 
        
      * See also {@link #getForward()}, {@link #getRedirect()}
      *
      * @return the path of the Template or JSP to render
@@ -922,13 +923,12 @@ public String getPath() {
 
     /**
      * Set the path of the Template or JSP to render.
-     * 
        
+     * 
        
      * By default Click will set the path to the requested page url. Meaning
-     * if the url /edit-customer.htm is requested, path will be set
-     * to /edit-customer.htm.
-     * 
        
+     * if the url /edit-customer.htm is requested, path will be set
+     * to /edit-customer.htm.
+     * 
        
      * Here is an example if you want to change the path to a different Template:
-     * 
        
      * 
              * public void onGet() {
      *     setPath("/some-other-template.htm");
@@ -938,11 +938,11 @@ public String getPath() {
      * public void onGet() {
      *     setPath("/some-other-jsp.jsp");
      * }
        
-     * 
        
-     * If path is set to null, Click will not perform any rendering.
+     * 
        
+     * If path is set to null, Click will not perform any rendering.
      * This is useful when you want to stream or write directly to the
      * HttpServletResponse.
-     * 
        
+     * 
        
      * See also {@link #setForward(String)}, {@link #setRedirect(String)}
      *
      * @param value the path of the Template or JSP to render
@@ -953,12 +953,12 @@ public void setPath(String value) {
 
     /**
      * Return the path to redirect the request to.
-     * 
        
+     * 
        
      * If the {@link #redirect} property is not null it will be used to redirect
      * the request in preference to {@link #forward} or {@link #path} properties.
      * The request is redirected to using the HttpServletResponse.setRedirect()
      * method.
-     * 
        
+     * 
        
      * See also {@link #getForward()}, {@link #getPath()}
      *
      * @return the path to redirect the request to
@@ -984,17 +984,17 @@ public boolean isStateful() {
     /**
      * Set whether the page is stateful and should be saved in the users
      * HttpSession between requests.
-     * 
        
+     * 
        
      * Click will synchronize on the page instance. This ensures that if
      * multiple requests arrive from the same user for the page, only one
      * request can access the page at a time.
-     * 
        
+     * 
        
      * Stateful pages are stored in the HttpSession using the key
-     * page.getClass().getName().
-     * 
        
+     * page.getClass().getName().
+     * 
        
      * It is worth noting that Click checks a Page's stateful property after
      * each request. Thus it becomes possible to enable a stateful Page for a
-     * number of requests and then setting it to false again at which
+     * number of requests and then setting it to false again at which
      * point Click will remove the Page from the HttpSession, freeing up memory
      * for the server.
      *
@@ -1027,15 +1027,15 @@ public boolean isIncludeControlHeadElements() {
     /**
      * Set whether the Control head elements should be included in the page
      * template.
-     * 
        
-     * By setting this value to false, Click won't include Control's
+     * 
        
+     * By setting this value to false, Click won't include Control's
      * {@link #getHeadElements() head elements}, however the Page head elements
      * will still be included.
-     * 
        
+     * 
        
      * This allows one to create a single JavaScript and CSS resource file for
      * the entire Page which increases performance, since the browser only has
      * to load one resource, instead of multiple resources.
-     * 
        
+     * 
        
      * Below is an example:
      *
      * 
        @@ -1077,43 +1077,43 @@ public void setIncludeControlHeadElements(boolean includeControlHeadElements) {
 
     /**
      * Set the location to redirect the request to.
-     * 
        
+     * 
        
      * If the {@link #redirect} property is not null it will be used to redirect
      * the request in preference to the {@link #forward} and {@link #path}
      * properties. The request is redirected using the HttpServletResponse.setRedirect()
      * method.
-     * 
        
-     * If the redirect location begins with a "/"
+     * 
        
+     * If the redirect location begins with a "/"
      * character the redirect location will be prefixed with the web applications
-     * context path. Note if the given location is already prefixed
-     * with the context path, Click won't add it a second time.
-     * 
        
+     * context path. Note if the given location is already prefixed
+     * with the context path, Click won't add it a second time.
+     * 
        
      * For example if an application is deployed to the context
-     * "mycorp" calling
-     * setRedirect("/customer/details.htm")
+     * "mycorp" calling
+     * setRedirect("/customer/details.htm")
      * will redirect the request to:
-     * "/mycorp/customer/details.htm"
-     * 
        
-     * If the redirect location does not begin with a "/"
+     * "/mycorp/customer/details.htm"
+     * 
        
+     * If the redirect location does not begin with a "/"
      * character the redirect location will be used as specified. Thus if the
-     * location is http://somehost.com/myapp/customer.jsp,
+     * location is http://somehost.com/myapp/customer.jsp,
      * Click will redirect to that location.
-     * 
        
+     * 
        
      * JSP note: when redirecting to a JSP template keep in mind that the
      * JSP template won't be processed by Click, as ClickServlet is mapped to
      * *.htm. Instead JSP templates are processed by the Servlet
      * container JSP engine.
-     * 
        
+     * 
        
      * So if you have a situation where a Page Class
      * (Customer.class) is mapped to the JSP
      * ("/customer.jsp") and you want to redirect to
      * Customer.class, you could either redirect to
      * ("/customer.htm") or
      * use the alternative redirect utility {@link #setRedirect(java.lang.Class)}.
-     * 
        
+     * 
        
      * Please note that Click will url encode the location by invoking
-     * response.encodeRedirectURL(location) before redirecting.
-     * 
        
+     * response.encodeRedirectURL(location) before redirecting.
+     * 
        
      * See also {@link #setRedirect(java.lang.String, java.util.Map)},
      * {@link #setForward(String)}, {@link #setPath(String)}
      *
@@ -1139,7 +1139,7 @@ public void setRedirect(Class pageClass) {
     /**
      * Set the request to redirect to the given location and append
      * the map of request parameters to the location URL.
-     * 
        
+     * 
        
      * The map keys will be used as the request parameter names and the map
      * values will be used as the request parameter values. For example:
      *
@@ -1239,7 +1239,7 @@ public void setRedirect(String location, Map params) {
     /**
      * Set the request to redirect to the given page class and and append
      * the map of request parameters to the page URL.
-     * 
        
+     * 
        
      * The map keys will be used as the request parameter names and the map
      * values will be used as the request parameter values.
      *
@@ -1268,7 +1268,7 @@ public void setRedirect(Class pageClass,
     /**
      * Return the path of the page border template to render, by default this
      * method returns {@link #getPath()}.
-     * 
        
+     * 
        
      * Pages can override this method to return an alternative border page
      * template. This is very useful when implementing an standardized look and
      * feel for a web site. The example below provides a BorderedPage base Page
@@ -1314,7 +1314,7 @@ public String getTemplate() {
 
     /**
      * Set the page border template path.
-     * 
        
+     * 
        
      * Note: if this value is not set, {@link #getTemplate()} will default
      * to {@link #getPath()}.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/PageInterceptor.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/PageInterceptor.java
index 42b4829629..ca145933a6 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/PageInterceptor.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/PageInterceptor.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click;
 
@@ -22,7 +23,7 @@
  * Provides a Page life cycle interceptor. Classes implementing this interface
  * can be used to listen for key page life cycle events and abort further page
  * processing if required.
- * 
        
+ * 
        
  * PageInterceptors can be used for many different purposes including:
  * 
          
  * 
        • enforcing application wide page security policies
          • 
@@ -31,37 +32,37 @@
  * 
        
  *
  * A Click application can define multiple page interceptors that are invoked in
- * the order in which they are returned by the ConfigService.
+ * the order in which they are returned by the ConfigService.
  *
- * 
        Scope
        
+ * 
        Scope
        
  *
  * Page interceptors can be defined with a request level scope, whereby a new
  * page interceptor will be created with each page request providing a thread
  * safe programming model.
- * 
        
+ * 
        
  * Please note, as new interceptor instances are created with each request, care
  * should be taken to ensure that these objects are light weight and do not
  * introduce a performance bottleneck into your application.
- * 
        
+ * 
        
  * Alternatively, page interceptors can be defined with application level scope
  * whereby a single instance is created for the application and is used for
  * all requests.
- * 
        
+ * 
        
  * Note application scope interceptors are more efficient that request scope
  * interceptors, but you are responsible for ensuring that they are thread safe
  * and support reentrant method invocations as multiple page requests are
  * processed at the same time.
  *
- * 
        Configuration
        
+ * 
        Configuration
        
  *
- * Application PageInterceptors are configured in the click.xml
+ * Application PageInterceptors are configured in the click.xml
  * configuration file. PageInterceptors must support construction using a
  * no-args public constructor.
- * 
        
+ * 
        
  * Page interceptors can have multiple properties configured with their XML
  * definition which are set after the constructor has been called. Properties
  * are set using OGNL via {@link org.apache.click.util.PropertyUtils}.
- * 
        
+ * 
        
  * An example configuration is provided below:
  *
  * 
        @@ -73,7 +74,7 @@
  * The default scope for page interceptors is "request", but this can be configured
  * as "application" as is done in the example configuration above.
  *
- * 
        Example
        
+ * 
        Example
        
  *
  * 
          * public class SecurityInterceptor implements PageInterceptor {
@@ -93,7 +94,7 @@
  *
  *       // TODO: user context check.
  *
- *       if (authentication != null && authentication.required()) {
+ *       if (authentication != null && authentication.required()) {
  *          sendRedirect(getNotAuthenticatedPath(), context);
  *          return false;
  *       }
@@ -197,11 +198,11 @@ public interface PageInterceptor {
      * Provides a post page object creation interceptor method, which is passed
      * the instance of the newly created page. This interceptor method is called
      * before the page {@link Page#onSecurityCheck()} method is invoked.
-     * 
        
+     * 
        
      * If this method returns true then the normal page processing is performed,
      * otherwise if this method returns false the request is considered to have
      * been handled.
-     * 
        
+     * 
        
      * Please note the page {@link Page#onDestroy()} method will still be invoked.
      *
      * @param page the newly instantiated page instance
@@ -213,11 +214,11 @@ public interface PageInterceptor {
     /**
      * Provides a page interceptor before response method. This method is invoked
      * prior to the page redirect, forward or rendering phase.
-     * 
        
+     * 
        
      * If this method returns true then the normal page processing is performed,
      * otherwise if this method returns false request is considered to have been
      * handled.
-     * 
        
+     * 
        
      * Please note the page {@link Page#onDestroy()} method will still be invoked.
      *
      * @param page the newly instantiated page instance
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/ajax/AjaxBehavior.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/ajax/AjaxBehavior.java
index fac9f69b4e..6b6c64f315 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/ajax/AjaxBehavior.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/ajax/AjaxBehavior.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.ajax;
@@ -28,16 +29,16 @@
 /**
  * AjaxBehavior extends the basic Behavior functionality to allow Controls to
  * handle and process incoming Ajax requests.
- * 
        
+ * 
        
  * To handle an Ajax request, AjaxBehavior exposes the listener method:
  * {@link #onAction(org.openidentityplatform.openam.click.Control) onAction}.
- * The onAction method returns an ActionResult that is rendered back
+ * The onAction method returns an ActionResult that is rendered back
  * to the browser.
- * 
        
- * Before Click invokes the onAction method it checks whether the request
+ * 
        
+ * Before Click invokes the onAction method it checks whether the request
  * is targeted at the AjaxBehavior by invoking the method
  * {@link #isAjaxTarget(org.openidentityplatform.openam.click.Context) Behavior.isAjaxTarget()}.
- * Click will only invoke onAction if isAjaxTarget returns true.
+ * Click will only invoke onAction if isAjaxTarget returns true.
  */
 public interface AjaxBehavior extends Behavior {
 
@@ -64,15 +65,15 @@ public interface AjaxBehavior extends Behavior {
 
     /**
      * Return true if the behavior is the request target, false otherwise.
-     * 
        
+     * 
        
      * This method is queried by Click to determine if the behavior's
      * {@link #onAction(org.openidentityplatform.openam.click.Control)} method should be called in
      * response to a request.
-     * 
        
+     * 
        
      * By exposing this method through the Behavior interface it provides
      * implementers with fine grained control over whether the Behavior's
      * {@link #onAction(org.openidentityplatform.openam.click.Control)} method should be invoked or not.
-     * 
        
+     * 
        
      * Below is an example implementation:
      *
      * 
        diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractContainer.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractContainer.java
index fa553be154..ccda6c98af 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractContainer.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractContainer.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -31,10 +32,10 @@
 /**
  * Provides a default implementation of the {@link org.openidentityplatform.openam.click.control.Container} interface
  * to make it easier for developers to create their own containers.
- * 
        
+ * 
        
  * Subclasses can override {@link #getTag()} to return a specific HTML element.
- * 
        
- * The following example shows how to create an HTML div element:
+ * 
        
+ * The following example shows how to create an HTML div element:
  *
  * 
          * public class Div extends AbstractContainer {
@@ -80,13 +81,14 @@ public AbstractContainer(String name) {
     // Public Methods ---------------------------------------------------------
 
     /**
-     * @see org.openidentityplatform.openam.click.control.Container#add(Control).
-     * 
        
+     * Adds the given control to the container and returns it.
+     * 
        
      * Please note: if the container contains a control with the same name
      * as the given control, that control will be
      * {@link #replace(Control, Control) replaced}
      * by the given control. If a control has no name defined it cannot be replaced.
      *
+     * @see org.openidentityplatform.openam.click.control.Container#add(Control)
      * @param control the control to add to the container
      * @return the control that was added to the container
      * @throws IllegalArgumentException if the control is null
@@ -98,12 +100,12 @@ public Control add(Control control) {
     /**
      * Add the control to the container at the specified index, and return the
      * added instance.
-     * 
        
+     * 
        
      * Please note: if the container contains a control with the same name
      * as the given control, that control will be
      * {@link #replace(Control, Control) replaced}
      * by the given control. If a control has no name defined it cannot be replaced.
-     * 
        
+     * 
        
      * Also note if the specified control already has a parent assigned,
      * it will automatically be removed from that parent and inserted into this
      * container.
@@ -118,7 +120,7 @@ public Control add(Control control) {
      * and container is the same instance
      *
      * @throws IndexOutOfBoundsException if index is out of range
-     * (index < 0 || index > getControls().size())
+     * (index < 0 || index > getControls().size())
      */
     public Control insert(Control control, int index) {
         // Check if panel already contains the control
@@ -146,7 +148,7 @@ public Control insert(Control control, int index) {
     }
 
     /**
-     * @seeorg.openidentityplatform.openam.click.control.Container#remove(Control).
+     * @see org.openidentityplatform.openam.click.control.Container#remove(Control)
      *
      * @param control the control to remove from the container
      * @return true if the control was removed from the container
@@ -181,7 +183,7 @@ public Control replace(Control currentControl, Control newControl) {
     }
 
     /**
-     * @see org.apache.click.control.Container#getControls().
+     * @see org.apache.click.control.Container#getControls()
      *
      * @return the sequential list of controls held by the container
      */
@@ -227,7 +229,7 @@ public boolean hasControls() {
     /**
      * Return the map of controls where each map's key / value pair will consist
      * of the control name and instance.
-     * 
        
+     * 
        
      * Controls added to the container that did not specify a {@link #name},
      * will not be included in the returned map.
      *
@@ -241,7 +243,7 @@ public Map getControlMap() {
     }
 
     /**
-     * @see org.openidentityplatform.openam.click.control.AbstractControl#getControlSizeEst().
+     * @see org.openidentityplatform.openam.click.control.AbstractControl#getControlSizeEst()
      *
      * @return the estimated rendered control size in characters
      */
@@ -261,7 +263,7 @@ public int getControlSizeEst() {
     }
 
     /**
-     * @see Control#onProcess().
+     * @see Control#onProcess()
      *
      * @return true to continue Page event processing or false otherwise
      */
@@ -319,10 +321,9 @@ public void onRender() {
     /**
      * Render the HTML representation of the container and all its child
      * controls to the specified buffer.
-     * 
        
+     * 
        
      * If {@link #getTag()} returns null, this method will render only its
      * child controls.
-     * 
        
      * @see org.openidentityplatform.openam.click.control.AbstractControl#render(HtmlStringBuffer)
      *
      * @param buffer the specified buffer to render the control's output to
@@ -349,7 +350,7 @@ public void render(HtmlStringBuffer buffer) {
 
     /**
      * Returns the HTML representation of this control.
-     * 
        
+     * 
        
      * This method delegates the rendering to the method
      * {@link #render(HtmlStringBuffer)}. The size of buffer
      * is determined by {@link #getControlSizeEst()}.
@@ -368,7 +369,7 @@ public String toString() {
     // Protected Methods ------------------------------------------------------
 
     /**
-     * @see AbstractControl#renderTagEnd(String, HtmlStringBuffer).
+     * @see AbstractControl#renderTagEnd(String, HtmlStringBuffer)
      *
      * @param tagName the name of the tag to close
      * @param buffer the buffer to append the output to
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractControl.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractControl.java
index a651f26699..c4a212909c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractControl.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractControl.java
@@ -17,6 +17,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 import java.text.MessageFormat;
@@ -48,13 +49,13 @@
 /**
  * Provides a default implementation of the {@link Control} interface
  * to make it easier for developers to create their own controls.
- * 
        
+ * 
        
  * Subclasses are expected to at least override {@link #getTag()}
  * to differentiate the control. However some controls do not map cleanly
  * to an html tag, in which case you can override
  * {@link #render(org.openidentityplatform.openam.click.util.HtmlStringBuffer)} for complete control
  * over the output.
- * 
        
+ * 
        
  * Below is an example of creating a new control called MyField:
  * 
          * public class MyField extends AbstractControl {
@@ -85,12 +86,12 @@
  * }
  * 
        
  * By overriding {@link #getTag()} one can specify the html tag to render.
- * 
        
+ * 
        
  * Overriding {@link #onProcess()} allows one to bind the servlet request
  * parameter to MyField value. The {@link #dispatchActionEvent()} method
  * registers the listener for this control on the Context. Once the onProcess
  * event has finished, all registered listeners will be fired.
- * 
        
+ * 
        
  * To view the html rendered by MyField invoke the control's {@link #toString()}
  * method:
  *
@@ -115,7 +116,7 @@
  * Also see {@link org.apache.click.Control} javadoc for an explanation of the
  * Control execution sequence.
  *
- * 
        Message Resources and Internationalization (i18n)
        
+ * 
        Message Resources and Internationalization (i18n)
        
  *
  * Controls support a hierarchy of resource bundles for displaying messages.
  * These localized messages can be accessed through the methods:
@@ -198,13 +199,13 @@ public AbstractControl(String name) {
 
     /**
      * Returns the controls html tag.
-     * 
        
+     * 
        
      * Subclasses should override this method and return the correct tag.
-     * 
        
-     * This method returns null by default.
-     * 
        
-     * Example tags include table, form, a and
-     * input.
+     * 
        
+     * This method returns null by default.
+     * 
        
+     * Example tags include table, form, a and
+     * input.
      *
      * @return this controls html tag
      */
@@ -243,26 +244,26 @@ public void setActionListener(ActionListener listener) {
     }
 
     /**
-     * Returns true if this control has any
-     * Behaviors registered, false otherwise.
+     * Returns true if this control has any
+     * Behaviors registered, false otherwise.
      *
-     * @return true if this control has any Behaviors registered,
-     * false otherwise
+     * @return true if this control has any Behaviors registered,
+     * false otherwise
      */
     public boolean hasBehaviors() {
         return (behaviors != null && !behaviors.isEmpty());
     }
 
     /**
-     * Add the given Behavior to the control's Set of
+     * Add the given Behavior to the control's Set of
      * {@link #getBehaviors() Behaviors}.
-     * 
        
+     * 
        
      * In addition, the Control will be registered with the
      * {@link org.apache.click.ControlRegistry#registerAjaxTarget(org.apache.click.Control) ControlRegistry}
-     * as a potential Ajax target control and to have it's
-     * Behaviors processed by the Click runtime.
+     * as a potential Ajax target control and to have it's
+     * Behaviors processed by the Click runtime.
      *
-     * @param behavior the Behavior to add
+     * @param behavior the Behavior to add
      */
     public void addBehavior(Behavior behavior) {
         if (behavior == null) {
@@ -278,19 +279,19 @@ public void addBehavior(Behavior behavior) {
     }
 
     /**
-     * Remove the given Behavior from the Control's Set of
+     * Remove the given Behavior from the Control's Set of
      * {@link #getBehaviors() Behaviors}.
      *
-     * @param behavior the Behavior to remove
+     * @param behavior the Behavior to remove
      */
     public void removeBehavior(Behavior behavior) {
         getBehaviors().remove(behavior);
     }
 
     /**
-     * Returns the Set of Behaviors for this control.
+     * Returns the Set of Behaviors for this control.
      *
-     * @return the Set of Behaviors for this control
+     * @return the Set of Behaviors for this control
      */
     public Set getBehaviors() {
         if (behaviors == null) {
@@ -300,14 +301,14 @@ public Set getBehaviors() {
     }
 
     /**
-     * Returns true if this control is an AJAX target, false
+     * Returns true if this control is an AJAX target, false
      * otherwise.
-     * 
        
+     * 
        
      * The control is defined as an Ajax target if the control {@link #getId() ID}
      * is send as a request parameter.
      *
      * @param context the request context
-     * @return true if this control is an AJAX target, false
+     * @return true if this control is an AJAX target, false
      * otherwise
      */
     public boolean isAjaxTarget(Context context) {
@@ -341,7 +342,7 @@ public String getAttribute(String name) {
      * Set the control attribute with the given attribute name and value. You would
      * generally use attributes if you were creating the entire Control
      * programmatically and rendering it with the {@link #toString()} method.
-     * 
        
+     * 
        
      * For example given the ActionLink:
      *
      * 
        @@ -352,7 +353,7 @@ public String getAttribute(String name) {
      * 
              * <a href=".." target="_blank">Add</a> 
        
      *
-     * Note: for style and class attributes you can
+     * Note: for style and class attributes you can
      * also use the methods {@link #setStyle(String, String)} and
      * {@link #addStyleClass(String)}.
      *
@@ -468,14 +469,14 @@ public void setId(String id) {
      * Return the localized message for the given key or null if not found.
      * The resource message returned will use the Locale obtained from the
      * Context.
-     * 
        
+     * 
        
      * This method will attempt to lookup the localized message in the
      * parent's messages, which resolves to the Page's resource bundle.
-     * 
        
+     * 
        
      * If the message was not found, this method will attempt to look up the
-     * value in the /click-control.properties message properties file,
+     * value in the /click-control.properties message properties file,
      * through the method {@link #getMessages()}.
-     * 
        
+     * 
        
      * If still not found, this method will return null.
      *
      * @param name the name of the message resource
@@ -501,7 +502,7 @@ public String getMessage(String name) {
      * Return the formatted message for the given resource name and message
      * format arguments or null if no message was found. The resource
      * message returned will use the Locale obtained from the Context.
-     * 
        
+     * 
        
      * {@link #getMessage(java.lang.String)} is invoked to retrieve the message
      * for the specified name.
      *
@@ -546,7 +547,7 @@ public Object getParent() {
      *
      * @param parent the parent of the Control
      * @throws IllegalArgumentException if the given parent instance is
-     * referencing this object: if (parent == this)
+     * referencing this object: if (parent == this)
      */
     public void setParent(Object parent) {
         if (parent == this) {
@@ -567,13 +568,13 @@ public boolean onProcess() {
 
     /**
      * Set the controls event listener.
-     * 
        
+     * 
        
      * The method signature of the listener is:
          
      * 
        • must have a valid Java method name
          • 
      * 
        • takes no arguments
          • 
      * 
        • returns a boolean value
          • 
      * 
        
-     * 
        
+     * 
        
      * An example event listener method would be:
      *
      * 
        @@ -679,7 +680,7 @@ public String getStyle(String name) {
 
     /**
      * Set the control CSS style name and value pair.
-     * 
        
+     * 
        
      * For example given the ActionLink:
      *
      * 
        @@ -691,7 +692,7 @@ public String getStyle(String name) {
      * 
              * <a href=".." style="color:red;border:1px solid black;">Add</a>
      * 
        
-     * To remove an existing style, set the value to null.
+     * To remove an existing style, set the value to null.
      *
      * @param name the CSS style name
      * @param value the CSS style value
@@ -781,7 +782,7 @@ public Map getStyles() {
 
     /**
      * Add the CSS class attribute. Null values will be ignored.
-     * 
        
+     * 
        
      * For example given the ActionLink:
      *
      * 
        @@ -878,10 +879,9 @@ public void removeStyleClass(String value) {
 
     /**
      * Render the control's output to the specified buffer.
-     * 
        
+     * 
        
      * If {@link #getTag()} returns null, this method will return an empty
      * string.
-     * 
        
      * @see org.apache.click.Control#render(org.apache.click.util.HtmlStringBuffer)
      *
      * @param buffer the specified buffer to render the control's output to
@@ -896,7 +896,7 @@ public void render(HtmlStringBuffer buffer) {
 
     /**
      * Returns the HTML representation of this control.
-     * 
        
+     * 
        
      * This method delegates the rendering to the method
      * {@link #render(org.openidentityplatform.openam.click.util.HtmlStringBuffer)}. The size of buffer
      * is determined by {@link #getControlSizeEst()}.
@@ -946,14 +946,14 @@ protected void appendAttributes(HtmlStringBuffer buffer) {
 
     /**
      * Render the tag and common attributes including {@link #getId() id},
-     * class and style. The {@link #getName() name} attribute
+     * class and style. The {@link #getName() name} attribute
      * is not rendered by this control. It is up to subclasses
      * whether to render the name attribute or not. Generally only
      * {@link org.apache.click.control.Field} controls render the name attribute.
-     * 
        
+     * 
        
      * Please note: the tag will not be closed by this method. This
      * enables callers of this method to append extra attributes as needed.
-     * 
        
+     * 
        
      * For example the following example:
      *
      * 
        diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractLink.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractLink.java
index e920367086..39bfe235cf 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractLink.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/AbstractLink.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -34,9 +35,9 @@
 
 /**
  * Provides a Abstract Link control:   <a href=""></a>.
- * 
        
+ * 
        
  * See also the W3C HTML reference:
- * A Links
  *
  * @see ActionLink
@@ -53,9 +54,9 @@ public abstract class AbstractLink extends AbstractControl implements Stateful {
 
     /**
      * The image src path attribute.  If the image src is defined then a
-     * <img/> element will rendered inside the anchor link when
+     * <img/> element will rendered inside the anchor link when
      * using the AbstractLink {@link #toString()} method.
-     * 
        
+     * 
        
      * If the image src value is prefixed with '/' then the request context path
      * will be prefixed to the src value when rendered by the control.
      */
@@ -90,7 +91,7 @@ public AbstractLink(String name) {
 
     /**
      * Create an AbstractLink with no name defined.
-     * 
        
+     * 
        
      * Please note the control's name must be defined before it is valid.
      */
     public AbstractLink() {
@@ -99,7 +100,7 @@ public AbstractLink() {
     // Public Attributes ------------------------------------------------------
 
     /**
-     * Return the link html tag: a.
+     * Return the link html tag: a.
      *
      * @see AbstractControl#getTag()
      *
@@ -134,7 +135,7 @@ public void setDisabled(boolean disabled) {
     /**
      * Return the AbstractLink anchor <a> tag href attribute.
      * This method will encode the URL with the session ID
-     * if required using HttpServletResponse.encodeURL().
+     * if required using HttpServletResponse.encodeURL().
      *
      * @return the AbstractLink HTML href attribute
      */
@@ -142,12 +143,12 @@ public void setDisabled(boolean disabled) {
 
     /**
      * Return the image src path attribute. If the image src is defined then a
-     * <img/> element will be rendered inside the anchor link
+     * <img/> element will be rendered inside the anchor link
      * when using the AbstractLink {@link #toString()} method.
-     * 
        
+     * 
        
      * Note: the label will not be rendered in this case (default behavior),
      * unless the {@link #setRenderLabelAndImage(boolean)} flag is set to true.
-     * 
        
+     * 
        
      * If the src value is prefixed with '/' then the request context path will
      * be prefixed to the src value when rendered by the control.
      *
@@ -161,11 +162,11 @@ public String getImageSrc() {
      * Set the image src path attribute. If the src value is prefixed with
      * '/' then the request context path will be prefixed to the src value when
      * rendered by the control.
-     * 
        
-     * If the image src is defined then an <img/> element will
+     * 
        
+     * If the image src is defined then an <img/> element will
      * be rendered inside the anchor link when using the AbstractLink
      * {@link #toString()} method.
-     * 
        
+     * 
        
      * Note: the label will not be rendered in this case (default behavior),
      * unless the {@link #setRenderLabelAndImage(boolean)} flag is set to true.
      *
@@ -193,19 +194,19 @@ public String getId() {
 
     /**
      * Return the label for the AbstractLink.
-     * 
        
+     * 
        
      * If the label value is null, this method will attempt to find a
      * localized label message in the parent messages using the key:
      * 
        
-     * getName() + ".label"
+     * getName() + ".label"
      * 
        
      * If not found then the message will be looked up in the
-     * /click-control.properties file using the same key.
+     * /click-control.properties file using the same key.
      * If a value still cannot be found then the ActionLink name will be converted
      * into a label using the method: {@link ClickUtils#toLabel(String)}
-     * 
        
-     * For example given a OrderPage with the properties file
-     * OrderPage.properties:
+     * 
        
+     * For example given a OrderPage with the properties file
+     * OrderPage.properties:
      *
      * 
              * checkout.label=Checkout
@@ -224,7 +225,7 @@ public String getId() {
      *
      * When a label value is not set, or defined in any properties files, then
      * its value will be created from the Fields name.
-     * 
        
+     * 
        
      * For example given the ActionLink code:
      *
      * 
        @@ -235,7 +236,7 @@ public String getId() {
      * <a href="..">Delete Item</a> 
        
      *
      * Note the ActionLink label can include raw HTML to render other elements.
-     * 
        
+     * 
        
      * For example the configured label:
      *
      * 
        @@ -302,7 +303,7 @@ public String getParameter(String name) {
      * Set the link parameter with the given parameter name and value. You would
      * generally use parameter if you were creating the entire AbstractLink
      * programmatically and rendering it with the {@link #toString()} method.
-     * 
        
+     * 
        
      * For example given the ActionLink:
      *
      * 
        @@ -404,15 +405,15 @@ public void setParameters(Map parameters) {
      * Defines a link parameter that will have its value bound to a matching
      * request parameter. {@link #setParameter(String, Object) setParameter}
      * implicitly defines a parameter as well.
-     * 
        
+     * 
        
      * Please note: parameters need only be defined for Ajax requests.
-     * For non-Ajax requests, all incoming request parameters
+     * For non-Ajax requests, all incoming request parameters
      * are bound, whether they are defined or not. This behavior may change in a
      * future release.
-     * 
        
+     * 
        
      * Also note: link parameters are bound to request parameters
      * during the {@link #onProcess()} event, so link parameters must be defined
-     * in the Page constructor or onInit() event.
+     * in the Page constructor or onInit() event.
      *
      * @param name the name of the parameter to define
      */
@@ -457,17 +458,17 @@ public void setTabIndex(int tabindex) {
     /**
      * Return the 'title' attribute, or null if not defined. The title
      * attribute acts like tooltip message over the link.
-     * 
        
+     * 
        
      * If the title value is null, this method will attempt to find a
      * localized label message in the parent messages using the key:
      * 
        
-     * getName() + ".title"
+     * getName() + ".title"
      * 
        
      * If not found then the message will be looked up in the
-     * /click-control.properties file using the same key.
-     * 
        
-     * For examle given a ItemsPage with the properties file
-     * ItemPage.properties:
+     * /click-control.properties file using the same key.
+     * 
        
+     * For examle given a ItemsPage with the properties file
+     * ItemPage.properties:
      *
      * 
              * edit.label=Edit
@@ -584,10 +585,10 @@ public void setState(Object state) {
      * will render the entire anchor link including the tags, the label and
      * any attributes, see {@link #setAttribute(String, String)} for an
      * example.
-     * 
        
-     * If the image src is defined then a <img/> element will
+     * 
        
+     * If the image src is defined then a <img/> element will
      * rendered inside the anchor link instead of the label property.
-     * 
        
+     * 
        
      * This method invokes the abstract {@link #getHref()} method.
      *
      * @see #toString()
@@ -668,7 +669,7 @@ public void removeState(Context context) {
 
     /**
      * Restore the link state from the session for the given request context.
-     * 
        
+     * 
        
      * This method delegates to {@link #setState(Object)} to set the
      * link restored state.
      *
@@ -683,7 +684,7 @@ public void restoreState(Context context) {
 
     /**
      * Save the link state to the session for the given request context.
-     * 
        
+     * 
        
      * * This method delegates to {@link #getState()} to retrieve the link state
      * to save.
      *
@@ -728,13 +729,13 @@ protected void renderImgTag(HtmlStringBuffer buffer) {
 
     /**
      * Render the given link parameters to the buffer.
-     * 
        
+     * 
        
      * The parameters will be rendered as URL key/value pairs e.g:
-     * "firstname=john&lastname=smith".
-     * 
        
+     * "firstname=john&lastname=smith".
+     * 
        
      * Multivalued parameters will be rendered with each value sharing the same
-     * key e.g: "name=john&name=susan&name=mary".
-     * 
        
+     * key e.g: "name=john&name=susan&name=mary".
+     * 
        
      * The parameter value will be encoded through
      * {@link ClickUtils#encodeUrl(Object, Context)}.
      *
@@ -777,8 +778,8 @@ protected void renderParameters(HtmlStringBuffer buffer, Map par
     /**
      * This method binds the submitted request parameters to the link
      * parameters.
-     * 
        
-     * For non-Ajax requests this method will bind all incoming request
+     * 
        
+     * For non-Ajax requests this method will bind all incoming request
      * parameters to the link. For Ajax requests this method will only bind
      * the parameters already defined on the link.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/ActionLink.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/ActionLink.java
index c90f5f0423..20d6a15056 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/ActionLink.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/ActionLink.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -27,19 +28,20 @@
 /**
  * Provides a Action Link control:   <a href=""></a>.
  *
- * 
+ * 
        
+ * 
  * 
  * 
        Example
        
- * Action Link
+ * Action Link
  * 
        
  *
  * This control can render the "href" URL attribute using
  * {@link #getHref()}, or the entire ActionLink anchor tag using
  * {@link #toString()}.
- * 
        
+ * 
        
  * ActionLink support invoking control listeners.
  *
- * 
        ActionLink Example
        
+ * 
        ActionLink Example
        
  *
  * An example of using ActionLink to call a logout method is illustrated below:
  *
@@ -70,7 +72,7 @@
  *
  * ActionLink can also support a value parameter which is accessible
  * using {@link #getValue()}.
- * 
        
+ * 
        
  * For example a products table could include rows
  * of products, each with a get product details ActionLink and add product
  * ActionLink. The ActionLinks include the product's id as a parameter to
@@ -135,7 +137,7 @@
  * } 
        
  *
  * See also the W3C HTML reference:
- * A Links
  *
  * @see org.apache.click.control.AbstractLink
@@ -147,10 +149,10 @@ public class ActionLink extends AbstractLink {
 
     private static final long serialVersionUID = 1L;
 
-    /** The action link parameter name:   actionLink. */
+    /** The action link parameter name:   actionLink. */
     public static final String ACTION_LINK = "actionLink";
 
-    /** The value parameter name:   value. */
+    /** The value parameter name:   value. */
     public static final String VALUE = "value";
 
     // Instance Variables -----------------------------------------------------
@@ -162,7 +164,7 @@ public class ActionLink extends AbstractLink {
 
     /**
      * Create an ActionLink for the given name.
-     * 
        
+     * 
        
      * Please note the name 'actionLink' is reserved as a control request
      * parameter name and cannot be used as the name of the control.
      *
@@ -175,7 +177,7 @@ public ActionLink(String name) {
 
     /**
      * Create an ActionLink for the given name and label.
-     * 
        
+     * 
        
      * Please note the name 'actionLink' is reserved as a control request
      * parameter name and cannot be used as the name of the control.
      *
@@ -210,7 +212,7 @@ public ActionLink(Object listener, String method) {
     /**
      * Create an ActionLink for the given name, listener object and listener
      * method.
-     * 
        
+     * 
        
      * Please note the name 'actionLink' is reserved as a control request
      * parameter name and cannot be used as the name of the control.
      *
@@ -234,7 +236,7 @@ public ActionLink(String name, Object listener, String method) {
     /**
      * Create an ActionLink for the given name, label, listener object and
      * listener method.
-     * 
        
+     * 
        
      * Please note the name 'actionLink' is reserved as a control request
      * parameter name and cannot be used as the name of the control.
      *
@@ -280,7 +282,7 @@ public boolean isClicked() {
     /**
      * Return the ActionLink anchor <a> tag href attribute for the
      * given value. This method will encode the URL with the session ID
-     * if required using HttpServletResponse.encodeURL().
+     * if required using HttpServletResponse.encodeURL().
      *
      * @param value the ActionLink value parameter
      * @return the ActionLink HTML href attribute
@@ -348,7 +350,7 @@ public String getHref() {
     /**
      * Set the name of the Control. Each control name must be unique in the
      * containing Page model or the containing Form.
-     * 
        
+     * 
        
      * Please note the name 'actionLink' is reserved as a control request
      * parameter name and cannot be used as the name of the control.
      *
@@ -375,7 +377,7 @@ public void setName(String name) {
      * @param parent the parent of the Control
      * @throws IllegalStateException if {@link #name} is not defined
      * @throws IllegalArgumentException if the given parent instance is
-     * referencing this object: if (parent == this)
+     * referencing this object: if (parent == this)
      */
     @Override
     public void setParent(Object parent) {
@@ -400,10 +402,10 @@ public String getValue() {
     }
 
     /**
-     * Returns the action link Double value if the action link was
+     * Returns the action link Double value if the action link was
      * processed and has a value, or null otherwise.
      *
-     * @return the action link Double value if the action link was processed
+     * @return the action link Double value if the action link was processed
      *
      * @throws NumberFormatException if the value cannot be parsed into a Double
      */
@@ -417,10 +419,10 @@ public Double getValueDouble() {
     }
 
     /**
-     * Returns the ActionLink Integer value if the ActionLink was
+     * Returns the ActionLink Integer value if the ActionLink was
      * processed and has a value, or null otherwise.
      *
-     * @return the ActionLink Integer value if the action link was processed
+     * @return the ActionLink Integer value if the action link was processed
      *
      * @throws NumberFormatException if the value cannot be parsed into an Integer
      */
@@ -434,10 +436,10 @@ public Integer getValueInteger() {
     }
 
     /**
-     * Returns the ActionLink Long value if the ActionLink was
+     * Returns the ActionLink Long value if the ActionLink was
      * processed and has a value, or null otherwise.
      *
-     * @return the ActionLink Long value if the action link was processed
+     * @return the ActionLink Long value if the action link was processed
      *
      * @throws NumberFormatException if the value cannot be parsed into a Long
      */
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Button.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Button.java
index bdf74b6e4b..cd268a8901 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Button.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Button.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -26,9 +27,10 @@
 /**
  * Provides a Button control:   <input type='button'/>.
  *
- * 
+ * 
        
+ * 
  * 
  * 
        Example
        
- * 
+ * <input type='button' value='Button'/>
  * 
        
  *
@@ -36,24 +38,24 @@
  * perform client side logic. The Button control provides no server side
  * processing. If server side processing is required use {@link Submit} instead.
  *
- * 
        Button Example
        
+ * 
        Button Example
        
  *
  * The example below adds a back button to a form, which when clicked returns
  * to the previous page.
  *
  * 
        - * Button backButton = new Button("back", " < Back ");
+ * Button backButton = new Button("back", " < Back ");
  * backButton.setOnClick("history.back();");
  * backButton.setTitle("Return to previous page");
  * form.add(backButton); 
        
  *
  * HTML output:
  * 
        - * <input type='button' name='back' value=' < Back ' onclick='history.back();'
+ * <input type='button' name='back' value=' < Back ' onclick='history.back();'
  *        title='Return to previous page'/> 
        
  *
  * See also W3C HTML reference
- * INPUT
  *
  * @see Reset
@@ -90,7 +92,7 @@ public Button(String name, String label) {
 
     /**
      * Create a button with no name defined.
-     * 
        
+     * 
        
      * Please note the control's name must be defined before it is valid.
      */
     public Button() {
@@ -99,7 +101,7 @@ public Button() {
     // Public Attributes ------------------------------------------------------
 
     /**
-     * Return the button's html tag: input.
+     * Return the button's html tag: input.
      *
      * @see org.apache.click.control.AbstractControl#getTag()
      *
@@ -133,9 +135,9 @@ public void setOnClick(String value) {
     }
 
     /**
-     * Return the input type: 'button'.
+     * Return the input type: 'button'.
      *
-     * @return the input type: 'button'
+     * @return the input type: 'button'
      */
     public String getType() {
         return "button";
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Column.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Column.java
index a9adbcf431..ac163258ba 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Column.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Column.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -36,10 +37,12 @@
  * Provides the Column table data <td> and table header <th>
  * renderer.
  *
- * 
+ * 
        
+ * 
  * 
        Example
        
  *
  * 
+ * 
  * 
  * 
  * 
@@ -65,11 +68,11 @@
  *
  * 
        Example
        Id
        
  *
- * 
        
+ * 
        
  *
  * The Column object provide column definitions for the {@link org.apache.click.control.Table} object.
  *
- * 
        Column Options
        
+ * 
        Column Options
        
  *
  * The Column class supports a number of rendering options which include:
  *
@@ -80,7 +83,7 @@
  * 
      • {@link #dataClass} - the CSS class for the table data cell
        • 
  * 
      • {@link #dataStyles} - the CSS styles for the table data cell
        • 
  * 
      • {@link #decorator} - the custom column value renderer
        • 
- * 
      • {@link #format} - the MessageFormat pattern rendering
+ * 
      • {@link #format} - the MessageFormat pattern rendering
  *      the column value
        • 
  * 
      • {@link #headerClass} - the CSS class for the table header cell
        • 
  * 
      • {@link #headerStyles} - the CSS styles for the table header cell
        • 
@@ -89,7 +92,7 @@
  * 
      • {@link #width} - the table cell width property
        • 
  * 
  *
- * 
        Format Pattern
        
+ * 
        Format Pattern
        
  *
  * The {@link #format} property which specifies {@link MessageFormat} pattern
  * a is very useful for formatting column values. For example to render
@@ -115,10 +118,10 @@
  * Column orderIdColumn = new Column("order.id", "Order ID");
  * table.addColumn(orderIdColumn);  
  *
- * 
        Column Decorators
        
+ * 
        Column Decorators
        
  *
  * The support custom column value rendering you can specify a {@link Decorator}
- * class on columns. The decorator render method is passed the table
+ * class on columns. The decorator render method is passed the table
  * row object and the page request Context. Using the table row you can access
  * all the column values enabling you to render a compound value composed of
  * multiple column values. For example:
@@ -137,7 +140,7 @@
  *
  * table.addColumn(column); 
 
- * The Context parameter of the decorator render() method enables you to
+ * The Context parameter of the decorator render() method enables you to
  * render controls to provide additional functionality. For example:
  *
  * 
        @@ -178,19 +181,18 @@
  *     }
  * } 
        
  *
- * 
        Internationalization
        
+ * 
        Internationalization
        
  *
  * Column header titles can be localized using the controls parent messages.
  * If the column header title value is null, the column will attempt to find a
  * localized message in the parent messages using the key:
  * 
        
- * getName() + ".headerTitle"
+ * getName() + ".headerTitle"
  * 
        
  * If not found then the message will be looked up in the
- * /click-control.properties file using the same key.
+ * /click-control.properties file using the same key.
  * If a value still cannot be found then the Column name will be converted
  * into a header title using the method: {@link ClickUtils#toLabel(String)}.
- * 
        
  *
  * @see Decorator
  * @see org.apache.click.control.Table
@@ -206,7 +208,7 @@ public class Column implements Serializable {
 
     /**
      * The automatically hyperlink column URL and email address values flag,
-     * default value is false.
+     * default value is false.
      */
     protected boolean autolink;
 
@@ -238,9 +240,9 @@ public class Column implements Serializable {
      * The maximum column length. If maxLength is greater than 0 and the column
      * data string length is greater than maxLength, the rendered value will be
      * truncated with an eclipse(...).
-     * 
        
+     * 
        
      * Autolinked email or URL values will not be constrained.
-     * 
        
+     * 
        
      * The default value is 0.
      */
     protected int maxLength;
@@ -312,7 +314,7 @@ public Column(String name, String title) {
 
     /**
      * Create a Column with no name defined.
-     * 
        
+     * 
        
      * Please note the control's name must be defined before it is valid.
      */
     public Column() {
@@ -334,7 +336,7 @@ public String getAttribute(String name) {
     /**
      * Set the Column with the given HTML attribute name and value. These
      * attributes will be rendered as HTML attributes, for example:
-     * 
        
+     * 
        
      * If there is an existing named attribute in the Column it will be replaced
      * with the new value. If the given attribute value is null, any existing
      * attribute will be removed.
@@ -553,15 +555,16 @@ public String getFormat() {
      * Column dateColumn = new Column("purchaseDate", "Date");
      * dateColumn.setFormat("{0,date,dd MMM yyyy}"); 
      *
-     * 
        MesssageFormat Patterns
        
+     * MesssageFormat Patterns
      *
-     * 
-     *  
+     * 
        
+     * 
+     *  
      *   
-     *   
+     *   
@@ -577,7 +580,7 @@ public String getFormat() {
      *   
-     *   
@@ -596,7 +599,7 @@ public String getFormat() {
      *   
-     *   
@@ -615,66 +618,67 @@ public String getFormat() {
      *   
-     *   
        Example
        Format Type
      *   Format Style
      *   Subformat Created
-     *  
        number
+     *  
        number
      *   (none)
      *   NumberFormat.getInstance(getLocale())
      *  
        SubformatPattern
      *   new DecimalFormat(subformatPattern, new DecimalFormatSymbols(getLocale()))
      *  
        date
+     *   date
      *   (none)
      *   DateFormat.getDateInstance(DateFormat.DEFAULT, getLocale())
      *  
        SubformatPattern
      *   new SimpleDateFormat(subformatPattern, getLocale())
      *  
        time
+     *   time
      *   (none)
      *   DateFormat.getTimeInstance(DateFormat.DEFAULT, getLocale())
      *  
        SubformatPattern
      *   new SimpleDateFormat(subformatPattern, getLocale())
      *  
        choice
+     *   choice
      *   SubformatPattern
      *   new ChoiceFormat(subformatPattern)
      * 
        
      *
-     * 
        DecimalFormat Pattern Characters
        
+     * DecimalFormat Pattern Characters
      *
-     *  
-     *      
-     *           
+     *  
        Symbol
-     *           Location
-     *           Localized?
-     *           Meaning
-     *      
        
+     * 
+     *      
+     *           
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
+     *      
      *           
        Example
        Symbol
+     *           Location
+     *           Localized?
+     *           Meaning
+     *      
        0
      *           Number
      *           Yes
      *           Digit
-     *      
        #
      *           Number
      *           Yes
      *           Digit, zero shows as absent
-     *      
        .
      *           Number
      *           Yes
      *           Decimal separator or monetary decimal separator
-     *      
        -
      *           Number
      *           Yes
      *           Minus sign
-     *      
        ,
      *           Number
      *           Yes
      *           Grouping separator
-     *      
        E
      *           Number
      *           Yes
      *           Separates mantissa and exponent in scientific notation.
      *               Need not be quoted in prefix or suffix.
-     *      
        ;
      *           Subpattern boundary
      *           Yes
      *           Separates positive and negative subpatterns
-     *      
        %
      *           Prefix or suffix
      *           Yes
      *           Multiply by 100 and show as percentage
-     *      
        \u2030
      *           Prefix or suffix
      *           Yes
      *           Multiply by 1000 and show as per mille
-     *      
        ¤ (\u00A4)
      *           Prefix or suffix
      *           No
@@ -682,7 +686,7 @@ public String getFormat() {
      *               doubled, replaced by international currency symbol.
      *               If present in a pattern, the monetary decimal separator
      *               is used instead of the decimal separator.
-     *      
        '
      *           Prefix or suffix
      *           No
@@ -692,20 +696,21 @@ public String getFormat() {
      *               itself, use two in a row: "# o''clock".
      *  
        
      *
-     * 
        SimpleDateFormat Pattern Characters
        
+     * SimpleDateFormat Pattern Characters
      *
-     *  
-     *  
-     *           
        Letter
-     *           Date or Time Component
-     *           Presentation
-     *           Examples
+     *  
+     * 
+     *  
+     *           
      *           
+     *       
      *           
+     *       
      *           
+     *       
      *           
+     *       
      *           
+     *       
      *           
+     *       
      *           
+     *       
      *           
+     *       
      *           
+     *       
      *           
        Example
        Letter
+     *           Date or Time Component
+     *           Presentation
+     *           Examples
      *       
        G
      *           Era designator
      *           Text
      *           AD
-     *       
        y
      *           Year
      *           Year
@@ -715,7 +720,7 @@ public String getFormat() {
      *           Month in year
      *           Month
      *           July; Jul; 07
-     *       
        w
      *           Week in year
      *           Number
@@ -725,7 +730,7 @@ public String getFormat() {
      *           Week in month
      *           Number
      *           2
-     *       
        D
      *           Day in year
      *           Number
@@ -735,7 +740,7 @@ public String getFormat() {
      *           Day in month
      *           Number
      *           10
-     *       
        F
      *           Day of week in month
      *           Number
@@ -745,7 +750,7 @@ public String getFormat() {
      *           Day in week
      *           Text
      *           Tuesday; Tue
-     *       
        a
      *           Am/pm marker
      *           Text
@@ -755,7 +760,7 @@ public String getFormat() {
      *           Hour in day (0-23)
      *           Number
      *           0
-     *       
        k
      *           Hour in day (1-24)
      *           Number
@@ -765,7 +770,7 @@ public String getFormat() {
      *           Hour in am/pm (0-11)
      *           Number
      *           0
-     *       
        h
      *           Hour in am/pm (1-12)
      *           Number
@@ -775,7 +780,7 @@ public String getFormat() {
      *           Minute in hour
      *           Number
      *           30
-     *       
        s
      *           Second in minute
      *           Number
@@ -785,7 +790,7 @@ public String getFormat() {
      *           Millisecond
      *           Number
      *           978
-     *       
        z
      *           Time zone
      *           General time zone
@@ -936,17 +941,16 @@ public Map getHeaderStyles() {
 
     /**
      * Return the table header <th> title.
-     * 
        
+     * 
        
      * If the header title value is null, this method will attempt to find a
      * localized message in the parent messages using the key:
      * 
        
-     * getName() + ".headerTitle"
+     * getName() + ".headerTitle"
      * 
        
      * If not found then the message will be looked up in the
-     * /click-control.properties file using the same key.
+     * /click-control.properties file using the same key.
      * If a value still cannot be found then the Column name will be converted
      * into a header title using the method: {@link ClickUtils#toLabel(String)}
-     * 
        
      *
      * @return the table header title
      */
@@ -970,8 +974,8 @@ public void setHeaderTitle(String title) {
     }
 
     /**
-     * Return the Table and Column id appended:   "table-column"
-     * 
        
+     * Return the Table and Column id appended:   "table-column"
+     * 
        
      * Use the field the "id" attribute value if defined, or the name otherwise.
      *
      * @return HTML element identifier attribute "id" value
@@ -1065,9 +1069,9 @@ public Table getTable() {
     }
 
     /**
-     * Set the Column's the parent Table.
+     * Set the Column's the parent Table.
      *
-     * @param table Column's parent Table
+     * @param table Column's parent Table
      */
     public void setTable(Table table) {
         this.table = table;
@@ -1076,9 +1080,9 @@ public void setTable(Table table) {
     /**
      * Set the column CSS "text-align" style for the header <th> and
      * data <td> elements.  Valid values include:
-     * [left, right, center]
+     * [left, right, center]
      *
-     * @param align the CSS "text-align" value: [left, right, center]
+     * @param align the CSS "text-align" value: [left, right, center]
      */
     public void setTextAlign(String align) {
         if (align != null && "middle".equalsIgnoreCase(align)) {
@@ -1114,8 +1118,8 @@ public void setTitleProperty(String property) {
     /**
      * Set the column CSS "vertical-align" style for the header <th> and
      * data <td> elements. Valid values include:
-     * [baseline | sub | super | top | text-top | middle | bottom |
-     * text-bottom | <percentage> | <length> | inherit]
+     * [baseline | sub | super | top | text-top | middle | bottom |
+     * text-bottom | <percentage> | <length> | inherit]
      *
      * @param align the CSS "vertical-align" value
      */
@@ -1263,14 +1267,14 @@ public void renderTableHeader(HtmlStringBuffer buffer, Context context) {
 
     /**
      * Return the column name property value from the given row object.
-     * 
        
-     * If the row object is a Map this method will attempt to return
+     * 
        
+     * If the row object is a Map this method will attempt to return
      * the map value for the column name. The row map lookup will be performed
      * using the property name, if a value is not found the property name in
      * uppercase will be used, if a value is still not found the property name
      * in lowercase will be used. If a map value is still not found then this
      * method will return null.
-     * 
        
+     * 
        
      * Object property values can also be specified using a path expression.
      *
      * @param row the row object to obtain the property from
@@ -1283,14 +1287,14 @@ public Object getProperty(Object row) {
 
     /**
      * Return the column property value from the given row object and property name.
-     * 
        
-     * If the row object is a Map this method will attempt to return
+     * 
        
+     * If the row object is a Map this method will attempt to return
      * the map value for the column. The row map lookup will be performed using
      * the property name, if a value is not found the property name in uppercase
      * will be used, if a value is still not found the property name in lowercase
      * will be used. If a map value is still not found then this method will
      * return null.
-     * 
        
+     * 
        
      * Object property values can also be specified using a path expression.
      *
      * @param name the name of the property
@@ -1389,8 +1393,8 @@ protected void renderTableDataContent(Object row, HtmlStringBuffer buffer,
     }
 
     /**
-     * Render the given table cell value to the buffer as a mailto:
-     * or http: hyperlink, or as an ordinary string if the value is
+     * Render the given table cell value to the buffer as a mailto:
+     * or http: hyperlink, or as an ordinary string if the value is
      * determined not be linkable.
      *
      * @param value the table cell value to render
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Container.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Container.java
index c960e6239f..ae7891e8af 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Container.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Container.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.control;
@@ -25,12 +26,12 @@
 
 /**
  * Provides the interface for a container which holds a list of child controls.
- * 
        
+ * 
        
  * Container extends {@link org.apache.click.Control} and enables the creation of
  * nested controls.
- * 
        
+ * 
        
  * Container allows one to add, remove and retrieve child controls.
- * 
        
+ * 
        
  * Please note {@link AbstractContainer} provides
  * a default implementation of the Container interface to make it easier for
  * developers to create their own containers.
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Decorator.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Decorator.java
index 275aa8ca16..9db202e42c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Decorator.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Decorator.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -23,7 +24,7 @@
 /**
  * Provides a decorator interface for delegating object rendering.
  *
- * 
        Decorator Example
        
+ * 
        Decorator Example
        
  *
  * The following example illustrates how to render a email hyperlink in a
  * email table column.
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Field.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Field.java
index 400beee427..b3b1405ede 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Field.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Field.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.control;
@@ -36,18 +37,18 @@
  * rendering of the contained fields. All Form field controls must extend this
  * abstract class.
  *
- * 
        Field Processing
        
+ * 
        Field Processing
        
  *
- * 
        Post Requests
        
+ * 
        Post Requests
        
  *
  * When processing POST requests forms typically invoke the {@link #onProcess()}
- * method on all its fields. The Field onProcess() method is used
+ * method on all its fields. The Field onProcess() method is used
  * to bind the fields request value, validate the submission and invoke any
- * control listener method. If the onProcess() method returns true
+ * control listener method. If the onProcess() method returns true
  * the form will continue processing fields, otherwise the form will abort
  * further processing.
- * 
        
- * The body of the Field onProcess() method is detailed below.
+ * 
        
+ * The body of the Field onProcess() method is detailed below.
  *
  * 
          * public boolean onProcess() {
@@ -62,7 +63,7 @@
  *     return true;
  * } 
        
  *
- * The Field methods called by onProcess() include:
+ * The Field methods called by onProcess() include:
  *
  * 
        
  * 
        {@link #bindRequestValue()}
        
@@ -84,31 +85,31 @@
  * 
  * 
        
  *
- * Field subclasses generally only have to override the validate()
- * method, and possibly the bindRequestValue() method, to provide their
+ * Field subclasses generally only have to override the validate()
+ * method, and possibly the bindRequestValue() method, to provide their
  * own behaviour.
  *
- * 
        Get Requests
        
+ * 
        Get Requests
        
  *
  * When processing GET requests a Page's Form will typically perform no
  * processing and simply render itself and its Fields.
  *
- * 
        Rendering
        
+ * 
        Rendering
        
  *
  * Field subclasses must override the {@link #render(org.openidentityplatform.openam.click.util.HtmlStringBuffer)}
  * method to enable themselves to be rendered as HTML. With the increasing use of
  * AJAX, Fields should render themselves as valid XHTML, so that they may be parsed
- * correctly and used as the innerHtml in the DOM.
- * 
        
+ * correctly and used as the innerHtml in the DOM.
+ * 
        
  * When a Form object renders a Field using autolayout, it renders the
  * Field in a table row using the Field's {@link #label} attribute, its
  * {@link #error} attribute if defined, and the Fields
  * {@link #render(org.openidentityplatform.openam.click.util.HtmlStringBuffer)} method.
- * 
        
+ * 
        
  * To assist with rendering valid HTML Field subclasses can use the
  * {@link org.apache.click.util.HtmlStringBuffer} class.
  *
- * 
        Message Resources and Internationalization (i18n)
        
+ * 
        Message Resources and Internationalization (i18n)
        
  *
  * Fields support a hierarchy of resource bundles for displaying validation
  * error messages and display messages. These localized messages can be accessed
@@ -132,12 +133,12 @@
  * 
      • {@link #setErrorMessage(String, Object)}
        • 
  * 
  *
- * 
+ * 
  * The order in which localized messages resolve are:
  * 
        
  * 
        Page scope messages
        
  * 
        Message lookups are first resolved to the Pages message bundle if it
- * exists. For example a Login page may define the message properties:
+ * exists. For example a Login page may define the message properties:
  *
  * 
          * /com/mycorp/page/Login.properties 
        
@@ -159,7 +160,7 @@
  *
  * 
        Control scope messages
        
  * 
        Next message lookups are resolved to the Control message bundle if it
- * exists. For example a CustomTextField control may define the
+ * exists. For example a CustomTextField control may define the
  * message properties:
  *
  * 
        @@ -176,7 +177,7 @@
  *
  * You can modify these properties by copying this file into your applications
  * root class path and editing these properties.
- * 
        
+ * 
        
  * Note when customizing the message properties you must include all the
  * properties, not just the ones you want to override.
  * 
        
@@ -236,7 +237,7 @@ public abstract class Field extends AbstractControl implements Stateful {
     protected boolean trim = true;
 
     /**
-     * The validate Field value onProcess() invocation flag.
+     * The validate Field value onProcess() invocation flag.
      */
     protected Boolean validate;
 
@@ -281,7 +282,7 @@ public Field(String name, String label) {
      * @param parent the parent of the Control
      * @throws IllegalStateException if {@link #name} is not defined
      * @throws IllegalArgumentException if the given parent instance is
-     * referencing this object: if (parent == this)
+     * referencing this object: if (parent == this)
      */
     @Override
     public void setParent(Object parent) {
@@ -333,18 +334,18 @@ public boolean isDisabled() {
     /**
      * Set the Field disabled flag. Disabled fields are not processed nor
      * validated and their action event is not fired.
-     * 
        
+     * 
        
      * Important Note: an HTML form POST does not submit disabled fields
      * values. Similarly disabled Click fields do not get processed or validated.
-     * However, JavaScript is often used to enable fields prior to
+     * However, JavaScript is often used to enable fields prior to
      * submission. Click is smart enough to recognize when a field was enabled
      * this way by checking if the field has an incoming request parameter.
      * If a field is disabled but has an incoming request parameter, Click will
-     * "enable" the field and process it.
-     * 
        
+     * "enable" the field and process it.
+     * 
        
      * Caveat: Unfortunately the above behavior does not apply to
      * {@link Checkbox} and {@link Radio} buttons. An HTML form POST for a
-     * disabled checkbox/radio is the same as for an unchecked
+     * disabled checkbox/radio is the same as for an unchecked
      * checkbox/radio. In neither case is a value submitted to the server and
      * Click cannot make the distinction whether the checkbox/radio is disabled
      * or unchecked.
@@ -423,9 +424,9 @@ public Form getForm() {
     }
 
     /**
-     * Set the Field's the parent Form.
+     * Set the Field's the parent Form.
      *
-     * @param form Field's parent Form
+     * @param form Field's parent Form
      */
     public void setForm(Form form) {
         this.form = form;
@@ -433,17 +434,17 @@ public void setForm(Form form) {
 
     /**
      * Return the field help text.
-     * 
        
+     * 
        
      * If the help value is null, this method will attempt to find a
      * localized help message in the parent messages using the key:
      * 
        
-     * getName() + ".help"
+     * getName() + ".help"
      * 
        
      * If not found then the message will be looked up in the
-     * /click-control.properties file using the same key.
-     * 
        
-     * For example given a CustomerPage with the properties file
-     * CustomerPage.properties:
+     * /click-control.properties file using the same key.
+     * 
        
+     * For example given a CustomerPage with the properties file
+     * CustomerPage.properties:
      *
      * 
              * name.label=Customer Name
@@ -501,8 +502,8 @@ public boolean isHidden() {
     }
 
     /**
-     * Return the Form and Field id appended:   "form-field"
-     * 
        
+     * Return the Form and Field id appended:   "form-field"
+     * 
        
      * Use the field the "id" attribute value if defined, or the name otherwise.
      *
      * @see org.apache.click.Control#getId()
@@ -548,19 +549,19 @@ public String getId() {
 
     /**
      * Return the field display label.
-     * 
        
+     * 
        
      * If the label value is null, this method will attempt to find a
      * localized label message in the parent messages using the key:
      * 
        
-     * getName() + ".label"
+     * getName() + ".label"
      * 
        
      * If not found then the message will be looked up in the
-     * /click-control.properties file using the same key.
+     * /click-control.properties file using the same key.
      * If a value is still not found, the Field name will be converted
      * into a label using the method: {@link ClickUtils#toLabel(String)}
-     * 
        
-     * For example given a CustomerPage with the properties file
-     * CustomerPage.properties:
+     * 
        
+     * For example given a CustomerPage with the properties file
+     * CustomerPage.properties:
      *
      * 
              * name.label=Customer Name
@@ -580,7 +581,7 @@ public String getId() {
      *
      * When a label value is not set, or defined in any properties files, then
      * its value will be created from the Fields name.
-     * 
        
+     * 
        
      * For example given the TextField code:
      *
      * 
        @@ -625,11 +626,10 @@ public String getLabelStyle() {
 
     /**
      * Set the field label "style" attribute value.
-     * 
        
+     * 
        
      * Please note: the label is rendered by the containing Form
      * or container, not the field itself. It is up to the parent Form
      * (or container) on how to apply the label style.
-     * 
        
      * 
              * nameField.setLabelStyle("color: green; font-weight: bold");
        
      *
@@ -652,7 +652,7 @@ public String getLabelStyleClass() {
 
     /**
      * Set the field label "class" attribute value.
-     * 
        
+     * 
        
      * Please note: the label is rendered by the containing Form
      * or container, not the field itself. It is up to the parent Form
      * (or container) on how to apply the label style class.
@@ -676,7 +676,6 @@ public String getParentStyleHint() {
 
     /**
      * Set the field's parent "style" attribute hint.
-     * 
        
      * 
              * nameField.setParentStyleHint("margin-bottom; 10px");
        
      *
@@ -705,7 +704,7 @@ public String getParentStyleClassHint() {
 
     /**
      * Set the field's parent "class" attribute hint.
-     * 
        
+     * 
        
      * Please note:The parent style class provides a hint to Forms
      * (or other containers) which CSS class to render, but it is up to the
      * Form (or container) implementation how the style class will be applied.
@@ -821,7 +820,7 @@ public String getTextAlign() {
     /**
      * Set the field CSS horizontal "text-align" style.
      *
-     * @param align the CSS "text-align" value: ["left", "right", "center"]
+     * @param align the CSS "text-align" value: ["left", "right", "center"]
      */
     public void setTextAlign(String align) {
         setStyle("text-align", align);
@@ -830,18 +829,18 @@ public void setTextAlign(String align) {
     /**
      * Return the 'title' attribute, or null if not defined. The title
      * attribute acts like tooltip message over the Field.
-     * 
        
+     * 
        
      * If the title value is null, this method will attempt to find a
      * localized title message in the parent messages using the key:
      * 
        
-     * getName() + ".title"
+     * getName() + ".title"
      * 
        
      * If not found then the message will be looked up in the
-     * /click-control.properties file using the same key. If still
+     * /click-control.properties file using the same key. If still
      * not found the title will be left as null and will not be rendered.
-     * 
        
-     * For example given a CustomerPage with the properties file
-     * CustomerPage.properties:
+     * 
        
+     * For example given a CustomerPage with the properties file
+     * CustomerPage.properties:
      *
      * 
              * name.label=Customer Name
@@ -879,7 +878,7 @@ public void setTitle(String value) {
 
     /**
      * Return true if the Field request value should be trimmed, false otherwise.
-     * The default value is "true".
+     * The default value is "true".
      *
      * @return true if the Field request value should be trimmed, false otherwise
      */
@@ -900,12 +899,12 @@ public void setTrim(boolean trim) {
 
     /**
      * Return true if the Field should validate itself when being processed.
-     * 
        
+     * 
        
      * If the validate attribute for the Field is not explicitly set, this
      * method will return the validation status of its parent Form, see
      * {@link Form#getValidate()}. If the Field validate attribute is not set
      * and the parent Form is not set this method will return true.
-     * 
        
+     * 
        
      * This method is called by the {@link #onProcess()} method to determine
      * whether the the Field {@link #validate()} method should be invoked.
      *
@@ -934,8 +933,8 @@ public void setValidate(boolean validate) {
 
     /**
      * Return the field JavaScript client side validation function.
-     * 
        
-     * The function name must follow the format validate_[id], where
+     * 
        
+     * The function name must follow the format validate_[id], where
      * the id is the DOM element id of the fields focusable HTML element, to
      * ensure the function has a unique name.
      *
@@ -979,10 +978,10 @@ public void setValue(String value) {
      * Return the object representation of the Field value. This method will
      * return a string value, or null if the string value is null or is zero
      * length.
-     * 
        
+     * 
        
      * Specialized object field subclasses should override this method to
-     * return a non string object. For examples a DoubleField would
-     * return a Double value instead.
+     * return a non string object. For examples a DoubleField would
+     * return a Double value instead.
      *
      * @return the object representation of the Field value
      */
@@ -1027,10 +1026,10 @@ public void setWidth(String value) {
 
     /**
      * This method binds the submitted request value to the Field's value.
-     * 
        
+     * 
        
      * Please note: while it is possible to explicitly bind the field
      * value by invoking this method directly, it is recommended to use the
-     * "bind" utility methods in {@link org.apache.click.util.ClickUtils}
+     * "bind" utility methods in {@link org.apache.click.util.ClickUtils}
      * instead. See {@link org.apache.click.util.ClickUtils#bind(org.apache.click.control.Field)}
      * for more details.
      */
@@ -1070,13 +1069,13 @@ public void setState(Object state) {
 
     /**
      * This method processes the page request returning true to continue
-     * processing or false otherwise. The Field onProcess() method is
-     * typically invoked by the Form onProcess() method when
+     * processing or false otherwise. The Field onProcess() method is
+     * typically invoked by the Form onProcess() method when
      * processing POST request.
-     * 
        
+     * 
        
      * This method will bind the Field request parameter value to the field,
      * validate the submission and invoke its callback listener if defined.
-     * 
        
+     * 
        
      * Below is a typical onProcess implementation:
      *
      * 
        @@ -1128,7 +1127,7 @@ public void removeState(Context context) {
 
     /**
      * Restore the Field state from the session for the given request context.
-     * 
        
+     * 
        
      * This method delegates to {@link #setState(java.lang.Object)} to set the
      * field restored state.
      *
@@ -1143,7 +1142,7 @@ public void restoreState(Context context) {
 
     /**
      * Save the Field state to the session for the given request context.
-     * 
        
+     * 
        
      * * This method delegates to {@link #getState()} to retrieve the field state
      * to save.
      *
@@ -1157,10 +1156,10 @@ public void saveState(Context context) {
     }
 
     /**
-     * The validate method is invoked by onProcess() to validate
+     * The validate method is invoked by onProcess() to validate
      * the request submission. Field subclasses should override this method
      * to implement request validation logic.
-     * 
        
+     * 
        
      * If the field determines that the submission is invalid it should set the
      * {@link #error} property with the error message.
      */
@@ -1171,7 +1170,7 @@ public void validate() {
 
     /**
      * Return a normalized label for display in error messages.
-     * 
        
+     * 
        
      * The error label is a normalized version of {@link #getLabel()}.
      *
      * @return a normalized label for error message display
@@ -1187,23 +1186,23 @@ protected String getErrorLabel() {
      * Set the error with the a label formatted message specified by the given
      * message bundle key. The message will be formatted with the field label
      * using {@link #getErrorLabel()}.
-     * 
        
+     * 
        
      * setErrorMessage will attempt to find a localized error message as
      * described here, using the following
      * lookup strategy:
      * 
          
      *   
        • 
      *     an error message is looked up for a specific Field instance by
-     *     prefixing the key with the Field's name:
+     *     prefixing the key with the Field's name:
      *     
          
-     *       getMessage(getName() + "." + key);
+     *       getMessage(getName() + "." + key);
      *     
          
      *   
          • 
      *   
        • 
      *     if no message is found for a specific Field instance, an error
-     *     message is looked up for the Field class based on the key:
+     *     message is looked up for the Field class based on the key:
      *     
          
-     *       getMessage(key);
+     *       getMessage(key);
      *     
          
      *   
          • 
      * 
        
@@ -1223,7 +1222,7 @@ protected void setErrorMessage(String key) {
      * Set the error with the a label and value formatted message specified by
      * the given message bundle key. The message will be formatted with the
      * field label {0} using {@link #getErrorLabel()} and the given value {1}.
-     * 
        
+     * 
        
      * Also see {@link #setErrorMessage(java.lang.String)} on how to
      * specify error messages for specific Field instances.
      *
@@ -1258,7 +1257,7 @@ protected String getRequestValue() {
 
     /**
      * Render the Field tag and common attributes including {@link #getName() name},
-     * {@link #getId() id}, class and style.
+     * {@link #getId() id}, class and style.
      *
      * @see org.openidentityplatform.openam.click.control.AbstractControl#renderTagBegin(java.lang.String, HtmlStringBuffer)
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/FileField.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/FileField.java
index 91c6b007af..34d4c70b5f 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/FileField.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/FileField.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -28,24 +29,25 @@
 /**
  * Provides a File Field control:   <input type='file'>.
  *
- * 
+ * 
        
+ * 
  * 
  * 
- * 
+ * 
  * 
  * 
        Example
        File Field<input type='file' value=''/>
        
  *
  * The FileField control uses the Jakarta Commons
  * FileUpload
  * library to provide file processing functionality.
- * 
        
+ * 
        
  * You can control the {@link org.apache.click.service.CommonsFileUploadService#sizeMax maximum request size}
  * and {@link org.apache.click.service.CommonsFileUploadService#fileSizeMax maximum file size}
  * by configuring {@link org.apache.click.service.CommonsFileUploadService}.
- * 
        
- * Note Browsers enforce the JavaScript value property as readonly
+ * 
        
+ * Note Browsers enforce the JavaScript value property as readonly
  * to prevent script based stealing of users files.
- * 
        
+ * 
        
  * You can make the file field invisible by setting the CSS display attribute, for
  * example:
  *
@@ -56,7 +58,7 @@
  *    <input type="button" value="show value" onclick="alert(fileName)">
  * </form> 
        
  *
- * 
        
+ * 
        
  * Please also see the references:
  * 
          
  * 
        • Apache Commons - Using FileUpload
          • 
@@ -160,7 +162,7 @@ public FileField(String name, String label, int size) {
 
     /**
      * Create an FileField with no name defined.
-     * 
          
+     * 
          
      * Please note the control's name must be defined before it is valid.
      */
     public FileField() {
@@ -170,7 +172,7 @@ public FileField() {
     // ------------------------------------------------------ Public Attributes
 
     /**
-     * Return the FileField's html tag: input.
+     * Return the FileField's html tag: input.
      *
      * @see org.apache.click.control.AbstractControl#getTag()
      *
@@ -185,7 +187,7 @@ public String getTag() {
      * Return the FileItem
      * after processing the request, or null otherwise.
      *
-     * @return the FileItem after processing a request
+     * @return the FileItem after processing a request
      */
     public FileItem getFileItem() {
         return fileItem;
@@ -210,9 +212,9 @@ public void setSize(int size) {
     }
 
     /**
-     * Return the input type: 'file'.
+     * Return the input type: 'file'.
      *
-     * @return the input type: 'file'
+     * @return the input type: 'file'
      */
     public String getType() {
         return "file";
@@ -330,7 +332,7 @@ public void render(HtmlStringBuffer buffer) {
 
     /**
      * Validate the FileField request submission.
-     * 
          
+     * 
          
      * A field error message is displayed if a validation error occurs.
      * These messages are defined in the resource bundle:
      * 
          
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Form.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Form.java
index c53a15c637..36e61f146c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Form.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Form.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -48,23 +49,26 @@
 /**
  * Provides a Form control:   <form method='post'>.
  *
- * 
+ * 
          
+ * 
  * 
  * 
          Example
          
  *
  * 
+ * 
  * 
- * 
- * 
+ * 
+ * 
  * 
  * 
- * 
- * 
+ * 
+ * 
  * 
  * 
          Example
          *<label>Username</label>*<input type='text' name='username' value='' size='20' maxlength='20'>
          *<label>Password</label>*<input type='password' name='password' value='' size='20' maxlength='20'>
          
  * 
+ * 
  * 
  * 
          Example
          
- *  
+ * <input type='submit' name='ok' value='  OK  '> <input type='submit' name='cancel' value=' Cancel '>
  * 
          
  *
@@ -77,7 +81,7 @@
  * {@link Button} controls in the added order. Once all the Fields have been
  * processed the form will invoke its action listener if defined.
  *
- * 
          Form Example
          
+ * 
          Form Example
          
  *
  * The example below illustrates a Form being used in a login Page.
  *
@@ -124,25 +128,25 @@
  * any of its Fields have validation errors they will be automatically
  * rendered, and the {@link #isValid()} method will return false.
  *
- * 
- * 
          Data Binding
          
+ * 
+ * 
          Data Binding
          
  *
  * To bind value objects to a forms fields use the copy methods:
  * 
            
- * 
          • value object   ->   form fields       
+ * 
          • value object   ->   form fields       
  * {@link #copyFrom(Object)}
            • 
- * 
          • form fields   ->   value object       
+ * 
          • form fields   ->   value object       
  * {@link #copyTo(Object)}
            • 
  * 
          
  * To debug the data binding being performed, use the Click application mode to
- * "debug" or use the debug copy methods.
- * 
          
+ * "debug" or use the debug copy methods.
+ * 
          
  * Binding of nested data objects is supported using the
  * OGNL library. To use
  * nested objects in your form, simply specify the object path as the Field
  * name. Note in the object path you exclude the root object, so the path
- * customer.address.state is specified as address.state.
- * 
          
+ * customer.address.state is specified as address.state.
+ * 
          
  * For example:
  *
  * 
          @@ -163,37 +167,37 @@
  * When populating an object from a form post Click will automatically create
  * any null nested objects so their properties can be set. To do this Click
  * uses the no-args constructor of the nested objects class.
- * 
          
+ * 
          
  * {@link #copyTo(Object)} and {@link #copyFrom(Object)} also supports
- * java.util.Map as an argument. Examples of using
- * java.util.Map are shown in the respective method descriptions.
+ * java.util.Map as an argument. Examples of using
+ * java.util.Map are shown in the respective method descriptions.
  *
- * 
- * 
          Form Validation
          
+ * 
+ * 
          Form Validation
          
  *
  * The Form control supports automatic field validation. By default when a POST
  * request is made the form will validate the field values. To disable
  * automatic validation set {@link #setValidate(boolean)} to false.
- * 
          
+ * 
          
  * Form also provides a {@link #validate()} method where subclasses can provide
  * custom cross-field validation.
- * 
          
+ * 
          
  * File Upload Validation
- * 
          
+ * 
          
  * The Form's {@link #validateFileUpload()} provides validation for multipart
  * requests (multipart requests are used for uploading files from the browser).
  * The {@link #validateFileUpload()} method checks that files being uploaded do not exceed the
  * {@link org.apache.click.service.CommonsFileUploadService#sizeMax maximum request size}
  * or the {@link org.apache.click.service.CommonsFileUploadService#fileSizeMax maximum file size}.
- * 
          
- * Note: if the maximum request size or maximum file size
+ * 
          
+ * Note: if the maximum request size or maximum file size
  * is exceeded, the request is deemed invalid ({@link #hasPostError hasPostError}
  * will return true), and no further processing is performed on the form or fields.
  * Instead the form will display the appropriate error message for the invalid request.
  * See {@link #validateFileUpload()} for details of the error message properties.
- * 
          
+ * 
          
  * JavaScript Validation
- * 
          
+ * 
          
  * The Form control also supports client side JavaScript validation. By default
  * JavaScript validation is not enabled. To enable JavaScript validation set
  * {@link #setJavaScriptValidation(boolean)} to true. For example:
@@ -217,15 +221,15 @@
  * prevents JavaScript form validation being performed when the cancel button is
  * clicked.
  *
- * 
- * 
          CSS and JavaScript resources
          
+ * 
+ * 
          CSS and JavaScript resources
          
  *
  * The Form control makes use of the following resources (which Click automatically
- * deploys to the application directory, /click):
+ * deploys to the application directory, /click):
  *
  * 
            
- * 
          • click/control.css
            • 
- * 
          • click/control.js
            • 
+ * 
          • click/control.css
            • 
+ * 
          • click/control.js
            • 
  * 
          
  *
  * To import these files and any form control imports simply reference
@@ -245,48 +249,49 @@
  * </body>
  * </html> 
          
  *
- * 
- * 
          Form Layout
          
+ * 
+ * 
          Form Layout
          
  * The Form control supports rendering using automatic and manual layout
  * techniques.
  *
- * 
- * 
          Auto Layout
          
+ * 
+ * 
          Auto Layout
          
  *
  * If you include a form variable in your template the form will be
  * automatically laid out and rendered. Auto layout, form and field rendering
  * options include:
  *
- * 
+ * 
          
+ * 
  * 
- * 
+ * 
  * 
  * 
  * 
  * 
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
  * 
  * 
  * 
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
  * 
  * 
          Example
          {@link #buttonAlign} button alignment:   ["left", "center", "right"]{@link #buttonAlign} button alignment:   ["left", "center", "right"]
          {@link #buttonStyle} button <td> "style" attribute value
          {@link #columns} number of form table columns, the default value number is 1
          {@link #errorsAlign} validation error messages alignment:   ["left", "center", "right"]{@link #errorsAlign} validation error messages alignment:   ["left", "center", "right"]
          {@link #errorsPosition} validation error messages position:   ["top", "middle", "bottom"]{@link #errorsPosition} validation error messages position:   ["top", "middle", "bottom"]
          {@link #errorsStyle} errors <td> "style" attribute value
          {@link #fieldStyle} field <td> "style" attribute value
          {@link #labelAlign} field label alignment:   ["left", "center", "right"]{@link #labelAlign} field label alignment:   ["left", "center", "right"]
          {@link #labelsPosition} label position relative to field:   ["left", "top"]{@link #labelsPosition} label position relative to field:   ["left", "top"]
          {@link #labelStyle} label <td> "style" attribute value
          click/control.css control CSS styles, automatically deployed to the click web directoryclick/control.css control CSS styles, automatically deployed to the click web directory
          /click-control.properties form and field messages and HTML, located under classpath
          
  *
- * 
- * 
          Manual Layout
          
+ * 
+ * 
          Manual Layout
          
  *
  * You can also manually layout the Form in the page template specifying
  * the fields using the named field notation:
@@ -298,7 +303,7 @@
  * always specify:
  * 
            
  *  
          • method
- *      - the form submission method ["post" | "get"]
            • 
+ *      - the form submission method ["post" | "get"]
  *  
          • name
  *      - the name of your form, important when using JavaScript
            • 
  *  
          • action
@@ -308,10 +313,10 @@
  * 
          
  * The hidden field is used by Click to determine which form was posted on
  * a page which may contain multiple forms.
- * 
          
+ * 
          
  * Alternatively you can use the Form {@link #startTag()} and {@link #endTag()}
  * methods to render this information.
- * 
          
+ * 
          
  * An example of a manually laid out Login form is provided below:
  *
  * 
          @@ -358,21 +363,21 @@
  * As you can see in this example most of the code and markup is generic and
  * could be reused. This is where Velocity Macros come in.
  *
- * 
- * 
          Velocity Macros
          
+ * 
+ * 
          Velocity Macros
          
  *
  * Velocity Macros
  * (velocimacros)
  * are a great way to encapsulate customized forms.
- * 
          
+ * 
          
  * To create a generic form layout you can use the Form {@link #getFieldList()} and
  * {@link #getButtonList()} properties within a Velocity macro. If you want to
  * access all Form Controls from within a Velocity template or macro use
  * {@link #getControls()}.
- * 
          
+ * 
          
  * The example below provides a generic writeForm()
  * macro which you could use through out an application. This Velocity macro code
- * would be contained in a macro file, e.g. macro.vm.
+ * would be contained in a macro file, e.g. macro.vm.
  *
  * 
           #* Custom Form Macro Code *#
  * #macro( writeForm[$form] )
@@ -423,39 +428,39 @@
  * At render time Velocity will execute the macro using the given form and render
  * the results to the response output stream.
  *
- * 
          Configuring Macros
          
+ * 
          Configuring Macros
          
  *
  * To configure your application to use your macros you can:
  * 
            
  *  
          • 
- *   Put your macros if a file called macro.vm
+ *   Put your macros if a file called macro.vm
  *   in your applications root directory.
  *  
            • 
  *  
          • 
  *   Put your macros in the auto deployed
- *   click/VM_global_macro.vm file.
+ *   click/VM_global_macro.vm file.
  *  
            • 
  *  
          • 
  *   Create a custom named macro file and reference it in a
- *   WEB-INF/velocity.properties
+ *   WEB-INF/velocity.properties
  *   file under the property named
- *   velocimacro.library.
+ *   velocimacro.library.
  *  
            • 
  * 
          
  *
- * 
- * 
          Preventing Accidental Form Posts
          
+ * 
+ * 
          Preventing Accidental Form Posts
          
  *
  * Users may accidentally make multiple form submissions by refreshing a page
  * or by pressing the back button.
- * 
          
+ * 
          
  * To prevent multiple form posts from page refreshes use the Post
  * Redirect pattern. With this pattern once the user has posted a form you
  * redirect to another page. If the user then presses the refresh button, they
  * will making a GET request on the current page. Please see the
  * Redirect After Post
  * article for more information on this topic.
- * 
          
+ * 
          
  * To prevent multiple form posts from use of the browser back button use one
  * of the Form {@link #onSubmitCheck(Page, String)} methods. For example:
  *
@@ -471,14 +476,14 @@
  * The form submit check methods store a special token in the users session
  * and in a hidden field in the form to ensure a form post isn't replayed.
  *
- * 
- * 
          Dynamic Forms and not validating a request
          
+ * 
+ * 
          Dynamic Forms and not validating a request
          
  *
  * A common use case for web applications is to create Form fields dynamically
  * based upon user selection. For example if a checkbox is ticked another Field
  * is added to the Form. A simple way to achieve this is using JavaScript
  * to submit the Form when the Field is changed or clicked.
- * 
          
+ * 
          
  * When submitting a Form using JavaScript, it is often desirable to not
  * validate the fields since the user is still filling out the form.
  * To cater for this use case, Form provides the {@link #setValidate(boolean)}
@@ -496,14 +501,14 @@
  *     ClickUtils.bind(submit);
  *
  *     // If submit was not clicked, don't validate
- *     if(form.isFormSubmission() && !submit.isClicked()) {
+ *     if(form.isFormSubmission() && !submit.isClicked()) {
  *         form.setValidate(false);
  *     }
  * } 
          
  *
- * 
           
          
+ * 
           
          
  * See also the W3C HTML reference:
- * FORM
  *
  * @see org.openidentityplatform.openam.click.control.Field
@@ -515,41 +520,41 @@ public class Form extends AbstractContainer implements Stateful {
 
     private static final long serialVersionUID = 1L;
 
-    /** The align left, form layout constant:   "left". */
+    /** The align left, form layout constant:   "left". */
     public static final String ALIGN_LEFT = "left";
 
-    /** The align center, form layout constant:   "center". */
+    /** The align center, form layout constant:   "center". */
     public static final String ALIGN_CENTER = "center";
 
-    /** The align right, form layout constant:   "right". */
+    /** The align right, form layout constant:   "right". */
     public static final String ALIGN_RIGHT = "right";
 
     /**
      * The position top, errors and labels form layout constant:  
-     * "top".
+     * "top".
      */
     public static final String POSITION_TOP = "top";
 
     /**
      * The position middle, errors in middle form layout constant:  
-     * "middle".
+     * "middle".
      */
     public static final String POSITION_MIDDLE = "middle";
 
     /**
      * The position bottom, errors on bottom form layout constant:  
-     * "top".
+     * "top".
      */
     public static final String POSITION_BOTTOM = "bottom";
 
     /**
      * The position left, labels of left form layout constant:  
-     * "left".
+     * "left".
      */
     public static final String POSITION_LEFT = "left";
 
     /**
-     * The form name parameter for multiple forms:   "form_name".
+     * The form name parameter for multiple forms:   "form_name".
      */
     public static final String FORM_NAME = "form_name";
 
@@ -558,7 +563,7 @@ public class Form extends AbstractContainer implements Stateful {
 
     /**
      * The submit check reserved request parameter prefix:  
-     * SUBMIT_CHECK_.
+     * SUBMIT_CHECK_.
      */
     public static final String SUBMIT_CHECK = "SUBMIT_CHECK_";
 
@@ -587,8 +592,8 @@ public class Form extends AbstractContainer implements Stateful {
     protected final List fieldList = new ArrayList<>();
 
     /**
-     * The form method ["post, "get"], default value:  
-     * post.
+     * The form method ["post, "get"], default value:  
+     * post.
      */
     protected String method = "post";
 
@@ -598,7 +603,7 @@ public class Form extends AbstractContainer implements Stateful {
     /** The form validate fields when processing flag. */
     protected boolean validate = true;
 
-    /** The button align, default value is "left". */
+    /** The button align, default value is "left". */
     protected String buttonAlign = ALIGN_LEFT;
 
     /** The ordered list of button values. */
@@ -608,27 +613,27 @@ public class Form extends AbstractContainer implements Stateful {
     protected String buttonStyle;
 
     /**
-     * The number of form layout table columns, default value: 1.
-     * 
          
+     * The number of form layout table columns, default value: 1.
+     * 
          
      * This property is used to layout the number of table columns the form
      * is rendered with using a flow layout style.
      */
     protected int columns = 1;
 
     /**
-     * The default field size, default value: 0.
-     * 
          
+     * The default field size, default value: 0.
+     * 
          
      * If the form default field size is greater than 0, when fields are added
      * to the form the field's size will be set to the default value.
      */
     protected int defaultFieldSize;
 
-    /** The errors block align, default value is "left". */
+    /** The errors block align, default value is "left". */
     protected String errorsAlign = ALIGN_LEFT;
 
     /**
-     * The form errors position ["top", "middle", "bottom"] default
-     * value:   "top".
+     * The form errors position ["top", "middle", "bottom"] default
+     * value:   "top".
      */
     protected String errorsPosition = POSITION_TOP;
 
@@ -650,12 +655,12 @@ public class Form extends AbstractContainer implements Stateful {
      */
     protected boolean javaScriptValidation;
 
-    /** The label align, default value is "left". */
+    /** The label align, default value is "left". */
     protected String labelAlign = ALIGN_LEFT;
 
     /**
-     * The form labels position ["left", "top"] default value:  
-     * "left".
+     * The form labels position ["left", "top"] default value:  
+     * "left".
      */
     protected String labelsPosition = POSITION_LEFT;
 
@@ -682,7 +687,7 @@ public Form(String name) {
 
     /**
      * Create a form with no name.
-     * 
          
+     * 
          
      * Please note the control's name must be defined before it is valid.
      */
     public Form() {
@@ -693,23 +698,23 @@ public Form() {
     /**
      * Add the control to the form at the specified index, and return the
      * added instance.
-     * 
          
+     * 
          
      * Please note: if the form contains a control with the same name as
      * the given control, that control will be
      * {@link #replace(Control, Control) replaced}
      * by the given control. If a control has no name defined it cannot be replaced.
-     * 
          
+     * 
          
      * Controls can be retrieved from the Map {@link #getControlMap() controlMap}
      * where the key is the Control name and value is the Control instance.
-     * 
          
+     * 
          
      * All controls are available on the {@link #getControls() controls} list
      * at the index they were inserted. If you are only interested in Fields,
      * note that Buttons are available on the {@link #getButtonList() buttonList}
      * while other fields are available on {@link #getFieldList() fieldList}.
-     * 
          
+     * 
          
      * The specified index only applies to {@link #getControls() controls}, not
      * {@link #getButtonList() buttonList} or {@link #getFieldList() fieldList}.
-     * 
          
+     * 
          
      * Please note if the specified control already has a parent assigned,
      * it will automatically be removed from that parent and inserted into the
      * form.
@@ -724,7 +729,7 @@ public Form() {
      * and container is the same instance or if the Field name is not defined
      *
      * @throws IndexOutOfBoundsException if index is out of range
-     * (index < 0 || index > getControls().size())
+     * (index < 0 || index > getControls().size())
      */
     @Override
     public Control insert(Control control, int index) {
@@ -788,15 +793,15 @@ public Control insert(Control control, int index) {
 
     /**
      * Add a Control to the form and return the added instance.
-     * 
          
+     * 
          
      * Please note: if the form contains a control with the same name as
      * the given control, that control will be
      * {@link #replace(Control, Control) replaced}
      * by the given control. If a control has no name defined it cannot be replaced.
-     * 
          
+     * 
          
      * Controls can be retrieved from the Map {@link #getControlMap() controlMap}
      * where the key is the Control name and value is the Control instance.
-     * 
          
+     * 
          
      * All controls are available on the {@link #getControls() controls} list
      * in the order they were added. If you are only interested in Fields,
      * note that Buttons are available on the {@link #getButtonList() buttonList}
@@ -817,15 +822,15 @@ public Control add(Control control) {
 
     /**
      * Add the field to the form, and set the fields form property.
-     * 
          
+     * 
          
      * Please note: if the form contains a control with the same name as
      * the given control, that control will be
      * {@link #replace(Control, Control) replaced}
      * by the given control. If a control has no name defined it cannot be replaced.
-     * 
          
+     * 
          
      * Fields can be retrieved from the Map {@link #getFields() fields} where
      * the key is the Field name and value is the Field instance.
-     * 
          
+     * 
          
      * Buttons are available on the {@link #getButtonList() buttonList} while
      * other fields are available on {@link #getFieldList() fieldList}.
      *
@@ -843,17 +848,17 @@ public Field add(Field field) {
 
     /**
      * Add the field to the form and specify the field's width in columns.
-     * 
          
+     * 
          
      * Please note: if the form contains a control with the same name as
      * the given control, that control will be
      * {@link #replace(Control, Control) replaced}
      * by the given control. If a control has no name defined it cannot be replaced.
-     * 
          
+     * 
          
      * Fields can be retrieved from the Map {@link #getFields() fields} where
      * the key is the Field name and value is the Field instance.
-     * 
          
+     * 
          
      * Fields are available on {@link #getFieldList() fieldList}.
-     * 
          
+     * 
          
      * Note Button and HiddenField types are not valid arguments for this method.
      *
      * @see #add(Control)
@@ -872,17 +877,17 @@ public Field add(Field field, int width) {
 
     /**
      * Add the control to the form and specify the control's width in columns.
-     * 
          
+     * 
          
      * Please note: if the form contains a control with the same name as
      * the given control, that control will be
      * {@link #replace(Control, Control) replaced}
      * by the given control. If a control has no name defined it cannot be replaced.
-     * 
          
+     * 
          
      * Controls can be retrieved from the Map {@link #getControlMap() controlMap}
      * where the key is the Control name and value is the Control instance.
-     * 
          
+     * 
          
      * Controls are available on the {@link #getControls() controls} list.
-     * 
          
+     * 
          
      * Note Button and HiddenField types are not valid arguments for this method.
      *
      * @see #add(Control)
@@ -1042,7 +1047,7 @@ public void removeFields(List fieldNames) {
     // Public Attributes ------------------------------------------------------
 
     /**
-     * Return the form's html tag: form.
+     * Return the form's html tag: form.
      *
      * @see org.apache.click.control.AbstractControl#getTag()
      *
@@ -1059,12 +1064,12 @@ public String getTag() {
      * page containing the form. This is the default behaviour for most scenarios.
      * However if you explicitly specify the form "action" URL attribute, this
      * value will be used instead.
-     * 
          
+     * 
          
      * Setting the form action attribute is useful for situations where you want
      * a form to submit to a different page. This can also be used to have a
      * form submit to the J2EE Container for authentication, by setting the
-     * action URL to "j_security_check".
-     * 
          
+     * action URL to "j_security_check".
+     * 
          
      * The action URL will always be encoded by the response to ensure it includes
      * the Session ID if required.
      *
@@ -1086,11 +1091,11 @@ public String getActionURL() {
      * Return the form "action" attribute URL value. By setting this value you
      * will override the default action URL which points to the page containing
      * the form.
-     * 
          
+     * 
          
      * Setting the form action attribute is useful for situations where you want
      * a form to submit to a different page. This can also be used to have a
      * form submit to the J2EE Container for authentication, by setting the
-     * action URL to "j_security_check".
+     * action URL to "j_security_check".
      *
      * @param value the form "action" attribute URL value
      */
@@ -1225,8 +1230,8 @@ public String getFieldValue(String name) {
      * The following resources are returned:
      *
      * 
            
-     * 
          • click/control.css
            • 
-     * 
          • click/control.js
            • 
+     * 
          • click/control.css
            • 
+     * 
          • click/control.js
            • 
      * 
          
      *
      * @see Control#getHeadElements()
@@ -1248,8 +1253,8 @@ public List getHeadElements() {
     }
 
     /**
-     * Return the form method ["post" | "get"], default value is
-     * post.
+     * Return the form method ["post" | "get"], default value is
+     * post.
      *
      * @return the form method
      */
@@ -1258,7 +1263,7 @@ public String getMethod() {
     }
 
     /**
-     * Set the form method ["post" | "get"].
+     * Set the form method ["post" | "get"].
      *
      * @param value the form method
      */
@@ -1268,14 +1273,14 @@ public void setMethod(String value) {
 
     /**
      * Return true if the page request is a submission from this form.
-     * 
          
+     * 
          
      * A form submission requires the following criteria:
      * 
            
      *   
          • the Form name must be present as a request parameter (Form
      *   automatically adds a HiddenField which value is set to the Form name.
      *   This ensures the Form name is present when submitting the form)
            • 
      *   
          • the request method must equal the Form {@link #method}, for example
-     *   both must be GET or POST
            • 
+     *   both must be GET or POST
      * 
          
      *
      * @return true if the page request is a submission from this form
@@ -1360,9 +1365,9 @@ public boolean isValid() {
 
     /**
      * Return the ordered list of form fields, excluding buttons.
-     * 
          
+     * 
          
      * The order of the fields is the same order they were added to the form.
-     * 
          
+     * 
          
      * The returned list includes only fields added directly to the Form.
      *
      * @return the ordered List of form fields, excluding buttons
@@ -1374,7 +1379,7 @@ public List getFieldList() {
     /**
      * Return the Map of form fields (including buttons), keyed
      * on field name.
-     * 
          
+     * 
          
      * The returned map includes only fields added directly to the Form.
      *
      * @see #getControlMap()
@@ -1399,7 +1404,7 @@ public boolean getValidate() {
 
     /**
      * Set the Form field validation flag, telling the Fields to validate
-     * themselves when their onProcess() method is invoked.
+     * themselves when their onProcess() method is invoked.
      *
      * @param validate the Form field validation flag
      */
@@ -1408,8 +1413,8 @@ public void setValidate(boolean validate) {
     }
 
     /**
-     * Return the buttons <td> HTML horizontal alignment: "left",
-     * "center", "right".
+     * Return the buttons <td> HTML horizontal alignment: "left",
+     * "center", "right".
      *
      * @return the field label HTML horizontal alignment
      */
@@ -1418,8 +1423,8 @@ public String getButtonAlign() {
     }
 
     /**
-     * Set the button <td> HTML horizontal alignment: "left",
-     * "center", "right".
+     * Set the button <td> HTML horizontal alignment: "left",
+     * "center", "right".
      * Note the given align is not validated.
      *
      * @param align the field label HTML horizontal alignment
@@ -1430,9 +1435,9 @@ public void setButtonAlign(String align) {
 
     /**
      * Return the ordered list of {@link Button}s.
-     * 
          
+     * 
          
      * The order of the buttons is the same order they were added to the form.
-     * 
          
+     * 
          
      * The returned list includes only buttons added directly to the Form.
      *
      * @return the ordered list of {@link Button}s.
@@ -1502,8 +1507,8 @@ public void setDefaultFieldSize(int size) {
     }
 
     /**
-     * Return the errors block HTML horizontal alignment: "left",
-     * "center", "right".
+     * Return the errors block HTML horizontal alignment: "left",
+     * "center", "right".
      *
      * @return the errors block HTML horizontal alignment
      */
@@ -1512,8 +1517,8 @@ public String getErrorsAlign() {
     }
 
     /**
-     * Set the errors block HTML horizontal alignment: "left",
-     * "center", "right".
+     * Set the errors block HTML horizontal alignment: "left",
+     * "center", "right".
      * Note the given align is not validated.
      *
      * @param align the errors block HTML horizontal alignment
@@ -1523,7 +1528,7 @@ public void setErrorsAlign(String align) {
     }
 
     /**
-     * Return the form errors position ["top", "middle", "bottom"].
+     * Return the form errors position ["top", "middle", "bottom"].
      *
      * @return form errors position
      */
@@ -1532,7 +1537,7 @@ public String getErrorsPosition() {
     }
 
     /**
-     * Set the form errors position ["top", "middle", "bottom"].
+     * Set the form errors position ["top", "middle", "bottom"].
      *
      * @param position the form errors position
      */
@@ -1627,8 +1632,8 @@ public void setJavaScriptValidation(boolean validate) {
     }
 
     /**
-     * Return the field label HTML horizontal alignment: "left",
-     * "center", "right".
+     * Return the field label HTML horizontal alignment: "left",
+     * "center", "right".
      *
      * @return the field label HTML horizontal alignment
      */
@@ -1637,8 +1642,8 @@ public String getLabelAlign() {
     }
 
     /**
-     * Set the field label HTML horizontal alignment: "left",
-     * "center", "right".
+     * Set the field label HTML horizontal alignment: "left",
+     * "center", "right".
      * Note the given align is not validated.
      *
      * @param align the field label HTML horizontal alignment
@@ -1648,7 +1653,7 @@ public void setLabelAlign(String align) {
     }
 
     /**
-     * Return the form labels position ["left", "top"].
+     * Return the form labels position ["left", "top"].
      *
      * @return form labels position
      */
@@ -1657,7 +1662,7 @@ public String getLabelsPosition() {
     }
 
     /**
-     * Set the form labels position ["left", "top"].
+     * Set the form labels position ["left", "top"].
      *
      * @param position the form labels position
      */
@@ -1680,7 +1685,7 @@ public String getLabelStyle() {
 
     /**
      * Set the label <td> "style" attribute value.
-     * 
          
+     * 
          
      * This value can be overridden by Fields through their
      * {@link Field#setParentStyleHint(String)} property.
      *
@@ -1734,7 +1739,7 @@ public void clearValues() {
      * Copy the given object's attributes into the Form's field values. In
      * other words automatically populate Form's field values with the
      * given objects attributes.
-     * 
          
+     * 
          
      * The following example populates the Form field with Customer
      * attributes:
      *
@@ -1745,12 +1750,12 @@ public void clearValues() {
      *     form.copyFrom(customer);
      * } 
          
      *
-     * copyForm also supports java.util.Map as an argument.
-     * 
          
+     * copyForm also supports java.util.Map as an argument.
+     * 
          
      * By specifying a map, the Form's field values will be populated by
      * matching key/value pairs. A match occurs when the map's key is equal to
      * a field's name.
-     * 
          
+     * 
          
      * The following example populates the Form fields with a map's
      * key/value pairs:
      *
@@ -1781,8 +1786,8 @@ public void copyFrom(Object object) {
     /**
      * Copy the given object's attributes into the Form's field values. In other
      * words automatically populate Forms field values with the given objects
-     * attributes. copyFrom also supports java.util.Map as an argument.
-     * 
          
+     * attributes. copyFrom also supports java.util.Map as an argument.
+     * 
          
      * If the debug parameter is true, debugging messages will be
      * logged.
      *
@@ -1800,7 +1805,7 @@ public void copyFrom(Object object, boolean debug) {
      * Copy the Form's field values into the given object's attributes. In
      * other words automatically populate Object attributes with the Form's
      * field values.
-     * 
          
+     * 
          
      * The following example populates the Customer attributes with the
      * Form's field values:
      *
@@ -1814,12 +1819,12 @@ public void copyFrom(Object object, boolean debug) {
      *     return true;
      * } 
      *
-     * copyTo also supports java.util.Map as an argument.
-     * 
          
+     * copyTo also supports java.util.Map as an argument.
+     * 
          
      * By specifying a map, the map's key/value pairs are populated from
      * matching Form field names. A match occurs when a field's name is
      * equal to a map's key.
-     * 
          
+     * 
          
      * The following example populates the map with the Form field values:
      *
      * 
          @@ -1852,8 +1857,8 @@ public void copyTo(Object object) {
     /**
      * Copy the Form's field values into the given object's attributes. In other
      * words automatically populate Object attributes with the Forms field
-     * values. copyTo also supports java.util.Map as an argument.
-     * 
          
+     * values. copyTo also supports java.util.Map as an argument.
+     * 
          
      * If the debug parameter is true, debugging messages will be
      * logged.
      *
@@ -1921,10 +1926,10 @@ public void setState(Object state) {
     /**
      * Process the Form and its child controls only if the Form was submitted
      * by the user.
-     * 
          
+     * 
          
      * This method invokes {@link #isFormSubmission()} to check whether the form
      * was submitted or not.
-     * 
          
+     * 
          
      * The Forms processing order is:
      * 
            
      * 
          1. All {@link Field} controls in the order they were added
            2. 
@@ -1997,7 +2002,7 @@ public void onDestroy() {
      * The validate method is invoked by {@link #onProcess()} to validate
      * the request submission. A Form subclass can override this method
      * to implement cross-field validation logic.
-     * 
            
+     * 
            
      * If the Form determines that the submission is invalid it should set the
      * {@link #error} property with an appropriate error message. For example:
      *
@@ -2025,10 +2030,10 @@ public void validate() {
      * clicking the Form submit button twice, in quick succession. If the form
      * submit is valid this method will return true, otherwise set the page to
      * redirect to the given redirectPath and return false.
-     * 
            
+     * 
            
      * This method will add a token to the user's session and a hidden field
      * to the form to validate future submits.
-     * 
            
+     * 
            
      * Form submit checks should be performed before the pages controls are
      * processed in the Page onSecurityCheck method. For example:
      *
@@ -2043,7 +2048,7 @@ public void validate() {
      *
      * Form submit checks should generally be combined with the Post-Redirect
      * pattern which provides a better user experience when pages are refreshed.
-     * 
            
+     * 
            
      * Please note: a call to onSubmitCheck always succeeds for Ajax
      * requests.
      *
@@ -2075,10 +2080,10 @@ public boolean onSubmitCheck(Page page, String redirectPath) {
      * form submission by using the browser back button. If the form submit
      * is valid this method will return true, otherwise set the page to
      * redirect to the given Page class and return false.
-     * 
            
+     * 
            
      * This method will add a token to the user's session and a hidden field
      * to the form to validate future submits.
-     * 
            
+     * 
            
      * Form submit checks should be performed before the pages controls are
      * processed in the Page onSecurityCheck method. For example:
      *
@@ -2093,7 +2098,7 @@ public boolean onSubmitCheck(Page page, String redirectPath) {
      *
      * Form submit checks should generally be combined with the Post-Redirect
      * pattern which provides a better user experience when pages are refreshed.
-     * 
            
+     * 
            
      * Please note: a call to onSubmitCheck always succeeds for Ajax
      * requests.
      *
@@ -2125,10 +2130,10 @@ public boolean onSubmitCheck(Page page, Class pageClass) {
      * form submission by using the browser back button. If the form submit
      * is valid this method will return true, otherwise the given listener
      * object and method will be invoked.
-     * 
            
+     * 
            
      * This method will add a token to the users session and a hidden field
      * to the form to validate future submit's.
-     * 
            
+     * 
            
      * Form submit checks should be performed before the pages controls are
      * processed in the Page onSecurityCheck method. For example:
      *
@@ -2149,7 +2154,7 @@ public boolean onSubmitCheck(Page page, Class pageClass) {
      *
      * Form submit checks should generally be combined with the Post-Redirect
      * pattern which provides a better user experience when pages are refreshed.
-     * 
            
+     * 
            
      * Please note: a call to onSubmitCheck always succeeds for Ajax
      * requests.
      *
@@ -2199,7 +2204,7 @@ public void removeState(Context context) {
 
     /**
      * Restore the Form state from the session for the given request context.
-     * 
            
+     * 
            
      * This method delegates to {@link #setState(Object)} to set the
      * form restored state.
      *
@@ -2214,7 +2219,7 @@ public void restoreState(Context context) {
 
     /**
      * Save the Form state to the session for the given request context.
-     * 
            
+     * 
            
      * * This method delegates to {@link #getState()} to retrieve the form state
      * to save.
      *
@@ -2262,7 +2267,7 @@ public String endTag() {
 
     /**
      * Render the HTML representation of the Form.
-     * 
            
+     * 
            
      * If the form contains errors after processing, these errors will be
      * rendered.
      *
@@ -2447,7 +2452,7 @@ protected void renderHeader(HtmlStringBuffer buffer, List formFields) {
 
     /**
      * Render the non hidden Form Fields to the string buffer.
-     * 
            
+     * 
            
      * This method delegates the rendering of the form fields to
      * {@link #renderControls(HtmlStringBuffer, Container, List, Map, int)}.
      *
@@ -2478,7 +2483,7 @@ protected void renderFields(HtmlStringBuffer buffer) {
 
     /**
      * Render the specified controls of the container to the string buffer.
-     * 
            
+     * 
            
      * fieldWidths is a map specifying the width for specific fields contained
      * in the list of controls. The fieldWidths map is keyed on field name.
      *
@@ -2828,9 +2833,9 @@ protected void renderButtons(HtmlStringBuffer buffer) {
 
     /**
      * Close the form tag and render any additional content after the Form.
-     * 
            
-     * Additional content includes javascript validation and
-     * javascript focus scripts.
+     * 
            
+     * Additional content includes javascript validation and
+     * javascript focus scripts.
      *
      * @param formFields all fields contained within the form
      * @param buffer the buffer to render to
@@ -2972,7 +2977,7 @@ protected boolean hasPostError() {
 
     /**
      * Validate the request for any file upload (multipart) errors.
-     * 
            
+     * 
            
      * A form error message is displayed if a file upload error occurs.
      * These messages are defined in the resource bundle:
      * 
            
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/HiddenField.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/HiddenField.java
index c910ec2e36..836120c43a 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/HiddenField.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/HiddenField.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -29,7 +30,7 @@
 
 /**
  * Provides a Hidden Field control:   <input type='hidden'>.
- * 
            
+ * 
            
  * The HiddenField control is useful for storing state information in a Form,
  * such as object ids, instead of using the Session object. This control is
  * capable of supporting the following classes:
              
@@ -43,13 +44,13 @@
  * 
            • String
              • 
  * 
            • Serializable
              • 
  * 
            
- * 
            
+ * 
            
  * Serializable non-primitive objects will be serialized, compressed and
  * Base64 encoded, using {@link ClickUtils#encode(Object)}
  * method, and decoded using the corresponding
  * {@link ClickUtils#decode(String)} method.
  *
- * 
            HiddenField Example
            
+ * 
            HiddenField Example
            
  *
  * An example is provided below which uses a hidden field to count the number of
  * times a form is consecutively submitted. The count is displayed in the
@@ -81,7 +82,7 @@
  * } 
          
  *
  * See also W3C HTML reference
- * INPUT
  */
 public class HiddenField extends Field {
@@ -145,7 +146,7 @@ public HiddenField() {
     // ------------------------------------------------------ Public Attributes
 
     /**
-     * Return the hiddenfield's html tag: input.
+     * Return the hiddenfield's html tag: input.
      *
      * @see AbstractControl#getTag()
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Label.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Label.java
index 695b9c2c87..b1b64f2251 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Label.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Label.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -25,7 +26,7 @@
  * processing, and is used primarily to add descriptive labels or horizontal
  * rules to auto rendered forms.
  *
- * 
          Label Example
          
+ * 
          Label Example
          
  *
  * A Label example:
  *
@@ -47,11 +48,11 @@ public class Label extends Field {
 
     /**
      * Create a Label display control.
-     * 
          
+     * 
          
      * Note the Label control will attempt to find a localized label message
      * in the parent messages, and if not found then in the field messages
-     * using the key name of getName() + ".label".
-     * 
          
+     * using the key name of getName() + ".label".
+     * 
          
      * If a value cannot be found in the parent or control messages then the
      * Field name will be converted into a label using the
      * {@link org.apache.click.util.ClickUtils#toLabel(String)} method.
@@ -74,7 +75,7 @@ public Label(String name, String label) {
 
     /**
      * Create a Label with no label/name defined.
-     * 
          
+     * 
          
      * Please note the control's name must be defined before it is valid.
      */
     public Label() {
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Radio.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Radio.java
index 11bb18d328..3f8bfc0d3a 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Radio.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Radio.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -25,9 +26,10 @@
 /**
  * Provides a Radio control:   <input type='radio'>.
  *
- * 
+ * 
          
+ * 
  * 
- * 
+ * 
  * 
  * 
          Example
          Radio<input type='radio' name='header' value='Radio Control'>Radio</input>
          
  *
@@ -36,9 +38,9 @@
  * When used with a RadioGroup the Radio control will derive its name from the
  * parent RadioGroup, if the Radio's name is not defined.
  *
- * 
          
+ * 
          
  * See also W3C HTML reference
- * INPUT
  *
  * @see RadioGroup
@@ -96,7 +98,7 @@ public Radio() {
     // ------------------------------------------------------ Public Attributes
 
     /**
-     * Return the radio's html tag: input.
+     * Return the radio's html tag: input.
      *
      * @see AbstractControl#getTag()
      *
@@ -175,7 +177,7 @@ public String getId() {
      *
      * @param parent the parent of the Control
      * @throws IllegalArgumentException if the given parent instance is
-     * referencing this object: if (parent == this)
+     * referencing this object: if (parent == this)
      */
     @Override
     public void setParent(Object parent) {
@@ -187,25 +189,25 @@ public void setParent(Object parent) {
 
     /**
      * Return the field display label.
-     * 
          
+     * 
          
      * If the label value is null, this method will attempt to find a
      * localized label message in the parent messages using the key:
-     * 
          
+     * 
          
      * If the Radio name attribute is not null:
      * 
          
-     * super.getName() + ".label"
+     * super.getName() + ".label"
      * 
          
      * If the Radio name attribute is null and the parent of the Radio is the RadioGroup:
      * 
          
-     * parent.getName() + "." + getValue() + ".label"
+     * parent.getName() + "." + getValue() + ".label"
      * 
          
      * If not found then the message will be looked up in the
-     * /click-control.properties file using the same key.
+     * /click-control.properties file using the same key.
      * If a value still cannot be found then the Field name will be
      * the radio value.
-     * 
          
-     * For example given a CustomerPage with the properties file
-     * CustomerPage.properties:
+     * 
          
+     * For example given a CustomerPage with the properties file
+     * CustomerPage.properties:
      *
      * 
                * gender.M.label=Male
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/RadioGroup.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/RadioGroup.java
index 45aac06899..9cd5ce1cfb 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/RadioGroup.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/RadioGroup.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -33,13 +34,14 @@
 /**
  * Provides a RadioGroup control.
  *
- * 
+ * 
          
+ * 
  * 
  * 
  * 
  * 
  * 
          Example
          Radio Group
- * Red 
- * Green 
- * Blue
+ * <input type='radio' name='header' value='R'>Red </input>
+ * <input type='radio' name='header' checked value='G'>Green </input>
+ * <input type='radio' name='header' value='B'>Blue</input>
  * 
          
@@ -49,7 +51,7 @@
  * the RadioGroup. This will ensure the buttons will toggle together so that
  * only one button is selected at a time.
  *
- * 
          RadioGroup Example
          
+ * 
          RadioGroup Example
          
  *
  * The example below illustrates a RadioGroup being added to a form.
  *
@@ -75,18 +77,19 @@
  * This radio group field would be render as:
  *
  * 
+ * 
  *  
  *   
  *   
  *  
  * 
          Example
          Packaging
- *    Standard
          
- *    Protective
          
- *    Gift Wrap
+ *    <input type='radio' name='group' checked value='STD'>Standard</input>
          
+ *    <input type='radio' name='group' value='PRO'>Protective</input>
          
+ *    <input type='radio' name='group' value='GFT'>Gift Wrap</input>
  *   
          
  *
  * See also W3C HTML reference
- * INPUT
  *
  * @see Radio
@@ -174,7 +177,7 @@ public RadioGroup(String name, String label, boolean required) {
 
     /**
      * Create a RadioGroup field with no name.
-     * 
          
+     * 
          
      * Please note the control's name must be defined before it is valid.
      */
     public RadioGroup() {
@@ -223,8 +226,8 @@ public void addAll(Collection options) {
      * Add the given Map of radio values and labels to the RadioGroup.
      * The Map entry key will be used as the radio value and the Map entry
      * value will be used as the radio label.
-     * 
          
-     * It is recommended that LinkedHashMap is used as the Map
+     * 
          
+     * It is recommended that LinkedHashMap is used as the Map
      * parameter to maintain the order of the radio items.
      *
      * @param options the Map of radio option values and labels to add
@@ -324,7 +327,7 @@ public String getFocusJavaScript() {
     /**
      * @see Field#setForm(Form)
      *
-     * @param form Field's parent Form
+     * @param form Field's parent Form
      */
     @Override
     public void setForm(Form form) {
@@ -543,11 +546,11 @@ public String toString() {
 
     /**
      * Validate the RadioGroup request submission.
-     * 
          
+     * 
          
      * A field error message is displayed if a validation error occurs.
      * These messages are defined in the resource bundle: 
          
      * 
          org.apache.click.control.MessageProperties
          
-     * 
          
+     * 
          
      * Error message bundle key names include: 
            
      * 
          • select-error
            • 
      * 
          
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Renderable.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Renderable.java
index fe12dca543..7844080d0e 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Renderable.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Renderable.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -24,7 +25,7 @@
 
 /**
  * Provides an interface for rendering output to an efficient string buffer.
- * 
          
+ * 
          
  * Implementations of this interface will normally render HTML markup.
  */
 public interface Renderable extends Serializable {
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Table.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Table.java
index 61497b65b2..2eb35d42d9 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Table.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/Table.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -44,10 +45,11 @@
 /**
  * Provides a HTML Table control: <table>.
  *
- * 
+ * 
          
+ * 
  * 
  * 
  * 
  * 
          Example
          
- * 
+ * Table
  * 
          
@@ -57,7 +59,7 @@
  * like functionality. The design of the Table control has been informed by
  * the excellent DisplayTag library.
  *
- * 
          Table Example
          
+ * 
          Table Example
          
  *
  * An example Table usage is provided below:
  *
@@ -102,21 +104,21 @@
  *     }
  * } 
          
  *
- * 
          DataProvider
          
+ * 
          DataProvider
          
  * In the example above a {@link DataProvider}
  * is used to populate the Table {@link #setRowList(List) row list}
  * from. DataProviders are used to provide data on demand to controls. For very
- * large data sets use a {@link PagingDataProvider}
+ * large data sets use a {@link PagingDataProvider}
  * instead. See the section large data sets for
  * details.
  *
- * 
          CSS and JavaScript resources
          
+ * 
          CSS and JavaScript resources
          
  *
  * The Table control makes use of the following resources (which Click automatically
- * deploys to the application directory, /click):
+ * deploys to the application directory, /click):
  *
  * 
            
- * 
          • click/table.css
            • 
+ * 
          • click/table.css
            • 
  * 
          
  *
  * To import the Table CSS styles and any control JavaScript simply reference
@@ -136,9 +138,9 @@
  * </body>
  * </html> 
  *
- * 
          Table Styles
          
+ * 
          Table Styles
          
  *
- * The table CSS style sheet is adapted from the DisplayTag screen.css
+ * The table CSS style sheet is adapted from the DisplayTag screen.css
  * style sheet and includes the styles:
  *
  * 
            
@@ -166,36 +168,36 @@
  * } 
  *
  * An alternative method of specifying the table class to use globally for your
- * application is to define a table-default-class message property
- * in your applications click-pages.properties file. For example:
+ * application is to define a table-default-class message property
+ * in your applications click-pages.properties file. For example:
  *
  * 
              * table-default-class=blue2 
            
  *
- * 
            Paging
            
+ * 
            Paging
            
  *
  * Table provides out-of-the-box paging.
- * 
            
+ * 
            
  * To enable Paging set the table's page size: {@link #setPageSize(int)} and
  * optionally make the Table Banner visible: {@link #setShowBanner(boolean)}.
- * 
            
+ * 
            
  * Table supports rendering different paginators through the method
  * {@link #setPaginator(Renderable) setPaginator}.
  * The default Table Paginator is {@link TablePaginator}.
  *
- * 
            Sorting
            
+ * 
            Sorting
            
  * Table also has built in column sorting.
- * 
            
+ * 
            
  * To enable/disable sorting use {@link #setSortable(boolean)}.
  *
- * 
            Custom Parameters - preserve state when paging and sorting
            
+ * 
            Custom Parameters - preserve state when paging and sorting
            
  *
  * Its often necessary to add extra parameters on the Table links in order to
  * preserve state when navigating between pages or sorting columns.
- * 
            
+ * 
            
  * One can easily add extra parameters to links generated by the Table through
  * the Table's {@link #getControlLink() controlLink}.
- * 
            
+ * 
            
  * For example:
  *
  * 
            @@ -225,30 +227,30 @@
  *      ...
  * } 
            
  *
- * 
            Row Attributes
            
+ * 
            Row Attributes
            
  *
  * Sometimes it is useful to add HTML attributes on individual rows. For these
  * cases one can override the method {@link #addRowAttributes(Map, Object, int)}
  * and add custom attributes to the row's attribute Map.
  *
- * 
            Large Datasets
            
+ * 
            Large Datasets
            
  *
  * For large data sets use a {@link PagingDataProvider}.
- * 
            
+ * 
            
  * A PagingDataProvider has two responsibilities. First, it must load
  * only those rows to be displayed on the current page e.g. rows 50 - 59.
- * Second, it must return the total number of rows represented by the
+ * Second, it must return the total number of rows represented by the
  * PagingDataProvider.
- * 
            
+ * 
            
  * The Table methods {@link #getFirstRow()}, {@link #getLastRow()}
  * and {@link #getPageSize()} provides the necessary information to limit
  * the rows to the selected page. For sorting, the Table methods
  * {@link #getSortedColumn()} and {@link #isSortedAscending()} provides the
  * necessary information to sort the data.
- * 
            
+ * 
            
  * Please note: when using a PagingDataProvider, you are responsible
  * for sorting the data, as the Table does not have access to all the data.
- * 
            
+ * 
            
  * Example usage:
  *
  * 
            @@ -281,13 +283,13 @@
  *
  * For a live demonstration see the
  * Large Dataset Demo.
- * 
            
+ * 
            
  *
  * See the W3C HTML reference
- * Tables
  * and the W3C CSS reference
- * Tables.
  *
  * @see Column
@@ -326,49 +328,49 @@ public class Table extends AbstractControl implements Stateful {
     /** The table top and bottom pagination banner position. */
     public static final int POSITION_BOTH = 3;
 
-    /** The control ActionLink page number parameter name: "ascending". */
+    /** The control ActionLink page number parameter name: "ascending". */
     public static final String ASCENDING = "ascending";
 
-    /** The control ActionLink sorted column parameter name: "column". */
+    /** The control ActionLink sorted column parameter name: "column". */
     public static final String COLUMN = "column";
 
-    /** The control ActionLink page number parameter name: "page". */
+    /** The control ActionLink page number parameter name: "page". */
     public static final String PAGE = "page";
 
-    /** The control ActionLink sort number parameter name: "sort". */
+    /** The control ActionLink sort number parameter name: "sort". */
     public static final String SORT = "sort";
 
-    /** The table CSS style: "blue1". */
+    /** The table CSS style: "blue1". */
     public static final String CLASS_BLUE1 = "blue1";
 
-    /** The table CSS style: "blue2". */
+    /** The table CSS style: "blue2". */
     public static final String CLASS_BLUE2 = "blue2";
 
-    /** The table CSS style: "complex". */
+    /** The table CSS style: "complex". */
     public static final String CLASS_COMPLEX = "complex";
 
-    /** The table CSS style: "isi". */
+    /** The table CSS style: "isi". */
     public static final String CLASS_ISI = "isi";
 
-    /** The table CSS style: "its". */
+    /** The table CSS style: "its". */
     public static final String CLASS_ITS = "its";
 
-    /** The table CSS style: "mars". */
+    /** The table CSS style: "mars". */
     public static final String CLASS_MARS = "mars";
 
-    /** The table CSS style: "nocol". */
+    /** The table CSS style: "nocol". */
     public static final String CLASS_NOCOL = "nocol";
 
-    /** The table CSS style: "orange1". */
+    /** The table CSS style: "orange1". */
     public static final String CLASS_ORANGE1 = "orange1";
 
-    /** The table CSS style: "orange2". */
+    /** The table CSS style: "orange2". */
     public static final String CLASS_ORANGE2 = "orange2";
 
-    /** The table CSS style: "report". */
+    /** The table CSS style: "report". */
     public static final String CLASS_REPORT = "report";
 
-    /** The table CSS style: "simple". */
+    /** The table CSS style: "simple". */
     public static final String CLASS_SIMPLE = "simple";
 
     /** The array of pre-defined table CSS class styles. */
@@ -383,8 +385,8 @@ public class Table extends AbstractControl implements Stateful {
 
     /**
      * The table pagination banner position:
-     * [ POSITION_TOP | POSITION_BOTTOM | POSITION_BOTH ].
-     * The default position is POSITION_BOTTOM.
+     * [ POSITION_TOP | POSITION_BOTTOM | POSITION_BOTH ].
+     * The default position is POSITION_BOTTOM.
      */
     protected int bannerPosition = POSITION_BOTTOM;
 
@@ -424,9 +426,9 @@ public class Table extends AbstractControl implements Stateful {
     protected boolean hoverRows;
 
     /**
-     * Flag indicating if rowList is nullified when
-     * onDestroy() is invoked, default is true. This flag only applies
-     * to stateful pages.
+     * Flag indicating if rowList is nullified when
+     * onDestroy() is invoked, default is true. This flag only applies
+     * to stateful pages.
      *
      * @see #setNullifyRowListOnDestroy(boolean)
      *
@@ -452,8 +454,8 @@ public class Table extends AbstractControl implements Stateful {
 
     /**
      * The paginator attachment style:
-     * [ PAGINATOR_ATTACHED | PAGINATOR_DETACHED | PAGINATOR_INLINE ].
-     * The default paginator attachment type is PAGINATOR_ATTACHED.
+     * [ PAGINATOR_ATTACHED | PAGINATOR_DETACHED | PAGINATOR_INLINE ].
+     * The default paginator attachment type is PAGINATOR_ATTACHED.
      */
     protected int paginatorAttachment = PAGINATOR_ATTACHED;
 
@@ -508,7 +510,7 @@ public Table(String name) {
 
     /**
      * Create a Table with no name defined.
-     * 
            
+     * 
            
      * Please note the control's name must be defined before it is valid.
      */
     public Table() {
@@ -518,7 +520,7 @@ public Table() {
     // Public Attributes ------------------------------------------------------
 
     /**
-     * Return the table's html tag: table.
+     * Return the table's html tag: table.
      *
      * @see org.apache.click.control.AbstractControl#getTag()
      *
@@ -537,7 +539,7 @@ public String getTag() {
      * @param parent the parent of the Table
      * @throws IllegalStateException if {@link #name} is not defined
      * @throws IllegalArgumentException if the given parent instance is
-     * referencing this object: if (parent == this)
+     * referencing this object: if (parent == this)
      */
     @Override
     public void setParent(Object parent) {
@@ -552,8 +554,8 @@ public void setParent(Object parent) {
 
     /**
      * Return the Table pagination banner position. Banner position values:
-     * [ POSITION_TOP | POSITION_BOTTOM | POSITION_BOTH ].
-     * The default banner position is POSITION_BOTTOM.
+     * [ POSITION_TOP | POSITION_BOTTOM | POSITION_BOTH ].
+     * The default banner position is POSITION_BOTTOM.
      *
      * @return the table pagination banner position
      */
@@ -563,7 +565,7 @@ public int getBannerPosition() {
 
     /**
      * Set Table pagination banner position. Banner position values:
-     * [ POSITION_TOP | POSITION_BOTTOM | POSITION_BOTH ].
+     * [ POSITION_TOP | POSITION_BOTTOM | POSITION_BOTH ].
      *
      * @param value the table pagination banner position
      */
@@ -572,10 +574,10 @@ public void setBannerPosition(int value) {
     }
 
     /**
-     * Return the content of the table <caption> element, or null
+     * Return the content of the table <caption> element, or null
      * if not defined.
      *
-     * @return the content of the table caption element, or null if not
+     * @return the content of the table caption element, or null if not
      * defined.
      */
     public String getCaption() {
@@ -583,7 +585,7 @@ public String getCaption() {
     }
 
     /**
-     * Set the content of the table <caption> element.
+     * Set the content of the table <caption> element.
      *
      * @param caption the content of the caption element.
      */
@@ -593,10 +595,10 @@ public void setCaption(String caption) {
 
     /**
      * Set the HTML class attribute.
-     * 
            
-     * Note: this method will replace the existing "class"
+     * 
            
+     * Note: this method will replace the existing "class"
      * attribute value.
-     * 
            
+     * 
            
      * Predefined table CSS classes include:
      * 
              
      *  
            • complex
              • 
@@ -680,8 +682,8 @@ public void removeColumns(List columnNames) {
     }
 
     /**
-     * Return true if the Table will nullify the rowList when the
-     * onDestroy() method is invoked.
+     * Return true if the Table will nullify the rowList when the
+     * onDestroy() method is invoked.
      *
      * @return true if the rowList is nullified when onDestroy is invoked
      */
@@ -690,13 +692,13 @@ public boolean getNullifyRowListOnDestroy() {
     }
 
     /**
-     * Set the flag to nullify the rowList when the onDestroy()
+     * Set the flag to nullify the rowList when the onDestroy()
      * method is invoked.
-     * 
              
-     * This option only applies to stateful pages.
-     * 
              
+     * 
              
+     * This option only applies to stateful pages.
+     * 
              
      * If this option is false, the rowList will be persisted between requests.
-     * If this option is true (the default), the rowList must be set
+     * If this option is true (the default), the rowList must be set
      * each request.
      *
      * @param value the flag value to nullify the table rowList when onDestroy
@@ -790,7 +792,7 @@ public boolean hasControls() {
 
     /**
      * Return the table paging and sorting control action link.
-     * 
              
+     * 
              
      * Note you can set parameters on the returned ActionLink in order
      * to preserve state when paging or sorting columns. A common use case is
      * to filter out Table rows on specified criteria. See
@@ -818,10 +820,10 @@ public DataProvider getDataProvider() {
     /**
      * Set the table row list {@link DataProvider}.
      * The Table will retrieve its data from the DataProvider on demand.
-     * 
              
+     * 
              
      * Please note: setting the dataProvider will nullify the table
      * {@link #setRowList(List) rowList}.
-     * 
              
+     * 
              
      * Example usage:
      *
      * 
              @@ -840,16 +842,16 @@ public DataProvider getDataProvider() {
      *
      * For large data sets use a {@link PagingDataProvider}
      * instead.
-     * 
              
+     * 
              
      * The Table methods {@link #getFirstRow()}, {@link #getLastRow()}
      * and {@link #getPageSize()} provides the necessary information to limit
      * the rows to the selected page. For sorting, the Table methods
      * {@link #getSortedColumn()} and {@link #isSortedAscending()} provides the
      * necessary information to sort the data.
-     * 
              
+     * 
              
      * Please note: when using a PagingDataProvider, you are responsible
      * for sorting the data, as the Table does not have access to all the data.
-     * 
              
+     * 
              
      * Example usage:
      *
      * 
              @@ -942,7 +944,7 @@ public void setHoverRows(boolean hoverRows) {
      * Return the Table HTML HEAD elements for the following resource:
      *
      * 
                
-     * 
              • click/table.css
                • 
+     * 
              • click/table.css
                • 
      * 
              
      *
      * Additionally, the HEAD elements of the {@link #getControlLink()} will
@@ -1101,8 +1103,8 @@ public void setPaginator(Renderable value) {
 
     /**
      * Return the paginator attachment style. Renderable attachment style values:
-     * [ PAGINATOR_ATTACHED | PAGINATOR_DETACHED | PAGINATOR_INLINE ].
-     * The default paginator attachment type is PAGINATOR_ATTACHED.
+     * [ PAGINATOR_ATTACHED | PAGINATOR_DETACHED | PAGINATOR_INLINE ].
+     * The default paginator attachment type is PAGINATOR_ATTACHED.
      *
      * @return the paginator attachment style
      */
@@ -1112,7 +1114,7 @@ public int getPaginatorAttachment() {
 
     /**
      * Set Table pagination attachment style. Renderable attachment style values:
-     * [ PAGINATOR_ATTACHED | PAGINATOR_DETACHED | PAGINATOR_INLINE ].
+     * [ PAGINATOR_ATTACHED | PAGINATOR_DETACHED | PAGINATOR_INLINE ].
      *
      * @param value the table pagination attachment style
      */
@@ -1152,7 +1154,7 @@ public void setRenderId(boolean renderId) {
     /**
      * Return the list of table rows. Please note the rowList is cleared in
      * table {@link #onDestroy()} method at the end of each request.
-     * 
              
+     * 
              
      * If the rowList is null, this method delegates to {@link #createRowList()}
      * to create a new row list.
      *
@@ -1169,12 +1171,12 @@ public List getRowList() {
 
     /**
      * Set the list of table rows. Each row can either be a value object
-     * (JavaBean) or an instance of a Map.
-     * 
              
+     * (JavaBean) or an instance of a Map.
+     * 
              
      * Although possible to set the table rows directly with this method, best
      * practice is to use a {@link #setDataProvider(DataProvider)}
      * instead.
-     * 
              
+     * 
              
      * Please note the rowList is cleared in table {@link #onDestroy()} method
      * at the end of each request.
      *
@@ -1385,7 +1387,7 @@ public void setWidth(String value) {
      * The total possible number of rows of the table. This value
      * could be much larger than the number of entries in the {@link #rowList},
      * indicating that some rows have not been loaded yet.
-     * 
              
+     * 
              
      * This property is automatically set by the table to the appropriate value.
      *
      * @return the total possible number of rows of the table
@@ -1396,7 +1398,7 @@ public final int getRowCount() {
 
     /**
      * Return the index of the first row to display. Index starts from 0.
-     * 
              
+     * 
              
      * Note: {@link #setPageSize(int) page size} must be set for this
      * method to correctly calculate the first row, otherwise this method will
      * return 0.
@@ -1417,7 +1419,7 @@ public int getFirstRow() {
 
     /**
      * Return the index of the last row to display. Index starts from 0.
-     * 
              
+     * 
              
      * Note: the Table {@link #setRowList(List) row list} and
      * {@link #setPageSize(int) page size} must be set for this method to
      * correctly calculate the last row, otherwise this method will return 0.
@@ -1525,8 +1527,8 @@ public boolean onProcess() {
     }
 
     /**
-     * This method will clear the rowList, if the property
-     * nullifyRowListOnDestroy is true, set the sorted flag to false and
+     * This method will clear the rowList, if the property
+     * nullifyRowListOnDestroy is true, set the sorted flag to false and
      * will invoke the onDestroy() method of any child controls.
      *
      * @see Control#onDestroy()
@@ -1660,7 +1662,7 @@ public void removeState(Context context) {
 
     /**
      * Restore the Table state from the session for the given request context.
-     * 
              
+     * 
              
      * This method delegates to {@link #setState(Object)} to set the
      * table restored state.
      *
@@ -1675,7 +1677,7 @@ public void restoreState(Context context) {
 
     /**
      * Save the Table state to the session for the given request context.
-     * 
              
+     * 
              
      * * This method delegates to {@link #getState()} to retrieve the table state
      * to save.
      *
@@ -1778,7 +1780,7 @@ protected void renderHeaderRow(HtmlStringBuffer buffer) {
     }
 
     /**
-     * Render the table body rows for each of the rows in getRowList.
+     * Render the table body rows for each of the rows in getRowList.
      *
      * @param buffer the StringBuffer to render the table body rows in
      */
@@ -1905,7 +1907,7 @@ protected void renderBodyRows(HtmlStringBuffer buffer) {
 
     /**
      * Override this method to set HTML attributes for each Table row.
-     * 
              
+     * 
              
      * For example:
      *
      * 
              @@ -1928,8 +1930,8 @@ protected void renderBodyRows(HtmlStringBuffer buffer) {
      * } 
              
      *
      * Please note that in order to enable alternate background colors
-     * for rows, Click will automatically add a CSS class attribute
-     * to each row with a value of either odd or even. You are
+     * for rows, Click will automatically add a CSS class attribute
+     * to each row with a value of either odd or even. You are
      * free to add other CSS class attributes as illustrated in the example
      * above.
      *
@@ -1943,9 +1945,9 @@ protected void addRowAttributes(Map attributes, Object row, int
     /**
      * Render the table header footer row. This method is designed to be
      * overridden by Table subclasses which include a custom footer row.
-     * 
              
+     * 
              
      * By default this method does not render a table footer.
-     * 
              
+     * 
              
      * An example:
      * 
                    * private Table table;
@@ -1965,7 +1967,7 @@ protected void addRowAttributes(Map attributes, Object row, int
      *
      * public void renderTotalHoldingsFooter(HtmlStringBuffer buffer,) {
      *     double total = 0;
-     *     for (int i = 0; i < table.getRowList().size(); i++) {
+     *     for (int i = 0; i < table.getRowList().size(); i++) {
      *         Customer customer = (Customer) table.getRowList().get(i);
      *         if (customer.getHoldings() != null) {
      *             total += customer.getHoldings().doubleValue();
@@ -1975,9 +1977,9 @@ protected void addRowAttributes(Map attributes, Object row, int
      *     String format = "<b>Total Holdings</b>:   ${0,number,#,##0.00}";
      *     String totalDisplay = MessageFormat.format(format, new Object[] { new Double(total) });
      *
-     *     buffer.append("<foot><tr><td colspan='4' style='text-align:right'>");
+     *     buffer.append("<foot><tr><td colspan='4' style='text-align:right'>");
      *     buffer.append(totalDisplay);
-     *     buffer.append("</td></tr></tfoot>");
+     *     buffer.append("</td></tr></tfoot>");
      * }
      * 
              
      *
@@ -2030,9 +2032,9 @@ protected void renderPaginator(HtmlStringBuffer buffer) {
 
     /**
      * Render the table banner detailing number of rows and number displayed.
-     * 
              
-     * See the /click-controls.properties for the HTML templates:
-     * table-page-banner and table-page-banner-nolinks
+     * 
              
+     * See the /click-controls.properties for the HTML templates:
+     * table-page-banner and table-page-banner-nolinks
      *
      * @deprecated use {@link #renderPaginator(HtmlStringBuffer)} instead, this
      * method is provided to support backward compatibility older Click 1.4
@@ -2072,9 +2074,9 @@ protected void renderTableBanner(HtmlStringBuffer buffer) {
 
     /**
      * Render the table paging action link controls.
-     * 
              
-     * See the /click-controls.properties for the HTML templates:
-     * table-page-links and table-page-links-nobanner
+     * 
              
+     * See the /click-controls.properties for the HTML templates:
+     * table-page-links and table-page-links-nobanner
      *
      * @deprecated use {@link #renderPaginator(HtmlStringBuffer)} instead, this
      * method is provided to support backward compatibility older Click 1.4
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TablePaginator.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TablePaginator.java
index 96cb60105c..5bae8ac148 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TablePaginator.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TablePaginator.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -23,10 +24,11 @@
 /**
  * Provides the default Table Paginator.
  *
- * 
+ * 
              
+ * 
  * 
  * 
  * 
  * 
              Example
              
- * 
+ * Table paginator
  * 
              
@@ -198,7 +200,7 @@ public void render(HtmlStringBuffer buffer) {
 
     /**
      * Returns the HTML representation of this paginator.
-     * 
              
+     * 
              
      * This method delegates the rendering to the method
      * {@link #render(HtmlStringBuffer)}.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextArea.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextArea.java
index d6719f7b58..4ca617aaf8 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextArea.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextArea.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -25,14 +26,15 @@
 /**
  * Provides a TextArea control:   <textarea></textarea>.
  *
- * 
+ * 
              
+ * 
  * 
  * 
- * 
+ * 
  * 
  * 
              Example
              Text Area<textarea>Rather lengthy text</textarea>
              
  *
- * 
              TextArea Example
              
+ * 
              TextArea Example
              
  *
  * The example below shows how to a TextArea to a Form:
  *
@@ -47,7 +49,7 @@
  * <textarea name="comments" rows="6" cols="40"/></textarea> 
              
  *
  * See also the W3C HTML reference:
- * TEXTAREA
  */
 public class TextArea extends Field {
@@ -199,7 +201,7 @@ public TextArea(String name, String label, int cols, int rows,
 
     /**
      * Create a TextArea with no name defined.
-     * 
              
+     * 
              
      * Please note the control's name must be defined before it is valid.
      */
     public TextArea() {
@@ -209,7 +211,7 @@ public TextArea() {
     // ------------------------------------------------------- Public Attributes
 
     /**
-     * Return the textarea's html tag: textarea.
+     * Return the textarea's html tag: textarea.
      *
      * @see org.apache.click.control.AbstractControl#getTag()
      *
@@ -365,11 +367,11 @@ public void render(HtmlStringBuffer buffer) {
 
     /**
      * Validate the TextArea request submission.
-     * 
              
+     * 
              
      * A field error message is displayed if a validation error occurs.
      * These messages are defined in the resource bundle: 
              
      * 
              org.apache.click.control.MessageProperties
              
-     * 
              
+     * 
              
      * Error message bundle key names include: 
                
      * 
              • field-maxlength-error
                • 
      * 
              • field-minlength-error
                • 
@@ -404,8 +406,8 @@ public void validate() {
 
     /**
      * Return the field JavaScript client side validation function.
-     * 
                
-     * The function name must follow the format validate_[id], where
+     * 
                
+     * The function name must follow the format validate_[id], where
      * the id is the DOM element id of the fields focusable HTML element, to
      * ensure the function has a unique name.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextField.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextField.java
index 31cacfb082..a8cb7bbb52 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextField.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/control/TextField.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.control;
 
@@ -25,14 +26,15 @@
 /**
  * Provides a Text Field control:   <input type='text'>.
  *
- * 
+ * 
                
+ * 
  * 
  * 
- * 
+ * 
  * 
  * 
                Example
                Text Field<input type='text' value='string'/>
                
  *
- * 
                TextField Example
                
+ * 
                TextField Example
                
  *
  * The example below shows how to a TextField to a Form, and how it will be
  * rendered as HTML.
@@ -52,9 +54,9 @@
  *
  * For another example using TextField see the {@link org.apache.click.control.Form}
  * Javadoc example.
- * 
                
+ * 
                
  * See also the W3C HTML reference:
- * INPUT
  */
 public class TextField extends Field {
@@ -91,7 +93,7 @@ public class TextField extends Field {
     /**
      * The maximum field length validation constraint. If the value is zero this
      * validation constraint is not applied. The default value is zero.
-     * 
                
+     * 
                
      * If maxLength is greater than zero, then maxLength is rendered as the
      * HTML attribute 'maxlength'.
      */
@@ -183,7 +185,7 @@ public TextField(String name, String label, int size, boolean required) {
 
     /**
      * Create a TextField with no name defined.
-     * 
                
+     * 
                
      * Please note the control's name must be defined before it is valid.
      */
     public TextField() {
@@ -192,7 +194,7 @@ public TextField() {
     // ------------------------------------------------------ Public Attributes
 
     /**
-     * Return the textfield's html tag: input.
+     * Return the textfield's html tag: input.
      *
      * @see org.apache.click.control.AbstractControl#getTag()
      *
@@ -207,7 +209,7 @@ public String getTag() {
      * Returns the maximum field length validation constraint. If the
      * {@link #maxLength} property is greater than zero, the Field values length
      * will be validated against this constraint when processed.
-     * 
                
+     * 
                
      * If maxLength is greater than zero, it is rendered as the field
      * attribute 'maxlength'
      *
@@ -221,7 +223,7 @@ public int getMaxLength() {
      * Sets the maximum field length. If the {@link #maxLength} property is
      * greater than zero, the Field values length will be validated against
      * this constraint when processed.
-     * 
                
+     * 
                
      * If maxLength is greater than zero, it is rendered as the field
      * attribute 'maxlength'
      *
@@ -272,9 +274,9 @@ public void setSize(int size) {
     }
 
     /**
-     * Return the input type: 'text'.
+     * Return the input type: 'text'.
      *
-     * @return the input type: 'text'
+     * @return the input type: 'text'
      */
     public String getType() {
         return "text";
@@ -346,11 +348,11 @@ public void render(HtmlStringBuffer buffer) {
 
     /**
      * Validate the TextField request submission.
-     * 
                
+     * 
                
      * A field error message is displayed if a validation error occurs.
      * These messages are defined in the resource bundle: 
                
      * 
                org.apache.click.control.MessageProperties
                
-     * 
                
+     * 
                
      * Error message bundle key names include: 
                  
      * 
                • field-maxlength-error
                  • 
      * 
                • field-minlength-error
                  • 
@@ -384,8 +386,8 @@ public void validate() {
 
     /**
      * Return the field JavaScript client side validation function.
-     * 
                  
-     * The function name must follow the format validate_[id], where
+     * 
                  
+     * The function name must follow the format validate_[id], where
      * the id is the DOM element id of the fields focusable HTML element, to
      * ensure the function has a unique name.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssImport.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssImport.java
index 46f75caefd..f4a1f56351 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssImport.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssImport.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.element;
 
@@ -26,9 +27,9 @@
 import java.util.Map;
 
 /**
- * Provides a Css HEAD element for importing external Cascading
+ * Provides a Css HEAD element for importing external Cascading
  * Stylesheet files using the <link> tag.
- * 
                  
+ * 
                  
  * Example usage:
  * 
                    * public class MyPage extends Page {
@@ -47,8 +48,8 @@
  *     }
  * } 
                  
  *
- * The cssImport instance will be rendered as follows (assuming the
- * context path is myApp):
+ * The cssImport instance will be rendered as follows (assuming the
+ * context path is myApp):
  * 
                    * <link type="text/css" rel="stylesheet" href="/myApp/css/style.css"/> 
                  
  */
@@ -60,7 +61,7 @@ public class CssImport extends ResourceElement {
 
     /**
      * Constructs a new Css import element.
-     * 
                  
+     * 
                  
      * The CssImport {@link #setVersionIndicator(String) version indicator}
      * will automatically be set to the
      * {@link ClickUtils#getApplicationResourceVersionIndicator() application version indicator}.
@@ -70,16 +71,16 @@ public CssImport() {
     }
 
     /**
-     * Construct a new Css import element with the specified href
+     * Construct a new Css import element with the specified href
      * attribute.
-     * 
                  
+     * 
                  
      * The CssImport {@link #setVersionIndicator(String) version indicator}
      * will automatically be set to the
      * {@link ClickUtils#getApplicationResourceVersionIndicator() application version indicator}.
-     * 
                  
-     * Please note if the given href begins with a
-     * "/" character the href will be prefixed with the web
-     * application context path.
+     * 
                  
+     * Please note if the given href begins with a
+     * "/" character the href will be prefixed with the web
+     * application context path.
      *
      * @param href the Css import href attribute
      */
@@ -88,17 +89,17 @@ public CssImport(String href) {
     }
 
     /**
-     * Construct a new Css import element with the specified href
+     * Construct a new Css import element with the specified href
      * attribute.
-     * 
                  
+     * 
                  
      * If useApplicationVersionIndicator is true the
      * CssImport {@link #setVersionIndicator(String) version indicator}
      * will automatically be set to the
      * {@link ClickUtils#getApplicationResourceVersionIndicator() application version indicator}.
-     * 
                  
-     * Please note if the given href begins with a
-     * "/" character the href will be prefixed with the web
-     * application context path.
+     * 
                  
+     * Please note if the given href begins with a
+     * "/" character the href will be prefixed with the web
+     * application context path.
      *
      * @param href the Css import href attribute
      * @param useApplicationVersionIndicator indicates whether the version
@@ -112,12 +113,12 @@ public CssImport(String href, boolean useApplicationVersionIndicator) {
     }
 
     /**
-     * Construct a new Css import element with the specified href
+     * Construct a new Css import element with the specified href
      * attribute and version indicator.
-     * 
                  
-     * Please note if the given href begins with a
-     * "/" character the href will be prefixed with the web
-     * application context path.
+     * 
                  
+     * Please note if the given href begins with a
+     * "/" character the href will be prefixed with the web
+     * application context path.
      *
      * @param href the Css import href attribute
      * @param versionIndicator the version indicator to add to the href path
@@ -143,12 +144,12 @@ public String getTag() {
 
     /**
      * This method always return true because Css import must be unique based on
-     * its href attribute. In other words the Page HEAD should only
-     * contain a single CSS import for the specific href.
+     * its href attribute. In other words the Page HEAD should only
+     * contain a single CSS import for the specific href.
      *
      * @see ResourceElement#isUnique()
      *
-     * @return true because Css import must unique based on its href
+     * @return true because Css import must unique based on its href
      * attribute
      */
     @Override
@@ -157,12 +158,12 @@ public boolean isUnique() {
     }
 
     /**
-     * Sets the href attribute. If the given href argument is
-     * null, the href attribute will be removed.
-     * 
                  
-     * If the given href begins with a "/" character
-     * the href will be prefixed with the web applications context path.
-     * Note if the given href is already prefixed with the context path,
+     * Sets the href attribute. If the given href argument is
+     * null, the href attribute will be removed.
+     * 
                  
+     * If the given href begins with a "/" character
+     * the href will be prefixed with the web applications context path.
+     * Note if the given href is already prefixed with the context path,
      * Click won't add it a second time.
      *
      * @param href the new href attribute
@@ -189,7 +190,7 @@ public void setHref(String href) {
     }
 
     /**
-     * Return the href attribute.
+     * Return the href attribute.
      *
      * @return the href attribute
      */
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssStyle.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssStyle.java
index 6446e0d406..56d1b30011 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssStyle.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/CssStyle.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.element;
 
@@ -26,9 +27,9 @@
 import java.util.Map;
 
 /**
- * Provides a Css HEAD element for including inline Cascading
+ * Provides a Css HEAD element for including inline Cascading
  * Stylesheets using the <style> tag.
- * 
                  
+ * 
                  
  * Example usage:
  *
  * 
                  @@ -48,7 +49,7 @@
  *     }
  * } 
                  
  *
- * The cssStyle instance will render as follows:
+ * The cssStyle instance will render as follows:
  *
  * 
                    * <style type="text/css">
@@ -57,10 +58,10 @@
  *
  * Below is an example showing how to render inline CSS from a Velocity
  * template.
- * 
                  
- * First we create a Velocity template (/css/style-template.css) which
- * contains the variable $context that must be replaced at runtime with
- * the application context path:
+ * 
                  
+ * First we create a Velocity template (/css/style-template.css) which
+ * contains the variable $context that must be replaced at runtime with
+ * the application context path:
  *
  * 
                    * .blue {
@@ -95,8 +96,8 @@
  *     }
  * } 
                  
  *
- * The Css above will render as follows (assuming the context path is
- * myApp):
+ * The Css above will render as follows (assuming the context path is
+ * myApp):
  *
  * 
                    * <style type="text/css">
@@ -105,9 +106,9 @@
  * }
  * </style> 
                  
  *
- * 
                  Character data (CDATA) support
                  
+ * 
                  Character data (CDATA) support
                  
  *
- * Sometimes it is necessary to wrap inline {@link CssStyle Css} in
+ * Sometimes it is necessary to wrap inline {@link CssStyle Css} in
  * CDATA tags. Two use cases are common for doing this:
  * 
                    
  * 
                  • For XML parsing: When using Ajax one often send back partial
@@ -138,7 +139,7 @@
  * Notice the CDATA tags are commented out which ensures older browsers that
  * don't understand the CDATA tag, will ignore it and only process the actual
  * content.
- * 
                    
+ * 
                    
  * For an overview of XHTML validation and CDATA tags please see
  * http://javascript.about.com/library/blxhtml.htm.
  */
@@ -186,11 +187,11 @@ public CssStyle(String content) {
     /**
      * Construct a new Css style element for the given template path
      * and template model.
-     * 
                    
+     * 
                    
      * When the CssStyle is rendered the template and model will be merged and
      * the result will be rendered together with any CssStyle
      * {@link #setContent(String) content}.
-     * 
                    
+     * 
                    
      *
      * For example:
      * 
                    @@ -283,7 +284,7 @@ public String getTemplate() {
 
     /**
      * Set the path of the template to render.
-     * 
                    
+     * 
                    
      * If the {@link #template} property is set, the template and {@link #model}
      * will be merged and the result will be rendered together with any CssStyle
      * {@link #setContent(String) content}.
@@ -308,7 +309,7 @@ public Map getModel() {
 
     /**
      * Set the model of the template to render.
-     * 
                    
+     * 
                    
      * If the {@link #template} property is set, the template and {@link #model}
      * will be merged and the result will be rendered together with any CssStyle
      * {@link #setContent(String) content}.
@@ -408,7 +409,7 @@ public int hashCode() {
     /**
      * Render the CssStyle {@link #setContent(String) content}
      * to the specified buffer.
-     * 
                    
+     * 
                    
      * Please note: if the {@link #setTemplate(String) template}
      * property is set, this method will merge the {@link #setTemplate(String) template}
      * and {@link #setModel(Map) model} and the result will be
@@ -440,7 +441,7 @@ protected void renderContent(HtmlStringBuffer buffer) {
     /**
      * Render the CDATA tag prefix to the specified buffer if
      * {@link #isCharacterData()} returns true. The default value is
-     * /∗<![CDATA[∗/.
+     * /∗<![CDATA[∗/.
      *
      * @param buffer buffer to append the conditional comment prefix
      */
@@ -454,7 +455,7 @@ void renderCharacterDataPrefix(HtmlStringBuffer buffer) {
     /**
      * Render the CDATA tag suffix to the specified buffer if
      * {@link #isCharacterData()} returns true. The default value is
-     * /∗]]>∗/.
+     * /∗]]>∗/.
      *
      * @param buffer buffer to append the conditional comment prefix
      */
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/Element.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/Element.java
index d4f3cdc236..974d8a665c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/Element.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/Element.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.element;
 
@@ -29,7 +30,7 @@
  * Provides a base class for rendering HTML elements, for example
  * JavaScript (<script>) and Cascading Stylesheets
  * (<link> / <style>).
- * 
                    
+ * 
                    
  * Subclasses should override {@link #getTag()} to return a specific HTML tag.
  */
 public class Element implements Serializable {
@@ -44,8 +45,8 @@ public class Element implements Serializable {
     // Public Properties ------------------------------------------------------
 
     /**
-     * Returns the Element HTML tag, the default value is null.
-     * 
                    
+     * Returns the Element HTML tag, the default value is null.
+     * 
                    
      * Subclasses should override this method and return the correct tag.
      *
      * @return this Element HTML tag
@@ -154,7 +155,7 @@ public Context getContext() {
 
     /**
      * Render the HTML representation of the Element to the specified buffer.
-     * 
                    
+     * 
                    
      * If {@link #getTag()} returns null, this method will return an empty
      * string.
      *
@@ -201,10 +202,10 @@ protected void appendAttributes(HtmlStringBuffer buffer) {
 
     /**
      * Render the specified {@link #getTag() tag} and {@link #getAttributes()}.
-     * 
                    
+     * 
                    
      * Please note: the tag will not be closed by this method. This
      * enables callers of this method to append extra attributes as needed.
-     * 
                    
+     * 
                    
      * For example the result of calling:
      * 
                          * Field field = new TextField("mytext");
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsImport.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsImport.java
index 8c2b84fb30..26fcc12ecd 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsImport.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsImport.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.element;
 
@@ -26,9 +27,9 @@
 import java.util.Map;
 
 /**
- * Provides a JavaScript HEAD element for importing external JavaScript
+ * Provides a JavaScript HEAD element for importing external JavaScript
  * files using the <script> tag.
- * 
                    
+ * 
                    
  * Example usage:
  * 
                      * public class MyPage extends Page {
@@ -47,8 +48,8 @@
  *     }
  * } 
                    
  *
- * The jsImport instance will be rendered as follows (assuming the context
- * path is myApp):
+ * The jsImport instance will be rendered as follows (assuming the context
+ * path is myApp):
  * 
                      * <script type="text/javascript" href="/myApp/js/js-library.js"></script> 
                    
  */
@@ -60,7 +61,7 @@ public class JsImport extends ResourceElement {
 
     /**
      * Constructs a new JavaScript import element.
-     * 
                    
+     * 
                    
      * The JsImport {@link #setVersionIndicator(String) version indicator}
      * will automatically be set to the
      * {@link ClickUtils#getApplicationResourceVersionIndicator() application version indicator}.
@@ -71,15 +72,15 @@ public JsImport() {
 
     /**
      * Construct a new JavaScript import element with the specified
-     * src attribute.
-     * 
                    
+     * src attribute.
+     * 
                    
      * The JsImport {@link #setVersionIndicator(String) version indicator}
      * will automatically be set to the
      * {@link ClickUtils#getApplicationResourceVersionIndicator() application version indicator}.
-     * 
                    
-     * Please note if the given src begins with a
-     * "/" character the src will be prefixed with the web
-     * application context path.
+     * 
                    
+     * Please note if the given src begins with a
+     * "/" character the src will be prefixed with the web
+     * application context path.
      *
      * @param src the JavaScript import src attribute
      */
@@ -88,17 +89,17 @@ public JsImport(String src) {
     }
 
     /**
-     * Construct a new JavaScript import element with the specified src
+     * Construct a new JavaScript import element with the specified src
      * attribute.
-     * 
                    
+     * 
                    
      * If useApplicationVersionIndicator is true the
      * {@link #setVersionIndicator(String) version indicator} will
      * automatically be set to the
      * {@link ClickUtils#getApplicationResourceVersionIndicator() application version indicator}.
-     * 
                    
-     * Please note if the given src begins with a
-     * "/" character the src will be prefixed with the web
-     * application context path.
+     * 
                    
+     * Please note if the given src begins with a
+     * "/" character the src will be prefixed with the web
+     * application context path.
      *
      * @param src the JavaScript import src attribute
      * @param useApplicationVersionIndicator indicates whether the version
@@ -112,12 +113,12 @@ public JsImport(String src, boolean useApplicationVersionIndicator) {
     }
 
     /**
-     * Construct a new JavaScript import element with the specified src
+     * Construct a new JavaScript import element with the specified src
      * attribute and version indicator.
-     * 
                    
-     * Please note if the given src begins with a
-     * "/" character the src will be prefixed with the web
-     * application context path.
+     * 
                    
+     * Please note if the given src begins with a
+     * "/" character the src will be prefixed with the web
+     * application context path.
      *
      * @param src the JsImport src attribute
      * @param versionIndicator the version indicator to add to the src path
@@ -142,13 +143,13 @@ public String getTag() {
 
     /**
      * This method always return true because a JavaScript import must be unique
-     * based on its src attribute. In other words the Page HEAD should
-     * only contain a single JavaScript import for the specific src.
+     * based on its src attribute. In other words the Page HEAD should
+     * only contain a single JavaScript import for the specific src.
      *
      * @see ResourceElement#isUnique()
      *
      * @return true because JavaScript import must unique based on its
-     * src attribute
+     * src attribute
      */
     @Override
     public boolean isUnique() {
@@ -156,12 +157,12 @@ public boolean isUnique() {
     }
 
     /**
-     * Sets the src attribute. If the given src argument is
-     * null, the src attribute will be removed.
-     * 
                    
-     * If the given src begins with a "/" character
-     * the src will be prefixed with the web application context path.
-     * Note if the given src is already prefixed with the context path,
+     * Sets the src attribute. If the given src argument is
+     * null, the src attribute will be removed.
+     * 
                    
+     * If the given src begins with a "/" character
+     * the src will be prefixed with the web application context path.
+     * Note if the given src is already prefixed with the context path,
      * Click won't add it a second time.
      *
      * @param src the new src attribute
@@ -188,7 +189,7 @@ public void setSrc(String src) {
     }
 
     /**
-     * Return the src attribute.
+     * Return the src attribute.
      *
      * @return the src attribute
      */
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsScript.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsScript.java
index 92f8f98ec9..0ccee93ee0 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsScript.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/JsScript.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.element;
 
@@ -26,9 +27,9 @@
 import java.util.Map;
 
 /**
- * Provides a HEAD element for including inline JavaScript using the
+ * Provides a HEAD element for including inline JavaScript using the
  * <script> tag.
- * 
                    
+ * 
                    
  * Example usage:
  *
  * 
                    @@ -48,7 +49,7 @@
  *     }
  * } 
                    
  *
- * The jsScript instance will be rendered as follows:
+ * The jsScript instance will be rendered as follows:
  *
  * 
                      * <script type="text/javascript">
@@ -57,9 +58,9 @@
  *
  * Below is an example showing how to render inline Javascript from a
  * Velocity template.
- * 
                    
- * First we create a Velocity template (/js/mycorp-template.js) which
- * contains the variable $divId that must be replaced at runtime with
+ * 
                    
+ * First we create a Velocity template (/js/mycorp-template.js) which
+ * contains the variable $divId that must be replaced at runtime with
  * the real Div ID attribute:
  *
  * 
                    @@ -97,8 +98,8 @@
  *     }
  * } 
                    
  *
- * The jsScript instance will render as follows (assuming the context
- * path is myApp):
+ * The jsScript instance will render as follows (assuming the context
+ * path is myApp):
  *
  * 
                      * <script type="text/javascript">
@@ -108,9 +109,9 @@
  *     }
  * </style> 
                    
  *
- * 
                    Character data (CDATA) support
                    
+ * 
                    Character data (CDATA) support
                    
  *
- * Sometimes it is necessary to wrap inline {@link JsScript JavaScript}
+ * Sometimes it is necessary to wrap inline {@link JsScript JavaScript}
  * in CDATA tags. Two use cases are common for doing this:
  * 
                      
  * 
                    • For XML parsing: When using Ajax one often send back partial
@@ -139,7 +140,7 @@
  * Notice the CDATA tags are commented out which ensures older browsers that
  * don't understand the CDATA tag, will ignore it and only process the actual
  * content.
- * 
                      
+ * 
                      
  * For an overview of XHTML validation and CDATA tags please see
  * http://javascript.about.com/library/blxhtml.htm.
  */
@@ -193,11 +194,11 @@ public JsScript(String content) {
     /**
      * Construct a new inline JavaScript element for the given template path
      * and template model.
-     * 
                      
+     * 
                      
      * When the JsScript is rendered the template and model will be merged and
      * the result will be rendered together with any JsScript
      * {@link #setContent(String) content}.
-     * 
                      
+     * 
                      
      *
      * For example:
      * 
                      @@ -292,18 +293,18 @@ public boolean isExecuteOnDomReady() {
     /**
      * Sets whether the JsScript content must be executed as soon as the browser
      * DOM is ready.
-     * 
                      
+     * 
                      
      * If this flag is true, the JsScript content will be registered with
-     * the "Click.addLoadEvent" function from the JavaScript file
-     * "/click/control.js".
-     * 
                      
+     * the "Click.addLoadEvent" function from the JavaScript file
+     * "/click/control.js".
+     * 
                      
      * Please note: when setting this flag to true, the JavaScript
-     * file "/click/control.js" must already be included in the Page or
+     * file "/click/control.js" must already be included in the Page or
      * Control, it won't be included automatically.
-     * 
                      
+     * 
                      
      * Also note: for {@link Context#isAjaxRequest() Ajax}
      * requests the JsScript content won't be registered with the
-     * "Click.addLoadEvent" function because Ajax requests does not trigger
+     * "Click.addLoadEvent" function because Ajax requests does not trigger
      * the browser's DOM loaded event. Instead the JsScript content will be
      * evaluated immediately by the browser.
      *
@@ -327,7 +328,7 @@ public String getTemplate() {
 
     /**
      * Set the path of the template to render.
-     * 
                      
+     * 
                      
      * If the {@link #template} property is set, the template and {@link #model}
      * will be merged and the result will be rendered together with any JsScript
      * {@link #setContent(String) content}.
@@ -352,7 +353,7 @@ public Map getModel() {
 
     /**
      * Set the model of the template to render.
-     * 
                      
+     * 
                      
      * If the {@link #template} property is set, the template and {@link #model}
      * will be merged and the result will be rendered together with any JsScript
      * {@link #setContent(String) content}.
@@ -466,7 +467,7 @@ public int hashCode() {
     /**
      * Render the JsScript {@link #setContent(String) content}
      * to the specified buffer.
-     * 
                      
+     * 
                      
      * Please note: if the {@link #setTemplate(String) template}
      * property is set, this method will merge the {@link #setTemplate(String) template}
      * and {@link #setModel(Map) model} and the result will be
@@ -494,9 +495,9 @@ protected void renderContent(HtmlStringBuffer buffer, Context context) {
     }
 
     /**
-     * Render the "Click.addLoadEvent" function prefix to ensure the script
+     * Render the "Click.addLoadEvent" function prefix to ensure the script
      * is executed as soon as the browser DOM is available. The prefix is
-     * "Click.addLoadEvent(function(){".
+     * "Click.addLoadEvent(function(){".
      *
      * @see #renderDomReadySuffix(HtmlStringBuffer)
      *
@@ -510,8 +511,8 @@ protected void renderDomReadyPrefix(HtmlStringBuffer buffer) {
     }
 
     /**
-     * Render the "Click.addLoadEvent" function suffix. The suffix is
-     * "});".
+     * Render the "Click.addLoadEvent" function suffix. The suffix is
+     * "});".
      *
      * @see #renderDomReadyPrefix(HtmlStringBuffer)
      *
@@ -529,7 +530,7 @@ protected void renderDomReadySuffix(HtmlStringBuffer buffer) {
     /**
      * Render the CDATA tag prefix to the specified buffer if
      * {@link #isCharacterData()} returns true. The prefix is
-     * /∗<![CDATA[∗/.
+     * /∗<![CDATA[∗/.
      *
      * @see #renderCharacterDataSuffix(HtmlStringBuffer)
      *
@@ -545,7 +546,7 @@ void renderCharacterDataPrefix(HtmlStringBuffer buffer) {
     /**
      * Render the CDATA tag suffix to the specified buffer if
      * {@link #isCharacterData()} returns true. The prefix is
-     * /∗]]>∗/.
+     * /∗]]>∗/.
      *
      * @see #renderCharacterDataPrefix(HtmlStringBuffer)
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/ResourceElement.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/ResourceElement.java
index bb5468620e..329fad7f77 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/element/ResourceElement.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/element/ResourceElement.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.element;
 
@@ -28,28 +29,28 @@
  * Provides a base class for rendering HEAD resources of an HTML page, for
  * example JavaScript (<script>) and Cascading Stylesheets
  * (<link>/<style>).
- * 
                      
+ * 
                      
  * Subclasses should override {@link #getTag()} to return a specific HTML tag.
- * 
                      
+ * 
                      
  * Below are some example Resource elements:
  * 
                        
- * 
                      • {@link JsImport}, for importing external JavaScript using the
+ * 
                      • {@link JsImport}, for importing external JavaScript using the
  * <script> element.
                        • 
- * 
                      • {@link JsScript}, for including inline JavaScript using the
+ * 
                      • {@link JsScript}, for including inline JavaScript using the
  * <script> element.
                        • 
- * 
                      • {@link org.apache.click.element.CssImport}, for importing external Cascading Stylesheets
+ * 
                      • {@link org.apache.click.element.CssImport}, for importing external Cascading Stylesheets
  * using the <link> element.
                        • 
- * 
                      • {@link CssStyle}, for including inline Cascading Stylesheets
+ * 
                      • {@link CssStyle}, for including inline Cascading Stylesheets
  * using the <style> element.
                        • 
  * 
                      
  *
- * 
- * 
                      Remove duplicates
                      
+ * 
+ * 
                      Remove duplicates
                      
  * Click will ensure that duplicate Resource elements are removed by checking
  * the {@link #isUnique()} property. Thus if the same Resource is imported
  * multiple times by the Page or different Controls, only one Resource will be
- * rendered, if {@link #isUnique()} returns true.
- * 
                      
+ * rendered, if {@link #isUnique()} returns true.
+ * 
                      
  * The rules for defining a unique Resource is as follows:
  * 
                        
  * 
                      • {@link JsImport} and {@link org.apache.click.element.CssImport} is unique based on the
@@ -101,8 +102,8 @@
  *     }
  * } 
                      
  *
- * 
- * 
                      Automatic Resource versioning
                      
+ * 
+ * 
                      Automatic Resource versioning
                      
  *
  * ResourceElement provides the ability to automatically version elements
  * according to Yahoo Performance Rule: Add an Expires or a Cache-Control Header.
@@ -111,15 +112,15 @@
  * suggests versioning the resources so that each new release of the
  * web application renders resources with different paths, forcing the browser
  * to download the new resources.
- * 
                      
+ * 
                      
  * For detailed information on versioning JavaScript, Css and image resources
  * see the PerformanceFilter.
- * 
                      
+ * 
                      
  * To enable versioning of JavaScript, Css and image resources the following
  * conditions must be met:
  * 
                        
  * 
                      • the {@link org.apache.click.util.ClickUtils#ENABLE_RESOURCE_VERSION}
- * request attribute must be set to true
                        • 
+ * request attribute must be set to true
  * 
                      • the application mode must be either "production" or "profile"
                        • 
  * 
                      • the {@link org.apache.click.util.ClickUtils#setApplicationVersion(String)
  * application version} must be set
                        • 
@@ -127,19 +128,19 @@
  * Please note: PerformanceFilter
  * handles the above steps for you.
  *
- * 
- * 
                        Conditional comment support for Internet Explorer
                        
+ * 
+ * 
                        Conditional comment support for Internet Explorer
                        
  *
  * Sometimes it is necessary to provide additional JavaScript and Css for
  * Internet Explorer because it deviates quite often from the standards.
- * 
                        
+ * 
                        
  * Conditional comments allows you to wrap the resource in a special comment
  * which only IE understands, meaning other browsers won't process the resource.
- * 
                        
+ * 
                        
  * You can read more about conditional comments
  * here
  * and here
- * 
                        
+ * 
                        
  * It has to be said that IE7 and up has much better support for Css, thus
  * conditional comments are mostly used for IE6 and below.
  * 
                        @@ -178,31 +179,31 @@ public class ResourceElement extends Element {
 
     /**
      * A predefined conditional comment to test if browser is IE. Value:
-     * [if IE].
+     * [if IE].
      */
     public static final String IF_IE = "[if IE]";
 
     /**
      * A predefined conditional comment to test if browser is less than IE7.
-     * Value: [if lt IE 7].
+     * Value: [if lt IE 7].
      */
     public static final String IF_LESS_THAN_IE7 = "[if lt IE 7]";
 
     /**
      * A predefined conditional comment to test if browser is IE7. Value:
-     * [if IE 7].
+     * [if IE 7].
      */
     public static final String IF_IE7 = "[if IE 7]";
 
     /**
      * A predefined conditional comment to test if browser is less than
-     * or equal to IE7. Value: [if lte IE 7].
+     * or equal to IE7. Value: [if lte IE 7].
      */
     public static final String IF_LESS_THAN_OR_EQUAL_TO_IE7 = "[if lte IE 7]";
 
         /**
      * A predefined conditional comment to test if browser is less than IE9.
-     * Value: [if lt IE 9].
+     * Value: [if lt IE 9].
      */
     public static final String IF_LESS_THAN_IE9 = "[if lt IE 9]";
 
@@ -215,22 +216,22 @@ public class ResourceElement extends Element {
 
     /**
      * Indicates whether the {@link #getId() ID} attribute should be rendered
-     * or not, default value is true.
+     * or not, default value is true.
      */
     private boolean renderId = true;
 
     /**
-     * The version indicator to append to the Resource element.
+     * The version indicator to append to the Resource element.
      */
     private String versionIndicator;
 
     // ------------------------------------------------------ Public properties
 
     /**
-     * Return the version indicator to be appended to the resource
+     * Return the version indicator to be appended to the resource
      * path.
      *
-     * @return the version indicator to be appended to the resource
+     * @return the version indicator to be appended to the resource
      * path.
      */
     public String getVersionIndicator() {
@@ -238,7 +239,7 @@ public String getVersionIndicator() {
     }
 
     /**
-     * Set the version indicator to be appended to the resource path.
+     * Set the version indicator to be appended to the resource path.
      *
      * @param versionIndicator the version indicator to be appended to the
      * resource path
@@ -249,7 +250,7 @@ public void setVersionIndicator(String versionIndicator) {
 
     /**
      * Returns whether or not the Resource unique. This method returns
-     * true if the {@link #getId() ID} attribute is defined,
+     * true if the {@link #getId() ID} attribute is defined,
      * false otherwise.
      *
      * @return true if the Resource should be unique, false otherwise.
@@ -279,7 +280,7 @@ public boolean isRenderId() {
 
     /**
      * Set the element render {@link #getId() ID} attribute status.
-     * 
                        
+     * 
                        
      * If renderId is false the element {@link #getId() ID} attribute will not
      * be rendered.
      *
@@ -290,7 +291,7 @@ public void setRenderId(boolean renderId) {
     }
 
     /**
-     * Return Internal Explorer's conditional comment to wrap the
+     * Return Internal Explorer's conditional comment to wrap the
      * Resource with.
      *
      * @return Internal Explorer's conditional comment to wrap the Resource with.
@@ -314,7 +315,7 @@ public void setConditionalComment(String conditionalComment) {
     /**
      * Render the HTML representation of the Resource element to the specified
      * buffer.
-     * 
                        
+     * 
                        
      * If {@link #getTag()} returns null, this method will return an empty
      * string.
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ClickResourceService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ClickResourceService.java
index 27c63ad070..a58bcc8696 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ClickResourceService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ClickResourceService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.service;
 
@@ -39,7 +40,7 @@
  * serve static resources contained in the web applications JARs, under the
  * resource path META-INF/resources and which are contained under the WAR file
  * web root.
- * 
                        
+ * 
                        
  * This service is useful for application servers which do not allow Click to
  * automatically deploy resources to the web root directory.
  */
@@ -131,17 +132,17 @@ public void renderResource(HttpServletRequest request, HttpServletResponse respo
 
     /**
      * Return the list of directories that contains cacheable resources.
-     * 
                        
-     * By default only resource packaged under the "/click" directory
+     * 
                        
+     * By default only resource packaged under the "/click" directory
      * will be processed. To serve resources from other directories you need to
      * override this method and return a list of directories to process.
-     * 
                        
+     * 
                        
      * For example:
      *
      * 
                              * public class MyResourceService extends ClickResourceService {
      *
-     *     protected List getCacheableDirs() {
+     *     protected List<String> getCacheableDirs() {
      *         // Get default dirs which includes /click
      *         List list = super.getCacheableDirs();
      *
@@ -152,7 +153,7 @@ public void renderResource(HttpServletRequest request, HttpServletResponse respo
      *     }
      * } 
                        
      *
-     * You also need to add a mapping in your web.xml to forward
+     * You also need to add a mapping in your web.xml to forward
      * requests for these resources on to Click:
      *
      * 
                        diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConfigService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConfigService.java
index 52454c380c..5189e374ff 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConfigService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConfigService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.service;
@@ -32,28 +33,28 @@
 
 /**
  * Provides a Click application configuration service interface.
- * 
                        
+ * 
                        
  * A single application ConfigService instance is created by the ClickServlet at
  * startup. Once the ConfigService has been initialized it is stored in the
  * ServletContext using the key {@value #CONTEXT_NAME}.
  *
- * 
- * 
                        Configuration
                        
+ * 
+ * 
                        Configuration
                        
  * The default ConfigService is {@link XmlConfigService}.
- * 
                        
+ * 
                        
  * However it is possible to specify a different implementation.
- * 
                        
+ * 
                        
  * For example you can subclass XmlConfigService and override methods such as
  * {@link #onInit(jakarta.servlet.ServletContext)} to alter initialization
  * behavior.
- * 
                        
+ * 
                        
  * For Click to recognize your custom service class you must set the
  * context initialization parameter,
  * {@link org.openidentityplatform.openam.click.ClickServlet#CONFIG_SERVICE_CLASS config-service-class}
- * in your web.xml file.
- * 
                        
+ * in your web.xml file.
+ * 
                        
  * Below is an example of a custom service class
- * com.mycorp.service.CustomConfigService:
+ * com.mycorp.service.CustomConfigService:
  *
  * 
                          * package com.mycorp.service;
@@ -75,8 +76,8 @@
  *
  * Please note that the custom ConfigService implementation must have a
  * no-argument constructor so Click can instantiate the service.
- * 
                        
- * Also define the new service in your web.xml as follows:
+ * 
                        
+ * Also define the new service in your web.xml as follows:
  *
  * 
                          * {@code
@@ -113,10 +114,10 @@ public interface ConfigService {
     /** The profile application mode. */
     public static final String MODE_PRODUCTION = "production";
 
-    /** The error page file path:   "/click/error.htm". */
+    /** The error page file path:   "/click/error.htm". */
     static final String ERROR_PATH = "/click/error.htm";
 
-    /** The page not found file path:   "/click/not-found.htm". */
+    /** The page not found file path:   "/click/not-found.htm". */
     public static final String NOT_FOUND_PATH = "/click/not-found.htm";
 
     /** The page auto binding mode. */
@@ -131,7 +132,7 @@ public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
 
     /**
      * Initialize the ConfigurationService with the given application servlet context.
-     * 
                        
+     * 
                        
      * This method is invoked after the ConfigurationService has been constructed.
      *
      * @param servletContext the application servlet context
@@ -141,9 +142,9 @@ public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
 
     /**
      * Destroy the ConfigurationService. This method will also invoke the
-     * onDestroy() methods on the FileUploadService,
-     * TemplateService, ResourceService and the
-     * LogService in that order.
+     * onDestroy() methods on the FileUploadService,
+     * TemplateService, ResourceService and the
+     * LogService in that order.
      */
     public void onDestroy();
 
@@ -185,7 +186,7 @@ public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
 
     /**
      * Return the Click application mode value:  
-     * ["production", "profile", "development", "debug", "trace"].
+     * ["production", "profile", "development", "debug", "trace"].
      *
      * @return the application mode value
      */
@@ -199,9 +200,9 @@ public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
     public String getCharset();
 
     /**
-     * Return the error handling page Page Class.
+     * Return the error handling page Page Class.
      *
-     * @return the error handling page Page Class
+     * @return the error handling page Page Class
      */
     public Class getErrorPageClass();
 
@@ -223,8 +224,8 @@ public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
     /**
      * Return true if the given resource is a Page class template, false
      * otherwise.
-     * 
                        
-     * Below is an example showing how to map .htm and .jsp
+     * 
                        
+     * Below is an example showing how to map .htm and .jsp
      * files as Page class templates.
      *
      * 
                        @@ -289,8 +290,8 @@ public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
     public String getPagePath(Class pageClass);
 
     /**
-     * Return the page Class for the given path. The path must start
-     * with a "/".
+     * Return the page Class for the given path. The path must start
+     * with a "/".
      *
      * @param path the page path
      * @return the page class for the given path
@@ -348,9 +349,9 @@ public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
     public List getPageInterceptors();
 
     /**
-     * Return the page not found Page Class.
+     * Return the page not found Page Class.
      *
-     * @return the page not found Page Class
+     * @return the page not found Page Class
      */
     public Class getNotFoundPageClass();
 
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConsoleLogService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConsoleLogService.java
index bd134dd20b..00e58c8d3c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConsoleLogService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ConsoleLogService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.service;
 
@@ -23,10 +24,10 @@
 
 /**
  * Provides a Log Service class which will log messages to the console or
- * System.out.
- * 
                        
+ * System.out.
+ * 
                        
  * ConsoleLogService is the default {@link LogService} for Click.
- * 
                        
+ * 
                        
  * However you can instruct Click to use a different log service implementation.
  * Please see {@link LogService} for more details.
  */
@@ -80,7 +81,7 @@ public void onDestroy() {
 
     /**
      * Set the logging level
-     * [ TRACE_LEVEL | DEBUG_LEVEL | INFO_LEVEL | WARN_LEVEL | ERROR_LEVEL ].
+     * [ TRACE_LEVEL | DEBUG_LEVEL | INFO_LEVEL | WARN_LEVEL | ERROR_LEVEL ].
      *
      * @param level the logging level
      */
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/FileUploadService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/FileUploadService.java
index 5fc61f5c02..ea48d96490 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/FileUploadService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/FileUploadService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.service;
 
@@ -37,9 +38,9 @@ public interface FileUploadService {
 
     /**
      * Initialize the FileUploadService with the given application servlet context.
-     * 
                        
+     * 
                        
      * This method is invoked after the FileUploadService has been constructed.
-     * 
                        
+     * 
                        
      * Note you can access {@link ConfigService} by invoking
      * {@link org.openidentityplatform.openam.click.util.ClickUtils#getConfigService(jakarta.servlet.ServletContext)}
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/LogService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/LogService.java
index 75495344af..2c1a1ac86c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/LogService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/LogService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.service;
@@ -24,11 +25,11 @@
 /**
  * Provides a logging service for the Click runtime.
  *
- * 
                        Configuration
                        
+ * 
                        Configuration
                        
  * The default {@link org.apache.click.service.LogService} implementation is {@link ConsoleLogService}.
- * 
                        
+ * 
                        
  * You can instruct Click to use a different implementation by adding
- * the following element to your click.xml configuration file.
+ * the following element to your click.xml configuration file.
  *
  * 
                          * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -40,7 +41,7 @@
  *
  * </click-app> 
                        
  *
- * The class com.mycorp.CustomLogService might be defined as follows:
+ * The class com.mycorp.CustomLogService might be defined as follows:
  *
  * 
                          * package com.mycorp;
@@ -59,7 +60,7 @@ public interface LogService {
 
     /**
      * Initialize the LogService with the given application servlet context.
-     * 
                        
+     * 
                        
      * This method is invoked after the LogService has been constructed.
      *
      * @param servletContext the application servlet context
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/MessagesMapService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/MessagesMapService.java
index 8cd1ec13f2..f7933ba22c 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/MessagesMapService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/MessagesMapService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.service;
 
@@ -28,11 +29,11 @@
 /**
  * Provides a messages map factory service for the Click runtime.
  *
- * 
                        Configuration
                        
+ * 
                        Configuration
                        
  * The default {@link org.apache.click.service.MessagesMapService} implementation is {@link DefaultMessagesMapService}.
- * 
                        
+ * 
                        
  * You can instruct Click to use a different implementation by adding
- * the following element to your click.xml configuration file.
+ * the following element to your click.xml configuration file.
  *
  * 
                          * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -44,14 +45,14 @@
  *
  * </click-app> 
                        
  *
- * The class com.mycorp.CustomMessagesMapService might be defined as follows:
+ * The class com.mycorp.CustomMessagesMapService might be defined as follows:
  *
  * 
                          * package com.mycorp;
  *
  * public class CustomMessagesMapService implements MessagesMapService {
  *
- *     public Map createMessagesMap(Class<?> baseClass, String globalResource, Locale locale) {
+ *     public Map<String, String> createMessagesMap(Class<?> baseClass, String globalResource, Locale locale) {
  *         return new MyMessagesMap(baseClass, globalResource, locale);
  *     }
  * } 
                        
@@ -60,7 +61,7 @@ public interface MessagesMapService {
 
     /**
      * Initialize the MessagesMapService with the given application servlet context.
-     * 
                        
+     * 
                        
      * This method is invoked after the MessagesMapService has been constructed.
      *
      * @param servletContext the application servlet context
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ResourceService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ResourceService.java
index 50c6cf5c2e..a3c6a060d1 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ResourceService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/ResourceService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.service;
 
@@ -29,11 +30,11 @@
 /**
  * Provides a static resource service interface.
  *
- * 
                        Configuration
                        
+ * 
                        Configuration
                        
  * The default ResourceService is {@link ClickResourceService}.
- * 
                        
+ * 
                        
  * However you can instruct Click to use a different implementation by adding
- * the following element to your click.xml configuration file.
+ * the following element to your click.xml configuration file.
  *
  * 
                          * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -50,7 +51,7 @@ public interface ResourceService {
     /**
      * Initialize the ResourceService with the given application configuration
      * service instance.
-     * 
                        
+     * 
                        
      * This method is invoked after the ResourceService has been constructed.
      *
      * @param servletContext the application servlet context
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/TemplateService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/TemplateService.java
index 0aee0e7c61..39bb8b852d 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/TemplateService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/TemplateService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.service;
@@ -33,11 +34,11 @@
 /**
  * Provides a templating service interface.
  *
- * 
                        Configuration
                        
+ * 
                        Configuration
                        
  * The default TemplateService is {@link VelocityTemplateService}.
- * 
                        
+ * 
                        
  * However you can instruct Click to use a different implementation by adding
- * the following element to your click.xml configuration file.
+ * the following element to your click.xml configuration file.
  *
  * 
                          * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -54,9 +55,9 @@ public interface TemplateService {
     /**
      * Initialize the TemplateService with the given application configuration
      * service instance.
-     * 
                        
+     * 
                        
      * This method is invoked after the TemplateService has been constructed.
-     * 
                        
+     * 
                        
      * Note you can access {@link ConfigService} by invoking
      * {@link org.openidentityplatform.openam.click.util.ClickUtils#getConfigService(jakarta.servlet.ServletContext)}
      *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/VelocityTemplateService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/VelocityTemplateService.java
index f6d95b62f4..05ae8ba966 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/VelocityTemplateService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/VelocityTemplateService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.service;
 
@@ -53,29 +54,29 @@
 
 /**
  * Provides a Velocity TemplateService class.
- * 
                        
+ * 
                        
  * Velocity provides a simple to use, but powerful and performant templating engine
  * for the Click Framework. The Velocity templating engine is configured and accessed
  * by this VelocityTemplateService class.
  * Velocity is the default templating engine used by Click and the Velocity class
  * dependencies are included in the standard Click JAR file.
- * 
                        
+ * 
                        
  * You can also instruct Click to use a different template service implementation.
  * Please see {@link org.apache.click.service.TemplateService} for more details.
- * 
                        
+ * 
                        
  * To see how to use the Velocity templating language please see the
  * Velocity Users Guide.
  *
- * 
                        Velocity Configuration
                        
+ * 
                        Velocity Configuration
                        
  * The VelocityTemplateService is the default template service used by Click,
  * so it does not require any specific configuration.
  * However if you wanted to configure this service specifically in your
- * click.xml configuration file you would add the following XML element.
+ * click.xml configuration file you would add the following XML element.
  *
  * 
                          * <template-service classname="VelocityTemplateService"/> 
                        
  *
- * 
                        Velocity Properties
                        
+ * 
                        Velocity Properties
                        
  *
  * The Velocity runtime engine is configured through a series of properties when the
  * VelocityTemplateService is initialized.  The default Velocity properties set are:
@@ -98,19 +99,19 @@
  * This service uses the Velocity Tools WebappResourceLoader for loading templates.
  * This avoids issues associate with using the Velocity FileResourceLoader on JEE
  * application servers.
- * 
                        
+ * 
                        
  * See the Velocity
- * Developer Guide
- * for details about these properties. Note when the application is in trace mode
+ * Developer Guide
+ * for details about these properties. Note when the application is in trace mode
  * the Velocity properties used will be logged on startup.
- * 
                        
+ * 
                        
  * If you want to add some of your own Velocity properties, or replace Click's
- * properties, add a velocity.properties file in the WEB-INF
+ * properties, add a velocity.properties file in the WEB-INF
  * directory. Click will automatically pick up this file and load these properties.
- * 
                        
+ * 
                        
  * As a example say we have our own Velocity macro library called
- * mycorp.vm we can override the default velocimacro.library
- * property by adding a WEB-INF/velocity.properties file to our web
+ * mycorp.vm we can override the default velocimacro.library
+ * property by adding a WEB-INF/velocity.properties file to our web
  * application. In this file we would then define the property as:
  *
  * 
                        @@ -118,19 +119,19 @@
  *
  * Note do not place Velocity macros under the WEB-INF directory as the Velocity
  * ResourceManager will not be able to load them.
- * 
                        
- * The simplest way to set your own macro file is to add a file named macro.vm
+ * 
                        
+ * The simplest way to set your own macro file is to add a file named macro.vm
  * under your web application's root directory. At startup Click will first check to see
- * if this file exists, and if it does it will use it instead of click/VM_global_library.vm.
+ * if this file exists, and if it does it will use it instead of click/VM_global_library.vm.
  *
- * 
                        Application Modes and Caching
                        
+ * 
                        Application Modes and Caching
                        
  *
- * 
                        Production and Profile Mode
                        
+ * 
                        Production and Profile Mode
                        
  *
- * When the Click application is in production or profile mode Velocity caching
+ * When the Click application is in production or profile mode Velocity caching
  * is enabled. With caching enables page templates and macro files are loaded and
  * parsed once and then are cached for use with later requests. When in
- * production or profile mode the following Velocity runtime
+ * production or profile mode the following Velocity runtime
  * properties are set:
  *
  * 
                        @@ -145,9 +146,9 @@
  * When running in these modes the {@link org.apache.click.service.ConsoleLogService} will be configured
  * to use
  *
- * 
                        Development and Debug Modes
                        
+ * 
                        Development and Debug Modes
                        
  *
- * When the Click application is in development, debug or trace
+ * When the Click application is in development, debug or trace
  * modes Velocity caching is disabled. When caching is disabled page templates
  * and macro files are reloaded and parsed when ever they changed. With caching
  * disabled the following Velocity
@@ -162,27 +163,27 @@
  *
  * Disabling caching is useful for application development where you can edit page
  * templates on a running application server and see the changes immediately.
- * 
                        
+ * 
                        
  * Please Note Velocity caching should be used for production as Velocity
  * template reloading is much much slower and the process of parsing and
  * introspecting templates and macros can use a lot of memory.
  *
- * 
                        Velocity Logging
                        
+ * 
                        Velocity Logging
                        
  * Velocity logging is very verbose at the best of times, so this service
- * keeps the logging level at ERROR in all modes except trace
- * mode where the Velocity logging level is set to WARN.
- * 
                        
+ * keeps the logging level at ERROR in all modes except trace
+ * mode where the Velocity logging level is set to WARN.
+ * 
                        
  * If you are having issues with some Velocity page templates or macros please
- * switch the application mode into trace so you can see the warning
+ * switch the application mode into trace so you can see the warning
  * messages provided.
- * 
                        
- * To support the use of Click LogService classes inside the Velocity
+ * 
                        
+ * To support the use of Click LogService classes inside the Velocity
  * runtime a {@link VelocityTemplateService.LogChuteAdapter} class is provided. This class wraps the
- * Click LogService with a Velocity LogChute so the Velocity runtime can
+ * Click LogService with a Velocity LogChute so the Velocity runtime can
  * use it for logging messages to.
- * 
                        
+ * 
                        
  * If you are using LogServices other than {@link ConsoleLogService} you will
- * probably configure that service to filter out Velocity's verbose INFO
+ * probably configure that service to filter out Velocity's verbose INFO
  * level messages.
  */
 public class VelocityTemplateService implements TemplateService {
@@ -199,7 +200,7 @@ public class VelocityTemplateService implements TemplateService {
 
     /**
      * The default velocity properties filename:  
-     * "/WEB-INF/velocity.properties".
+     * "/WEB-INF/velocity.properties".
      */
     protected static final String DEFAULT_TEMPLATE_PROPS = "/WEB-INF/velocity.properties";
 
@@ -207,7 +208,7 @@ public class VelocityTemplateService implements TemplateService {
     protected static final String ERROR_PAGE_PATH = "/click/error.htm";
 
     /**
-     * The user supplied macro file name:   "macro.vm".
+     * The user supplied macro file name:   "macro.vm".
      */
     protected static final String MACRO_VM_FILE_NAME = "macro.vm";
 
@@ -216,7 +217,7 @@ public class VelocityTemplateService implements TemplateService {
 
     /**
      * The global Velocity macro file path:  
-     * "/click/VM_global_library.vm".
+     * "/click/VM_global_library.vm".
      */
     protected static final String VM_FILE_PATH = "/click/VM_global_library.vm";
 
@@ -633,13 +634,13 @@ protected void internalRenderTemplate(String templatePath,
     // Inner Classes ----------------------------------------------------------
 
     /**
-     * Provides a Velocity LogChute adapter class around the application
+     * Provides a Velocity LogChute adapter class around the application
      * log service to enable the Velocity Runtime to log to the application
      * LogService.
-     * 
                        
+     * 
                        
      * Please see the {@link VelocityTemplateService} class for more details on
      * Velocity logging.
-     * 
                        
+     * 
                        
      * PLEASE NOTE this class is not for public use.
      */
     public static class LogChuteAdapter implements LogChute {
@@ -745,7 +746,7 @@ public void log(int level, String message) {
 
         /**
          * Log the given message and optional error at the specified logging level.
-         * 
                        
+         * 
                        
          * If you need to customise the Click and Velocity runtime logging for your
          * application modify this method.
          *
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/XmlConfigService.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/XmlConfigService.java
index e3a79d2105..3f6fd07acb 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/service/XmlConfigService.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/service/XmlConfigService.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.service;
@@ -64,21 +65,21 @@
 
 /**
  * Provides a Click XML configuration service class.
- * 
                        
+ * 
                        
  * This class reads Click configuration information from a file named
- * click.xml. The service will first lookup the click.xml
- * under the applications WEB-INF directory, and if not found
+ * click.xml. The service will first lookup the click.xml
+ * under the applications WEB-INF directory, and if not found
  * attempt to load the configuration file from the classpath root.
- * 
                        
- * Configuring Click through the click.xml file is the most common
+ * 
                        
+ * Configuring Click through the click.xml file is the most common
  * technique.
- * 
                        
+ * 
                        
  * However you can instruct Click to use a different service implementation.
  * Please see {@link org.apache.click.service.ConfigService} for more details.
  */
 public class XmlConfigService implements ConfigService, EntityResolver {
 
-    /** The name of the Click logger:   "org.apache.click". */
+    /** The name of the Click logger:   "org.apache.click". */
     static final String CLICK_LOGGER = "org.apache.click";
 
     /** The click deployment directory path:   "/click". */
@@ -89,21 +90,21 @@ public class XmlConfigService implements ConfigService, EntityResolver {
 
     /**
      * The default velocity properties filename:  
-     * "/WEB-INF/velocity.properties".
+     * "/WEB-INF/velocity.properties".
      */
     static final String DEFAULT_VEL_PROPS = "/WEB-INF/velocity.properties";
 
-    /** The click DTD file name:   "click.dtd". */
+    /** The click DTD file name:   "click.dtd". */
     static final String DTD_FILE_NAME = "click.dtd";
 
     /**
      * The resource path of the click DTD file:  
-     * "/org/apache/click/click.dtd".
+     * "/org/apache/click/click.dtd".
      */
     static final String DTD_FILE_PATH = "/org/apache/click/" + DTD_FILE_NAME;
 
     /**
-     * The user supplied macro file name:   "macro.vm".
+     * The user supplied macro file name:   "macro.vm".
      */
     static final String MACRO_VM_FILE_NAME = "macro.vm";
 
@@ -128,13 +129,13 @@ public class XmlConfigService implements ConfigService, EntityResolver {
     private static final Object PAGE_LOAD_LOCK = new Object();
 
     /**
-     * The name of the Velocity logger:   "org.apache.velocity".
+     * The name of the Velocity logger:   "org.apache.velocity".
      */
     static final String VELOCITY_LOGGER = "org.apache.velocity";
 
     /**
      * The global Velocity macro file name:  
-     * "VM_global_library.vm".
+     * "VM_global_library.vm".
      */
     static final String VM_FILE_NAME = "VM_global_library.vm";
 
@@ -316,8 +317,8 @@ public void onDestroy() {
     // --------------------------------------------------------- Public Methods
 
     /**
-     * Return the application mode String value:   ["production",
-     * "profile", "development", "debug"].
+     * Return the application mode String value:   ["production",
+     * "profile", "development", "debug"].
      *
      * @return the application mode String value
      */
@@ -447,14 +448,14 @@ public boolean isJspPage(String path) {
     /**
      * Return true if the given path is a Page class template, false
      * otherwise. By default this method returns true if the path has a
-     * .htm or .jsp extension.
-     * 
                        
-     * If you want to map alternative templates besides .htm and
-     * .jsp files you can override this method and provide extra
+     * .htm or .jsp extension.
+     * 
                        
+     * If you want to map alternative templates besides .htm and
+     * .jsp files you can override this method and provide extra
      * checks against the given path whether it should be added as a
      * template or not.
-     * 
                        
-     * Below is an example showing how to allow .xml paths to
+     * 
                        
+     * Below is an example showing how to allow .xml paths to
      * be recognized as Page class templates.
      *
      * 
                        @@ -472,9 +473,9 @@ public boolean isJspPage(String path) {
      *     }
      * } 
                        
      *
-     * Here is an example web.xml showing how to configure a custom
-     * ConfigService through the context parameter config-service-class.
-     * We also map *.xml requests to be routed through ClickServlet:
+     * Here is an example web.xml showing how to configure a custom
+     * ConfigService through the context parameter config-service-class.
+     * We also map *.xml requests to be routed through ClickServlet:
      *
      * 
                              * <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
@@ -512,11 +513,11 @@ public boolean isJspPage(String path) {
      *
      * Please note: even though you can add extra template mappings by
      * overriding this method, it is still recommended to keep the default
-     * .htm mapping by invoking super.isTemplate(String).
+     * .htm mapping by invoking super.isTemplate(String).
      * The reason being that Click ships with some default templates such as
      * {@link org.apache.click.service.ConfigService#ERROR_PATH} and {@link org.apache.click.service.ConfigService#NOT_FOUND_PATH}
-     * that must be mapped as .htm.
-     * 
                        
+     * that must be mapped as .htm.
+     * 
                        
      * Please see the ConfigService javadoc for details
      * on how to configure a custom ConfigService implementation.
      *
@@ -679,7 +680,7 @@ public Map getPageHeaders(String path) {
     /**
      * @see org.apache.click.service.ConfigService#getNotFoundPageClass()
      *
-     * @return the page not found Page Class
+     * @return the page not found Page Class
      */
     public Class getNotFoundPageClass() {
         XmlConfigService.PageElm page = (XmlConfigService.PageElm) pageByPathMap.get(NOT_FOUND_PATH);
@@ -695,7 +696,7 @@ public Class getNotFoundPageClass() {
     /**
      * @see org.apache.click.service.ConfigService#getErrorPageClass()
      *
-     * @return the error handling page Page Class
+     * @return the error handling page Page Class
      */
     public Class getErrorPageClass() {
         PageElm page = (XmlConfigService.PageElm) pageByPathMap.get(ERROR_PATH);
@@ -797,7 +798,7 @@ public ServletContext getServletContext() {
 
     /**
      * This method resolves the click.dtd for the XML parser using the
-     * classpath resource: /org/apache/click/click.dtd.
+     * classpath resource: /org/apache/click/click.dtd.
      *
      * @see EntityResolver#resolveEntity(String, String)
      *
@@ -824,15 +825,15 @@ public InputSource resolveEntity(String publicId, String systemId)
     /**
      * Find and return the page class for the specified pagePath and
      * pagesPackage.
-     * 
                        
-     * For example if the pagePath is '/edit-customer.htm' and
-     * package is 'com.mycorp', the matching page class will be:
-     * com.mycorp.EditCustomer or com.mycorp.EditCustomerPage.
-     * 
                        
-     * If the page path is '/admin/add-customer.htm' and package is
-     * 'com.mycorp', the matching page class will be:
-     * com.mycorp.admin.AddCustomer or
-     * com.mycorp.admin.AddCustomerPage.
+     * 
                        
+     * For example if the pagePath is '/edit-customer.htm' and
+     * package is 'com.mycorp', the matching page class will be:
+     * com.mycorp.EditCustomer or com.mycorp.EditCustomerPage.
+     * 
                        
+     * If the page path is '/admin/add-customer.htm' and package is
+     * 'com.mycorp', the matching page class will be:
+     * com.mycorp.admin.AddCustomer or
+     * com.mycorp.admin.AddCustomerPage.
      *
      * @param pagePath the path used for matching against a page class name
      * @param pagesPackage the package of the page class
@@ -945,12 +946,12 @@ protected Class getPageClass(String pagePath, String pagesPacka
      * Returns true if Click resources (JavaScript, CSS, images etc) packaged
      * in jars can be deployed to the root directory of the webapp, false
      * otherwise.
-     * 
                        
+     * 
                        
      * By default this method will return false in restricted environments where
      * write access to the underlying file system is disallowed. Example
      * environments where write access is not allowed include the WebLogic JEE
      * server and Google App Engine. (Note: WebLogic provides the property
-     * "Archived Real Path Enabled" that controls whether web
+     * "Archived Real Path Enabled" that controls whether web
      * applications can access the file system or not. See the Click user manual
      * for details).
      *
@@ -968,7 +969,7 @@ protected boolean isResourcesDeployable() {
     // ------------------------------------------------ Package Private Methods
 
     /**
-     * Loads all Click Pages defined in the click.xml file, including
+     * Loads all Click Pages defined in the click.xml file, including
      * manually defined Pages, auto mapped Pages and excluded Pages.
      *
      * @param rootElm the root xml element containing the configuration
@@ -1106,7 +1107,7 @@ void buildManualPageMapping(Element pagesElm, String pagesPackage) throws ClassN
     /**
      * Build the {@link #pageByPathMap} by associating template files with
      * matching Java classes found on the classpath.
-     * 
                        
+     * 
                        
      * This method also rebuilds the {@link #excludesList}. This list contains
      * URL paths that should not be auto-mapped.
      *
@@ -1365,7 +1366,7 @@ private void deployFiles(Element rootElm) throws Exception {
      * Deploy from the classpath all resources found under the directory
      * 'META-INF/resources/'. For backwards compatibility resources under the
      * directory 'META-INF/web/' are also deployed.
-     * 
                        
+     * 
                        
      * Only jars and folders available on the classpath are scanned.
      *
      * @throws IOException if the resources cannot be deployed
@@ -1951,7 +1952,7 @@ private static Map getAnnotatedBindableFields(Class pageClass) {
 
     /**
      * Provide an Excluded Page class.
-     * 
                        
+     * 
                        
      * PLEASE NOTE this class is not for public use, and can be
      * ignored.
      */
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ClickUtils.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ClickUtils.java
index 28297175e4..7e4c7533f4 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ClickUtils.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ClickUtils.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.util;
 
@@ -92,13 +93,13 @@ public class ClickUtils {
     // ------------------------------------------------------- Public Constants
 
     /**
-     * The resource versioning request attribute: key:  
-     * enable-resource-version.
-     * 
                        
-     * If this attribute is set to true and Click is running in
-     * production or profile mode, Click resources returned
+     * The resource versioning request attribute: key:  
+     * enable-resource-version.
+     * 
                        
+     * If this attribute is set to true and Click is running in
+     * production or profile mode, Click resources returned
      * from {@link org.apache.click.Control#getHeadElements()} will have a
-     * version indicator added to their path.
+     * version indicator added to their path.
      *
      * @see org.apache.click.Control#getHeadElements()
      * @see org.openidentityplatform.openam.click.util.ClickUtils#getResourceVersionIndicator(Context)
@@ -107,7 +108,7 @@ public class ClickUtils {
 
     /**
      * The default Click configuration filename:  
-     * "/WEB-INF/click.xml".
+     * "/WEB-INF/click.xml".
      */
     public static final String DEFAULT_APP_CONFIG = "/WEB-INF/click.xml";
 
@@ -147,14 +148,14 @@ public class ClickUtils {
     private static final char[] HEXADECIMAL = { '0', '1', '2', '3', '4', '5',
             '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
 
-    /** Ajax request header or parameter: "X-Requested-With". */
+    /** Ajax request header or parameter: "X-Requested-With". */
     private static final String X_REQUESTED_WITH = "X-Requested-With";
 
     /**
      * The array of escaped HTML character values, indexed on char value.
-     * 
                        
+     * 
                        
      * HTML entities values were derived from Jakarta Commons Lang
-     * org.apache.commons.lang.Entities class.
+     * org.apache.commons.lang.Entities class.
      */
     private static final String[] HTML_ENTITIES = new String[9999];
 
@@ -444,9 +445,9 @@ public class ClickUtils {
 
     /**
      * The array of escaped XML character values, indexed on char value.
-     * 
                        
+     * 
                        
      * XML entities values were derived from Jakarta Commons Lang
-     * org.apache.commons.lang.Entities class.
+     * org.apache.commons.lang.Entities class.
      */
     private static final String[] XML_ENTITIES = new String[63];
 
@@ -466,7 +467,7 @@ public class ClickUtils {
      * values as name value pairs. If the compress value is true, this method
      * will attempt to gzip compress the response content if requesting
      * browser accepts "gzip" encoding.
-     * 
                        
+     * 
                        
      * Once this method has returned you should not attempt to write to the
      * servlet response.
      *
@@ -543,24 +544,23 @@ public static void autoPostRedirect(HttpServletRequest request,
 
     /**
      * A helper method that binds the submitted request value to the Field's
-     * value. Since Field values are only bound during the "onProcess"
+     * value. Since Field values are only bound during the "onProcess"
      * event, this method can be used to bind a submitted Field value during
-     * the "onInit" event, which occurs before the
-     * "onProcess" event.
-     * 
                        
+     * the "onInit" event, which occurs before the
+     * "onProcess" event.
+     * 
                        
      * This is especially useful for dynamic Form and Page behavior where Field
-     * values are inspected during the "onInit" event to add or remove
+     * values are inspected during the "onInit" event to add or remove
      * specific Fields.
-     * 
                        
+     * 
                        
      * Please note: this method won't bind disabled fields, unless the
      * field has an incoming request parameter matching its name. If an incoming
      * request parameter is present, this method will switch off the Field's
      * disabled property.
-     * 
                        
+     * 
                        
      * This method delegates to
      * {@link #canBind(org.openidentityplatform.openam.click.Control, org.openidentityplatform.openam.click.Context)}
      * to check if the Field value can be bound.
-     * 
                        
      * 
                              * public void onInit() {
      *     Form form = new Form("form");
@@ -591,7 +591,7 @@ public static void bind(Field field) {
      * A helper method that binds the submitted request value to the Link's
      * value. See {@link #bind(org.openidentityplatform.openam.click.control.Field)} for a detailed
      * description.
-     * 
                        
+     * 
                        
      * This method delegates to
      * {@link #canBind(org.openidentityplatform.openam.click.Control, org.openidentityplatform.openam.click.Context)}
      * to check if the Link value can be bound.
@@ -609,11 +609,11 @@ public static void bind(AbstractLink link) {
      * A helper method that binds the submitted request values of all Fields
      * and Links inside the given container or child containers. See
      * {@link #bind(org.openidentityplatform.openam.click.control.Field)} for a detailed description.
-     * 
                        
+     * 
                        
      * This method delegates to
      * {@link #canBind(org.openidentityplatform.openam.click.Control, org.openidentityplatform.openam.click.Context)}
      * to check if the Container Fields and Links can be bound.
-     * 
                        
+     * 
                        
      * Below is an example to bind Form Field's during the onInit event:
      *
      * 
                        @@ -652,16 +652,15 @@ public static void bind(Container container) {
      * value. This method will return true if the validation succeeds, false
      * otherwise. See {@link #bind(org.openidentityplatform.openam.click.control.Field)} for a
      * detailed description.
-     * 
                        
+     * 
                        
      * This method delegates to
      * {@link #canBind(org.openidentityplatform.openam.click.Control, org.openidentityplatform.openam.click.Context)}
      * to check if the Field value can be bound and validated.
-     * 
                        
+     * 
                        
      * Please note: this method won't bind and validate disabled fields,
      * unless the field has an incoming request parameter matching its name.
      * If an incoming request parameter is present, this method will switch off
      * the Field's disabled property.
-     * 
                        
      * 
                              * public void onInit() {
      *     Form form = new Form("form");
@@ -697,7 +696,7 @@ public static boolean bindAndValidate(Field field) {
      * of all Fields and Links inside the given container or child containers.
      * This method will return true if the validation succeeds, false
      * otherwise.
-     * 
                        
+     * 
                        
      * See {@link #bindAndValidate(org.openidentityplatform.openam.click.control.Form)} for a
      * detailed description.
      *
@@ -717,11 +716,11 @@ public static boolean bindAndValidate(Container container) {
      * * A helper method that binds and validates the submitted request values
      * of all Fields and Links inside the given Form or child containers. Note,
      * the Form itself is also validated.
-     * 
                        
+     * 
                        
      * This method will return true if the validation succeeds, false otherwise.
      * See {@link #bind(org.openidentityplatform.openam.click.control.Field)} for a detailed
      * description.
-     * 
                        
+     * 
                        
      * This method delegates to
      * {@link #canBind(org.openidentityplatform.openam.click.Control, org.openidentityplatform.openam.click.Context)}
      * to check if the Form Fields and Links can be bound and validated.
@@ -805,7 +804,7 @@ public static Document buildDocument(InputStream inputStream,
     /**
      * Return true if the given control's request value can be bound, false
      * otherwise.
-     * 
                        
+     * 
                        
      * The following algorithm is used to determine if the Control can be
      * bound to a request value or not.
      * 
                          
@@ -849,7 +848,7 @@ public static boolean canBind(Control control, Context context) {
      * class loader.
      *
      * @param classname the name of the class to load
-     * @return the Class object
+     * @return the Class object
      * @throws ClassNotFoundException if the class cannot be located
      */
     public static Class classForName(String classname)
@@ -877,7 +876,7 @@ public static void close(Closeable closeable) {
     /**
      * Creates a template model of key/value pairs which can be used by template
      * engines such as Velocity and Freemarker.
-     * 
                          
+     * 
                          
      * The following objects will be added to the model:
      * 
                            
      * 
                          • the Page {@link org.openidentityplatform.openam.click.Page#model model} Map key/value
@@ -891,7 +890,7 @@ public static void close(Closeable closeable) {
      * 
                          • messages - the {@link MessagesMap} adaptor for the
      * {@link org.apache.click.Page#getMessages()} method.
      * 
                            • 
-     * 
                          • path - the {@link org.openidentityplatform.openam.click.Page#path path} of the page
+     * 
                          • path - the {@link org.openidentityplatform.openam.click.Page#path path} of the page
      * template.
      * 
                            • 
      * 
                          • request - the page {@link jakarta.servlet.http.HttpServletRequest}
@@ -998,8 +997,8 @@ public static Map createTemplateModel(final Page page, Context c
 
     /**
      * Invalidate the specified cookie and delete it from the response object.
-     * 
                            
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                            
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param request the servlet request
@@ -1015,18 +1014,18 @@ public static void invalidateCookie(HttpServletRequest request,
 
     /**
      * Return true is this is an Ajax request, false otherwise.
-     * 
                            
-     * An Ajax request is identified by the presence of the request header
-     * or request parameter: "X-Requested-With".
-     * "X-Requested-With" is the de-facto standard identifier used by
+     * 
                            
+     * An Ajax request is identified by the presence of the request header
+     * or request parameter: "X-Requested-With".
+     * "X-Requested-With" is the de-facto standard identifier used by
      * Ajax libraries.
-     * 
                            
-     * Note: incoming requests that contains a request parameter
-     * "X-Requested-With" will result in this method returning true, even
-     * though the request itself was not initiated through a XmlHttpRequest
+     * 
                            
+     * Note: incoming requests that contains a request parameter
+     * "X-Requested-With" will result in this method returning true, even
+     * though the request itself was not initiated through a XmlHttpRequest
      * object. This allows one to programmatically enable Ajax requests. A common
      * use case for this feature is when uploading files through an IFrame element.
-     * By specifying "X-Requested-With" as a request parameter the IFrame
+     * By specifying "X-Requested-With" as a request parameter the IFrame
      * request will be handled like a normal Ajax request.
      *
      * @param request the servlet request
@@ -1053,8 +1052,8 @@ public static boolean isMultipartRequest(HttpServletRequest request) {
      * Invalidate the specified cookie and delete it from the response object. Deletes only cookies mapped
      * against the root "/" path. Otherwise use
      * {@link #invalidateCookie(HttpServletRequest, HttpServletResponse, String, String)}
-     * 
                            
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                            
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @see #invalidateCookie(HttpServletRequest, HttpServletResponse, String, String)
@@ -1137,9 +1136,9 @@ public static List getChildren(Element parent, String name) {
     }
 
     /**
-     * Return the InputStream for the Click configuration file click.xml.
-     * This method will first lookup the click.xml under the
-     * applications WEB-INF directory, and then if not found it will
+     * Return the InputStream for the Click configuration file click.xml.
+     * This method will first lookup the click.xml under the
+     * applications WEB-INF directory, and then if not found it will
      * attempt to find the configuration file on the classpath root.
      *
      * @param servletContext the servlet context to obtain the Click configuration
@@ -1198,8 +1197,8 @@ public static ConfigService getConfigService(ServletContext servletContext) {
 
     /**
      * Returns the specified Cookie object, or null if the cookie does not exist.
-     * 
                            
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                            
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param request the servlet request
@@ -1225,14 +1224,14 @@ public static Cookie getCookie(HttpServletRequest request, String name) {
 
     /**
      * Sets the given cookie values in the servlet response.
-     * 
                            
+     * 
                            
      * This will also put the cookie in a list of cookies to send with this request's response
      * (so that in case of a redirect occurring down the chain, the first filter
      * will always try to set this cookie again)
-     * 
                            
+     * 
                            
      * The cookie secure flag is set if the request is secure.
-     * 
                            
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                            
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param request the servlet request
@@ -1260,8 +1259,8 @@ public static Cookie setCookie(HttpServletRequest request, HttpServletResponse r
     /**
      * Returns the value of the specified cookie as a String. If the cookie
      * does not exist, the method returns null.
-     * 
                            
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                            
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param request the servlet request
@@ -1311,18 +1310,18 @@ public static void setApplicationVersion(String applicationVersion) {
      * Return Click's version indicator for static web resources
      * (eg css, js and image files) if resource versioning is active,
      * otherwise this method will return an empty string.
-     * 
                            
+     * 
                            
      * Click's resource versioning becomes active under the following
      * conditions:
      * 
                              
      * 
                            • the {@link #ENABLE_RESOURCE_VERSION} request attribute must be set
-     * to true
                              • 
+     * to true
      * 
                            • the application mode must be either "production" or "profile"
                              • 
      * 
                            
      *
      * The version indicator is based on the current Click release version.
      * For example when using Click 1.4 this method will return the string
-     * "_1.4".
+     * "_1.4".
      *
      * @param context the request context
      * @return a version indicator for web resources
@@ -1352,19 +1351,19 @@ && isEnableResourceVersion(context)) {
      * If resource versioning is active this method will return the
      * application version indicator for static web resources
      * (eg JavaScript and Css) otherwise this method will return an empty string.
-     * 
                            
+     * 
                            
      * Application resource versioning becomes active under the following
      * conditions:
      * 
                              
      * 
                            • the {@link #ENABLE_RESOURCE_VERSION} request attribute must be set
-     * to true
                              • 
+     * to true
      * 
                            • the application mode must be either "production" or "profile"
                              • 
      * 
                            
      *
      * The version indicator is based on the application version.
      * For example if the application version is 1.2 this method will
-     * return the string "_1.2".
-     * 
                            
+     * return the string "_1.2".
+     * 
                            
      * The application version can be set through the static method
      * {@link #setApplicationVersion(java.lang.String)}.
      *
@@ -1399,28 +1398,28 @@ public static String getApplicationResourceVersionIndicator() {
 
     /**
      * Return the given control CSS selector or null if no selector can be found.
-     * 
                            
+     * 
                            
      * Please note: it is highly recommended to set a control's ID
      * attribute when dealing with Ajax requests.
-     * 
                            
+     * 
                            
      * The CSS selector is calculated as follows:
      * 
                              
      *   
                            1. if control.getId() is set, prepend it with a '#' char
-     *       and return the value. An example selector will be: #field-id
+     *       and return the value. An example selector will be: #field-id
      *   
                              2. 
      *
      *   
                            2. if control.getName() is set do the following:
      *     
                                
      *       
                              1. if the control is of type {@link org.apache.click.control.ActionLink},
-     *       it's "class" attribute selector will be returned. For example:
-     *       a[class=red]. Please note: if the link class attribute is
+     *       it's "class" attribute selector will be returned. For example:
+     *       a[class=red]. Please note: if the link class attribute is
      *       not set, the class attribute will be set to its name, prefixed with
-     *       a dash, '-'. For example: a[class=-my-link].
+     *       a dash, '-'. For example: a[class=-my-link].
      *       
                                2. 
      *
      *       
                              2. if the control is not an ActionLink, it is assumed the control
-     *       will render its "name" attribute and the name attribute
-     *       selector will be returned. For example: input[name=my-button].
+     *       will render its "name" attribute and the name attribute
+     *       selector will be returned. For example: input[name=my-button].
      *       
                                3. 
      *     
                              
      *   
                              3. 
@@ -1478,7 +1477,7 @@ public static String getCssSelector(Control control) {
 
     /**
      * Populate the given object's attributes with the Form's field values.
-     * 
                              
+     * 
                              
      * The specified Object can either be a POJO (plain old java object) or
      * a {@link java.util.Map}. If a POJO is specified, its attributes are
      * populated from  matching form fields. If a map is specified, its
@@ -1496,7 +1495,7 @@ public static void copyFormToObject(Form form, Object object,
 
     /**
      * Populate the given Form field values with the object's attributes.
-     * 
                              
+     * 
                              
      * The specified Object can either be a POJO (plain old java object) or
      * a {@link java.util.Map}. If a POJO is specified, its attributes are
      * copied to matching form fields. If a map is specified, its key/value
@@ -1515,10 +1514,10 @@ public static void copyObjectToForm(Object object, Form form,
     /**
      * Deploy the specified classpath resource to the given target directory
      * under the web application root directory.
-     * 
                              
+     * 
                              
      * This method will not override any existing resources found in the
      * target directory.
-     * 
                              
+     * 
                              
      * If an IOException or SecurityException occurs this method will log a
      * warning message.
      *
@@ -1645,14 +1644,14 @@ public static void deployFiles(ServletContext servletContext,
 
     /**
      * Deploys required files (from a file list) for a control that repsects a specific convention.
-     * 
                              
+     * 
                              
      * Convention:
-     * 
                              
+     * 
                              
      * There's a descriptor file generated by the tools/standalone/dev-tasks/ListFilesTask.
      * The files to deploy are all in a subdirectory placed in the same directory with the control.
-     * See documentation for more details. 
                              
+     * See documentation for more details. 
                              
      *
-     * Usage:
                              
+     * Usage:
                              
      * In your Control simply use the code below, and everything should work automatically.
      * 
                                    * public void onDeploy(ServletContext servletContext) {
@@ -1707,7 +1706,7 @@ public static void deployFileList(ServletContext servletContext,
     }
 
     /**
-     * Return an encoded version of the Serializable object. The object
+     * Return an encoded version of the Serializable object. The object
      * will be serialized, compressed and Base 64 encoded.
      *
      * @param object the object to encode
@@ -1798,12 +1797,12 @@ public static Object decode(String string)
 
     /**
      * Builds a cookie string containing a username and password.
-     * 
                              
+     * 
                              
      * Note: with open source this is not really secure, but it prevents users
      * from snooping the cookie file of others and by changing the XOR mask and
      * character offsets, you can easily tweak results.
-     * 
                              
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                              
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param username the username
@@ -1822,12 +1821,12 @@ public static String encodePasswordCookie(String username, String password, int
     /**
      * Builds a cookie string containing a username and password, using offsets
      * to customize the encoding.
-     * 
                              
+     * 
                              
      * Note: with open source this is not really secure, but it prevents users
      * from snooping the cookie file of others and by changing the XOR mask and
      * character offsets, you can easily tweak results.
-     * 
                              
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                              
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param username the username
@@ -1864,8 +1863,8 @@ public static String encodePasswordCookie(String username, String password, Stri
 
     /**
      * Decodes a cookie string containing a username and password.
-     * 
                              
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                              
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param cookieVal the encoded cookie username and password value
@@ -1883,8 +1882,8 @@ public static String[] decodePasswordCookie(String cookieVal, int xorMask) {
 
     /**
      * Decodes a cookie string containing a username and password.
-     * 
                              
-     * This method was derived from Atlassian CookieUtils method of
+     * 
                              
+     * This method was derived from Atlassian CookieUtils method of
      * the same name, release under the BSD License.
      *
      * @param cookieVal the encoded cookie username and password value
@@ -1932,10 +1931,10 @@ public static String[] decodePasswordCookie(String cookieVal, String encoding,
 
     /**
      * URL encode the specified value using the "UTF-8" encoding scheme.
-     * 
                              
-     * For example (http://host?name=value with spaces) will become
-     * (http://host?name=value+with+spaces).
-     * 
                              
+     * 
                              
+     * For example (http://host?name=value with spaces) will become
+     * (http://host?name=value+with+spaces).
+     * 
                              
      * This method uses {@link URLEncoder#encode(java.lang.String, java.lang.String)}
      * internally.
      *
@@ -1956,10 +1955,10 @@ public static String encodeURL(Object value) {
 
     /**
      * URL decode the specified value using the "UTF-8" encoding scheme.
-     * 
                              
-     * For example (http://host?name=value+with+spaces) will become
-     * (http://host?name=value with spaces).
-     * 
                              
+     * 
                              
+     * For example (http://host?name=value+with+spaces) will become
+     * (http://host?name=value with spaces).
+     * 
                              
      * This method uses {@link URLDecoder#decode(java.lang.String, java.lang.String)}
      * internally.
      *
@@ -1982,10 +1981,10 @@ public static String decodeURL(Object value) {
      * Return an encoded URL value for the given object using the context
      * request character encoding or "UTF-8" if the request character encoding
      * is not specified.
-     * 
                              
-     * For example (http://host?name=value with spaces) will become
-     * (http://host?name=value+with+spaces).
-     * 
                              
+     * 
                              
+     * For example (http://host?name=value with spaces) will become
+     * (http://host?name=value+with+spaces).
+     * 
                              
      * This method uses
      * {@link URLEncoder#encode(java.lang.String, java.lang.String)} internally.
      *
@@ -2149,7 +2148,7 @@ public static boolean isEnableResourceVersion(Context context) {
     /**
      * Return the value string limited to maxlength characters. If the string
      * gets curtailed, "..." is appended to it.
-     * 
                              
+     * 
                              
      * Adapted from Velocity Tools Formatter.
      *
      * @param value the string value to limit the length of
@@ -2163,7 +2162,7 @@ public static String limitLength(String value, int maxlength) {
     /**
      * Return the value string limited to maxlength characters. If the string
      * gets curtailed and the suffix parameter is appended to it.
-     * 
                              
+     * 
                              
      * Adapted from Velocity Tools Formatter.
      *
      * @param value the string value to limit the length of
@@ -2196,7 +2195,7 @@ public static LogService getLogService() {
     /**
      * Return the list of Fields for the given Form, including any Fields
      * contained in FieldSets. The list of returned fields will exclude any
-     * Button, FieldSet or Label fields.
+     * Button, FieldSet or Label fields.
      *
      * @param form the form to obtain the fields from
      * @return the list of contained form fields
@@ -2210,7 +2209,7 @@ public static List getFormFields(Form form) {
 
     /**
      * Return the mime-type or content-type for the given filename/extension.
-     * 
                              
+     * 
                              
      * Example:
      * 
                                    * // Lookup mimetype for file
@@ -2248,7 +2247,7 @@ public static String getMimeType(String value) {
 
     /**
      * Return the given control's top level parent's localized messages Map.
-     * 
                              
+     * 
                              
      * This method will walk up to the control's parent page object and
      * return pages messages. If the control's top level parent is a control
      * then the parent's messages map will be returned. If the top level
@@ -2293,14 +2292,14 @@ public static Map getParentMessages(Control control) {
     /**
      * Return the given control's top level parent's localized message for the
      * specified name.
-     * 
                              
+     * 
                              
      * This method will walk up to the control's parent page object and for each
      * parent control found, look for a message of the specified name. A
      * message found in a parent control will override the message of a child
      * control.
-     * 
                              
+     * 
                              
      * Given the following property files:
-     * 
                              
+     * 
                              
      * MyPage.properties
      * 
                                    * myfield.label=Page 
                              
@@ -2329,18 +2328,18 @@ public static Map getParentMessages(Control control) {
      * }
      * 
                              
      *
-     * The first (1.) println statement above will output Form because
+     * The first (1.) println statement above will output Form because
      * at that stage MyForm is the highest level parent of field.
-     * getParentMessage will find the property myfield.label
-     * in the MyForm message properties and return Form
-     * 
                              
-     * The second (2.) println statement will output Page as now
+     * getParentMessage will find the property myfield.label
+     * in the MyForm message properties and return Form
+     * 
                              
+     * The second (2.) println statement will output Page as now
      * MyPage is the highest level parent. On its first pass up the hierarchy,
-     * getParentMessage will find the property myfield.label
+     * getParentMessage will find the property myfield.label
      * in the MyForm message properties and on its second pass will find the
      * same property in MyPage message properties. As MyPage is higher up the
      * hierarchy than MyForm, MyPage will override MyForm and the property value
-     * will be Page.
+     * will be Page.
      *
      * @param control the control to get the parent message for
      * @param name the specific property name to find
@@ -2448,7 +2447,7 @@ public static Map getRequestParameterMap(HttpServletRequest requ
     /**
      * Return the page resource path from the request. For example:
      * 
                              -     * http://www.mycorp.com/banking/secure/login.htm  ->  /secure/login.htm 
                              
+     * http://www.mycorp.com/banking/secure/login.htm  ->  /secure/login.htm 
                              
      *
      * @param request the page servlet request
      * @return the page resource path from the request
@@ -2484,7 +2483,7 @@ public static String getResourcePath(HttpServletRequest request) {
     /**
      * Return the requestURI from the request. For example:
      * 
                              -     * http://www.mycorp.com/banking/secure/login.htm  ->  /banking/secure/login.htm 
                              
+     * http://www.mycorp.com/banking/secure/login.htm  ->  /banking/secure/login.htm 
                        
      *
      * @param request the page servlet request
      * @return the requestURI from the request
@@ -2514,13 +2513,13 @@ public static String getRequestURI(HttpServletRequest request) {
      * Finds a resource with a given name. This method returns null if no
      * resource with this name is found.
      * 
                        
-     * This method uses the current Thread context ClassLoader to find
+     * This method uses the current Thread context ClassLoader to find
      * the resource. If the resource is not found the class loader of the given
      * class is then used to find the resource.
      *
      * @param name the name of the resource
      * @param aClass the class lookup the resource against, if the resource is
-     *     not found using the current Thread context ClassLoader.
+     *     not found using the current Thread context ClassLoader.
      * @return the input stream of the resource if found or null otherwise
      */
     public static InputStream getResourceAsStream(String name, Class aClass) {
@@ -2541,13 +2540,13 @@ public static InputStream getResourceAsStream(String name, Class aClass) {
      * Finds a resource with a given name. This method returns null if no
      * resource with this name is found.
      * 
                        
-     * This method uses the current Thread context ClassLoader to find
+     * This method uses the current Thread context ClassLoader to find
      * the resource. If the resource is not found the class loader of the given
      * class is then used to find the resource.
      *
      * @param name the name of the resource
      * @param aClass the class lookup the resource against, if the resource is
-     *     not found using the current Thread context ClassLoader.
+     *     not found using the current Thread context ClassLoader.
      * @return the URL of the resource if found or null otherwise
      */
     public static URL getResource(String name, Class aClass) {
@@ -2606,7 +2605,7 @@ public static void removeState(Stateful control, String controlName, Context con
     /**
      * Restore the control state from the session for the given stateful control,
      * control name and request context.
-     * 
                        
+     * 
                        
      * This method delegates to {@link org.apache.click.Stateful#setState(java.lang.Object)}
      * to restore the control state.
      *
@@ -2636,7 +2635,7 @@ public static void restoreState(Stateful control, String controlName, Context co
     /**
      * Save the control state in the session for the given stateful control,
      * control name and request context.
-     * 
                        
+     * 
                        
      * * This method delegates to {@link org.apache.click.Stateful#getState()}
      * to retrieve the control state to save.
      *
@@ -2711,8 +2710,8 @@ public static String toIsGetterName(String property) {
      * Return a field label string from the given field name. For example:
      * 
                              * faxNumber   ->   Fax Number 
                        
-     * 
                        
-     * Note toLabel will return an empty String ("") if a null
+     * 
                        
+     * Note toLabel will return an empty String ("") if a null
      * String name is specified.
      *
      * @param name the field name
@@ -2759,8 +2758,8 @@ public static String toLabel(String name) {
     /**
      * Return an 32 char MD5 encoded string from the given plain text.
      * The returned value is MD5 hash compatible with Tomcat catalina Realm.
-     * 
                        
-     * Adapted from org.apache.catalina.util.MD5Encoder
+     * 
                        
+     * Adapted from org.apache.catalina.util.MD5Encoder
      *
      * @param plaintext the plain text value to encode
      * @return encoded MD5 string
@@ -2794,11 +2793,11 @@ public static String toMD5Hash(String plaintext) {
 
     /**
      * Return a field name string from the given field label.
-     * 
                        
-     * A label of " OK do it!" is returned as "okDoIt". Any &nbsp;
+     * 
                        
+     * A label of " OK do it!" is returned as "okDoIt". Any &nbsp;
      * characters will also be removed.
-     * 
                        
-     * A label of "customerSelect" is returned as "customerSelect".
+     * 
                        
+     * A label of "customerSelect" is returned as "customerSelect".
      *
      * @param label the field label or caption
      * @return a field name string from the given field label
@@ -2868,7 +2867,7 @@ public static String toSetterName(String property) {
      * Returns true if Click resources (JavaScript, CSS, images etc) packaged
      * in jars can be deployed to the root directory of the webapp, false
      * otherwise.
-     * 
                        
+     * 
                        
      * This method will return false in restricted environments where write
      * access to the underlying file system is disallowed. Examples where
      * write access is not allowed include the WebLogic JEE server (this can be
@@ -3062,7 +3061,7 @@ static boolean requiresHtmlEscape(String value) {
     /**
      * A helper method that binds the submitted request values of all Fields
      * and Links inside the given container or child containers.
-     * 
                        
+     * 
                        
      * For Field controls, this method delegates to
      * {@link #bindField(org.openidentityplatform.openam.click.control.Field, org.openidentityplatform.openam.click.Context)}.
      *
@@ -3097,7 +3096,7 @@ private static void bind(Container container, Context context) {
     /**
      * A helper method that binds and validates the submitted request values
      * of all Fields and Links inside the given container or child containers.
-     * 
                        
+     * 
                        
      * For Field controls, this method delegates to
      * {@link #bindField(org.openidentityplatform.openam.click.control.Field, org.openidentityplatform.openam.click.Context)}.
      *
@@ -3144,7 +3143,7 @@ private static boolean bindAndValidate(Container container, Context context) {
      * A helper method that binds and validates the submitted request values
      * of all Fields and Links inside the given Form or child containers. Note,
      * the Form itself is also validated.
-     * 
                        
+     * 
                        
      * For Field controls, this method delegates to
      * {@link #bindField(org.openidentityplatform.openam.click.control.Field, org.openidentityplatform.openam.click.Context)}.
      *
@@ -3178,7 +3177,7 @@ private static boolean bindAndValidate(Form form, Context context) {
     /**
      * A helper method that binds and validates the Field's submitted request
      * value.
-     * 
                        
+     * 
                        
      * This method delegates to
      * {@link #bindField(org.openidentityplatform.openam.click.control.Field, org.openidentityplatform.openam.click.Context)}
      * to bind the field value.
@@ -3213,7 +3212,7 @@ private static boolean bindAndValidate(Field field, Context context) {
     /**
      * Bind the field to its incoming request parameter, returning true if the
      * field value was bound, false otherwise.
-     * 
                        
+     * 
                        
      * Please note: this method won't bind disabled fields,
      * unless the field has an incoming request parameter matching its name.
      * If an incoming request parameter is present, this method will switch off
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ContainerUtils.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ContainerUtils.java
index d55186dc43..b499b14c72 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ContainerUtils.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/ContainerUtils.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.util;
@@ -55,7 +56,7 @@ public class ContainerUtils {
 
     /**
      * Populate the given object attributes from the Containers field values.
-     * 
                        
+     * 
                        
      * If a Field and object attribute matches, the object attribute is set to
      * the Object returned from the method
      * {@link org.apache.click.control.Field#getValueObject()}. If an object
@@ -63,11 +64,11 @@ public class ContainerUtils {
      * {@link org.apache.click.control.Field#getValueObject()} will be converted
      * into the specific primitive e.g. Integer will become int and Boolean will
      * become boolean.
-     * 
                        
+     * 
                        
      * The fieldList specifies which fields to copy to the object. This allows
      * one to include or exclude certain Container fields before populating the
      * object.
-     * 
                        
+     * 
                        
      * The following example shows how to exclude disabled fields from
      * populating a customer object:
      * 
                        @@ -198,17 +199,17 @@ public static void copyContainerToObject(Container container,
 
     /**
      * Populate the given Container field values from the object attributes.
-     * 
                        
+     * 
                        
      * If a Field and object attribute matches, the Field value is set to the
      * object attribute using the method
      * {@link org.apache.click.control.Field#setValueObject(java.lang.Object)}. If
      * an object attribute is a primitive it is first converted to its proper
      * wrapper class e.g. int will become Integer and boolean will become
      * Boolean.
-     * 
                        
+     * 
                        
      * The fieldList specifies which fields to populate from the object. This
      * allows one to exclude or include specific fields.
-     * 
                        
+     * 
                        
      * The specified Object can either be a POJO (plain old java object) or
      * a {@link java.util.Map}. If a POJO is specified, its attributes are
      * copied to matching container fields. If a map is specified, its key/value
@@ -310,7 +311,7 @@ public static void copyObjectToContainer(Object object,
     /**
      * Find and return the first control with a matching name in the specified
      * container.
-     * 
                        
+     * 
                        
      * If no matching control is found in the specified container, child
      * containers will be recursively scanned for a match.
      *
@@ -377,8 +378,8 @@ public static List
                        
      *
-     * @return a reference to this HtmlStringBuffer object
+     * @return a reference to this HtmlStringBuffer object
      */
     public HtmlStringBuffer closeTag() {
         append(">");
@@ -428,12 +429,12 @@ public HtmlStringBuffer closeTag() {
 
     /**
      * Append a HTML element end to the string buffer.
-     * 
                        
+     * 
                        
      * For example:
      * 
                        -     *    elementEnd()  ->  /> 
                        
+     *    elementEnd()  ->  /> 
                        
      *
-     * @return a reference to this HtmlStringBuffer object
+     * @return a reference to this HtmlStringBuffer object
      */
     public HtmlStringBuffer elementEnd() {
         append("/>");
@@ -443,13 +444,13 @@ public HtmlStringBuffer elementEnd() {
 
     /**
      * Append a HTML element start to the string buffer.
-     * 
                        
+     * 
                        
      * For example:
      * 
                        -     *    elementStart("input")  ->  <input 
                        
+     *    elementStart("input")  ->  <input 
                        
      *
      * @param name the HTML element name to start
-     * @return a reference to this HtmlStringBuffer object
+     * @return a reference to this HtmlStringBuffer object
      */
     public HtmlStringBuffer elementStart(String name) {
         append("<");
@@ -538,7 +539,7 @@ protected void expandCapacity(int minimumCapacity) {
      * Append the given value to the buffer and HTML escape its value.
      *
      * @param value the object value to append
-     * @return a reference to this HtmlStringBuffer object
+     * @return a reference to this HtmlStringBuffer object
      * @throws IllegalArgumentException if the value is null
      */
     HtmlStringBuffer appendHtmlEscaped(Object value) {
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/PageImports.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/PageImports.java
index 27c659256d..9443e50615 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/PageImports.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/PageImports.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.openidentityplatform.openam.click.util;
 
@@ -40,7 +41,7 @@
 /**
  * Provides a utility object for rendering a Page's HEAD elements and
  * control HEAD elements.
- * 
                        
+ * 
                        
  * PageImports automatically makes the HEAD elements available to Velocity
  * templates and JSP pages through the following variables:
  * 
                          
@@ -52,7 +53,7 @@
  * By splitting JavaScript elements from other HEAD elements allows you to place
  * JavaScript elements at the bottom of the Page which allows the HTML content
  * to be rendered faster.
- * 
                          
+ * 
                          
  * To use the HEAD elements simply reference them in your page template. For
  * example:
  *
@@ -332,7 +333,7 @@ public void populateRequest(HttpServletRequest request, Map mode
      * Process the HEAD elements of the given list of Controls. You can retrieve
      * the processed HEAD elements through {@link #getHeadElements} and
      * {@link #getJsElements()}.
-     * 
                          
+     * 
                          
      * This method delegates to {@link #processControl(Control)}
      * to add the given Control's HEAD elements to the Page imports.
      *
@@ -351,7 +352,7 @@ public void processControls(List controls) {
      * process Containers and all child controls. You can retrieve
      * the processed HEAD elements through {@link #getHeadElements} and
      * {@link #getJsElements()}.
-     * 
                          
+     * 
                          
      * This method delegates to {@link #processHeadElements(List)}
      * to add the HEAD elements to the Page imports.
      *
@@ -513,9 +514,9 @@ protected void processPageControls() {
 
     /**
      * Process the given list of HEAD elements.
-     * 
                          
+     * 
                          
      * This method invokes {@link #add(Element)} for
-     * every Element entry in the specified list.
+     * every Element entry in the specified list.
      *
      * @param elements the list of HEAD elements to process
      */
diff --git a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/SessionMap.java b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/SessionMap.java
index f0e02c525e..28455eda74 100644
--- a/openam-core/src/main/java/org/openidentityplatform/openam/click/util/SessionMap.java
+++ b/openam-core/src/main/java/org/openidentityplatform/openam/click/util/SessionMap.java
@@ -15,6 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.openam.click.util;
@@ -34,7 +35,7 @@
 /**
  * Provides a Map adaptor for HttpSession objects. A SessionMap instance is
  * available in each Velocity page using the name "session".
- * 
                          
+ * 
                          
  * For example suppose we have a User object in the session with the
  * attribute name "user" when a user is logged on.  We can display the users
  * name in the page when the are logged onto the system.
@@ -48,7 +49,7 @@
  *
  * The ClickServlet adds a SessionMap instance to the Velocity Context before
  * it is merged with the page template.
- * 
                          
+ * 
                          
  * The SessionMap supports {@link FlashAttribute} which when accessed via
  * {@link #get(Object)} are removed from the session.
  */
@@ -58,7 +59,7 @@ public class SessionMap implements Map {
     protected HttpSession session;
 
     /**
-     * Create a HttpSession Map adaptor.
+     * Create a HttpSession Map adaptor.
      *
      * @param value the http session
      */
@@ -103,7 +104,7 @@ public boolean containsKey(Object key) {
 
     /**
      * This method is not supported and will throw
-     * UnsupportedOperationException if invoked.
+     * UnsupportedOperationException if invoked.
      *
      * @see java.util.Map#containsValue(Object)
      */
diff --git a/openam-coretoken/src/main/java/com/sun/identity/coretoken/spi/CoreTokenStore.java b/openam-coretoken/src/main/java/com/sun/identity/coretoken/spi/CoreTokenStore.java
index a97481fa91..aa54aa3e38 100644
--- a/openam-coretoken/src/main/java/com/sun/identity/coretoken/spi/CoreTokenStore.java
+++ b/openam-coretoken/src/main/java/com/sun/identity/coretoken/spi/CoreTokenStore.java
@@ -23,6 +23,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * $Id: CoreTokenStore.java,v 1.1 2009/11/19 00:07:41 qcheng Exp $
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.coretoken.spi;
@@ -82,7 +84,7 @@ public void deleteToken(Subject subject, String tokenId)
      * @param queryString HTTP query string.
      * @return JSON array of token.id values for resources that match
      *         the query. May be empty.
-     * @throws CoreTokenException
+     * @throws CoreTokenException if the token search fails.
      */
     public JSONArray searchTokens (Subject subject,
         String queryString) throws CoreTokenException;
diff --git a/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java b/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java
index 817d502847..ccbfa740f5 100644
--- a/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java
+++ b/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java
@@ -1117,7 +1117,7 @@ public void removeAttributes(SSOToken token, IdType type, String name, Set(&(|(attr1=value1)(attr2=value2))(searchAttr=pattern)(objectclassfilter)).
+     * {@code (&(|(attr1=value1)(attr2=value2))(searchAttr=pattern)(objectclassfilter))}.
      *
      * @param token Not used.
      * @param type The type of the identity.
diff --git a/openam-documentation/openam-doc-log-message-ref/pom.xml b/openam-documentation/openam-doc-log-message-ref/pom.xml
index 0763526dbf..007e5a69a8 100644
--- a/openam-documentation/openam-doc-log-message-ref/pom.xml
+++ b/openam-documentation/openam-doc-log-message-ref/pom.xml
@@ -31,14 +31,6 @@
  
   
 
-   
-    org.apache.maven.plugins
-    maven-javadoc-plugin
-    
-     true
-    
-   
-
    
     org.codehaus.mojo
     xml-maven-plugin
diff --git a/openam-documentation/openam-doc-ssoadm-ref/src/main/java/org/forgerock/openam/docs/ssoadm/SsoadmAP.java b/openam-documentation/openam-doc-ssoadm-ref/src/main/java/org/forgerock/openam/docs/ssoadm/SsoadmAP.java
index 495bd041d3..080b86465f 100644
--- a/openam-documentation/openam-doc-ssoadm-ref/src/main/java/org/forgerock/openam/docs/ssoadm/SsoadmAP.java
+++ b/openam-documentation/openam-doc-ssoadm-ref/src/main/java/org/forgerock/openam/docs/ssoadm/SsoadmAP.java
@@ -21,6 +21,7 @@
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.docs.ssoadm;
 
@@ -73,12 +74,12 @@ public Set getSubcommands() {
     }
 
     /**
-     * Two field annotations hold documentation content: @Macro and
-     * @SubCommandInfo. @Macro holds field content to be merged with
-     * @SubCommandInfo field content for @SubCommandInfo annotations that
-     * reference @Macro.
+     * Two field annotations hold documentation content: {@code @Macro} and
+     * {@code @SubCommandInfo}. {@code @Macro} holds field content to be merged with
+     * {@code @SubCommandInfo} field content for {@code @SubCommandInfo} annotations that
+     * reference {@code @Macro}.
      *
-     * @SubCommandInfo field annotations hold descriptions,
+     * {@code @SubCommandInfo} field annotations hold descriptions,
      * manadatoryOptions, and optionalOptions used in reference
      * documentation.
      *
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/AnonymousESubject.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/AnonymousESubject.java
index f0cce4782f..f6d9a303de 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/AnonymousESubject.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/AnonymousESubject.java
@@ -23,6 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * $Id: AnonymousESubject.java,v 1.1 2009/08/19 05:40:32 veiming Exp $
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package com.sun.identity.entitlement;
 
@@ -58,8 +59,7 @@ String getState() {
      * @param environment Environment parameters.
      * @return SubjectDecision of
      * ESubject evaluation
-     * @throws com.sun.identity.entitlement,  EntitlementException in case
-     * of any error
+     * @throws EntitlementException in case of any error
      */
     public SubjectDecision evaluate(
             Subject subject,
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/AttributeSubject.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/AttributeSubject.java
index 91d929e663..792a5d855e 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/AttributeSubject.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/AttributeSubject.java
@@ -23,6 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * $Id: AttributeSubject.java,v 1.1 2009/08/19 05:40:32 veiming Exp $
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package com.sun.identity.entitlement;
 
@@ -103,8 +104,7 @@ public String getID() {
      * @param environment Environment parameters.
      * @return SubjectDecision of
      * EntitlementSubject evaluation
-     * @throws com.sun.identity.entitlement,  EntitlementException in case
-     * of any error
+     * @throws EntitlementException in case of any error
      */
     public SubjectDecision evaluate(
         String realm,
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/ExactMatchResourceName.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/ExactMatchResourceName.java
index 5bd7eb3794..ccc97a6406 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/ExactMatchResourceName.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/ExactMatchResourceName.java
@@ -24,6 +24,7 @@
  *
  * $Id: ExactMatchResourceName.java,v 1.1 2009/08/19 05:40:32 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package com.sun.identity.entitlement;
 
@@ -65,7 +66,7 @@ public String canonicalize(String str)
      * 
      * @param o1 a url query parameter to be compared  
      * @param o2 a url query parameter to be compared  
-     * @return -1 if o1 < o2; 0 if o1 = o2; 1 if o1 > o2
+     * @return {@code -1} if o1 < o2; {@code 0} if o1 = o2; {@code 1} if o1 > o2
      */
     public int compare(Object o1, Object o2) {
         String s1 = (String) o1;
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/GroupSubject.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/GroupSubject.java
index 909163c672..f2f93f9678 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/GroupSubject.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/GroupSubject.java
@@ -25,6 +25,7 @@
  * $Id: GroupSubject.java,v 1.1 2009/08/19 05:40:33 veiming Exp $
  *
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.entitlement;
@@ -85,8 +86,7 @@ public GroupSubject(String group, String pSubjectName) {
      * @param environment Environment parameters.
      * @return SubjectDecision of
      * EntitlementSubject evaluation
-     * @throws com.sun.identity.entitlement,  EntitlementException in case
-     * of any error
+     * @throws EntitlementException in case of any error
      */
     public SubjectDecision evaluate(
         String realm,
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/UserSubject.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/UserSubject.java
index 2757150940..61848e1e14 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/UserSubject.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/UserSubject.java
@@ -25,6 +25,7 @@
  * $Id: UserSubject.java,v 1.1 2009/08/19 05:40:34 veiming Exp $
  *
  * Portions Copyrighted 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.entitlement;
@@ -79,8 +80,7 @@ public UserSubject(String user, String pSubjectName) {
      * @param environment Environment parameters.
      * @return SubjectDecision of
      * EntitlementSubject evaluation
-     * @throws com.sun.identity.entitlement,  EntitlementException in case
-     * of any error
+     * @throws EntitlementException in case of any error
      */
     public SubjectDecision evaluate(
         String realm,
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOGroupSubject.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOGroupSubject.java
index aa32f90f6a..0b72480ecf 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOGroupSubject.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOGroupSubject.java
@@ -25,6 +25,7 @@
  * $Id: OpenSSOGroupSubject.java,v 1.2 2009/08/21 21:52:01 hengming Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.entitlement.opensso;
@@ -100,8 +101,7 @@ public OpenSSOGroupSubject(String group, String pSubjectName) {
      * @param environment Environment parameters.
      * @return SubjectDecision of
      * EntitlementSubject evaluation
-     * @throws com.sun.identity.entitlement,  EntitlementException in case
-     * of any error
+     * @throws EntitlementException in case of any error
      */
     @Override
     public SubjectDecision evaluate(
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOSubjectAttributesCollector.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOSubjectAttributesCollector.java
index 98e4e2bbdb..8ea6b4a192 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOSubjectAttributesCollector.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/opensso/OpenSSOSubjectAttributesCollector.java
@@ -25,6 +25,7 @@
  * $Id: OpenSSOSubjectAttributesCollector.java,v 1.3 2009/09/24 22:38:21 hengming Exp $
  *
  * Portions Copyrighted 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.entitlement.opensso;
@@ -254,7 +255,7 @@ public boolean isGroupMembershipSearchIndexEnabled() {
 
     /**
      * Returns the attribute values of the given user represented by
-     * Subject object.
+     * a {@code Subject} object.
      *
      * @param subject identity of the user.
      * @param attrNames requested attribute names.
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/SearchFilterFactory.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/SearchFilterFactory.java
index b0f1bb932c..acd1056518 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/SearchFilterFactory.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/SearchFilterFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package com.sun.identity.entitlement.xacml3;
 
@@ -46,8 +47,8 @@ public SearchFilterFactory() {
      *
      * Where operator can be one of the following:
      * Equals - =
-     * Less Than - <
-     * Greater Than - >
+     * Less Than - <
+     * Greater Than - >
      *
      * @param filter Non null String representing a search filter.
      * @return Non null parsed SearchFilter.
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..fc8dd33006 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;
 
@@ -92,7 +93,7 @@
  * Class with utility methods to map from
  * com.sun.identity.entity.Privilege
  * to
- * com.sun.identity.entitlement.xacml3.core.Policy
+ * com.sun.identity.entitlement.xacml3.core.Policy
  */
 public class XACMLPrivilegeUtils {
 
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..7d20616f86 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;
@@ -70,12 +70,13 @@ public PrivilegeSet read(InputStream xacml) throws EntitlementException {
      * Translate provided XACML PolicySet into OpenAM Privileges, ReferralPrivileges, Applications and ResourceTypes.
      * XACML export file doesn't map Application and Resource Type completely and hence dummy ResourceType Ids
      * are assigned to ResourceTypes created and same is used for linking Application, Privilege to the ResourceType.
-     * 
                          
      *
-     * From a policySet instance: 
                          
+     * From a policySet instance: 
                          
+     * 
                            
      * 
                          •  An application is created for every unique application name found in the Policy instances.
                            • 
      * 
                          •  One ResourceType instance (with dummy uuid) per Policy is created.
                            • 
      * 
                          •  One instance of Privilege per Policy instance is created. 
                            • 
+     * 
                          
      *
      * @param policySet The set of policies to translate
      * @return OpenAM Privileges, ReferralPrivileges, Applications and ResourceTypes.
diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/validation/RealmValidator.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/validation/RealmValidator.java
index bb2e765a65..82caa75338 100644
--- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/validation/RealmValidator.java
+++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/xacml3/validation/RealmValidator.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.validation;
 
@@ -39,8 +40,10 @@ public RealmValidator(OrganizationConfigManager manager) {
     }
 
     /**
+     * Validates that every realm in the collection exists in the framework.
+     *
      * @param realms Non null but possibly empty collection.
-     * @return True if collection is empty, or if the Realm exists in the framework.
+     * @throws EntitlementException if a realm in the collection does not exist in the framework.
      */
     public void validateRealms(Collection realms) throws EntitlementException {
         Collection all = getAllRealmNames();
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/AuthLevelCondition.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/AuthLevelCondition.java
index 8c033d5972..37e35b70f0 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/AuthLevelCondition.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/AuthLevelCondition.java
@@ -14,6 +14,7 @@
  * Copyright 2006 Sun Microsystems Inc.
  *
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.entitlement.conditions.environment;
@@ -146,8 +147,9 @@ public ConditionDecision evaluate(String realm, Subject subject, String resource
      * 
                          Will also set an advice if the requested auth level is less than the configured auth level of the minimum
      * required auth level.
                          
      *
-     * @param maxRequestAuthLevel {@inheritDoc}
-     * @param advices {@inheritDoc}
+     * @param maxRequestAuthLevel the maximum authentication level presented by the request
+     * @param advices the advice map, updated with the required authentication level when the condition is not
+     * satisfied
      * @return {@code true} if the get {@code maxRequestAuthLevel} is greater than or equal to the configured auth
      * level.
      */
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/ConditionConstants.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/ConditionConstants.java
index 77f06a96b0..ae6abef4a9 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/ConditionConstants.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/ConditionConstants.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.conditions.environment;
 
@@ -89,10 +90,10 @@ private ConditionConstants() {
      * Key that is used to define request IP address that is passed down as part of the environment Map
      * to evaluate of an EntitlementCondition for condition evaluation. Value for the key
      * should be a String representation of IP of the client,
-     * 
                          
+     * 
                          
      * For IP version 4:
      * The form is  n.n.n.n where n is a value between 0 and 255 inclusive.
-     * 
                          
+     * 
                          
      * For IP version 6:
      * The form is x:x:x:x:x:x:x:x where x is the hexadecimal values of the eight 16-bit pieces of the address.
      */
@@ -167,7 +168,6 @@ private ConditionConstants() {
      * 
                                *    HH:mm
      * 
                          
-     *
                          
      *
      * 
                          
      * Some sample values are
@@ -175,7 +175,6 @@ private ConditionConstants() {
      *     08:25
      *     18:45
      * 
                        
-     * 
                        
      *
      * @see #END_TIME
      */
@@ -194,7 +193,6 @@ private ConditionConstants() {
      * 
                              *    HH:mm
      * 
                        
-     *
                        
      *
      * 
                        
      * Some sample values are
@@ -202,7 +200,6 @@ private ConditionConstants() {
      *     08:25
      *     18:45
      * 
                        
-     * 
                        
      *
      * @see #START_TIME
      */
@@ -224,7 +221,6 @@ private ConditionConstants() {
      *     Sun
      *     Mon
      * 
                        
-     * 
                        
      *
      * @see #END_DAY
      */
@@ -246,7 +242,6 @@ private ConditionConstants() {
      *     Sun
      *     Mon
      * 
                        
-     * 
                        
      *
      * @see #START_DAY
      */
@@ -269,7 +264,6 @@ private ConditionConstants() {
      *     2001:02:26
      *     2002:12:31
      * 
                        
-     * 
                        
      *
      * @see #END_DATE
      */
@@ -292,7 +286,6 @@ private ConditionConstants() {
      *     2001:02:26
      *     2002:12:31
      * 
                        
-     * 
                        
      *
      * @see #START_DATE
      */
@@ -354,7 +347,7 @@ private ConditionConstants() {
      *     
                      • 122.100.85.45-125.110.90.66
                        • 
      *     
                      • 145.64.55.35-215.110.173.145
                        • 
      *     
                      • 15.64.55.35
                        • 
-     * 
                      
+     * 
                    
      *
      * 
                    The patterns for IP Version 6 is:
      *    x:x:x:x:x:x:x:x[-x:x:x:x:x:x:x:x]
@@ -441,7 +434,6 @@ private ConditionConstants() {
      * finace.yahoo.com
      * *.yahoo.com
      * 
                    
-     * 
                    
      */
     public static final String DNS_NAME = "dnsName";
 
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/SimpleTimeCondition.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/SimpleTimeCondition.java
index ff9ab6bbe6..7f2f55a367 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/SimpleTimeCondition.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/conditions/environment/SimpleTimeCondition.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006 Sun Microsystems Inc
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.entitlement.conditions.environment;
@@ -70,9 +71,9 @@ public class SimpleTimeCondition extends EntitlementConditionAdaptor {
     public static final String ENFORCEMENT_TIME_ZONE = "enforcementTimeZone";
 
     /**
-     * Key that is used to define the time zone that is passed in the {@code env parameter while invoking
-     * {@codegetConditionDecision} method of a {@code SimpleTimeCondition} Value for the key should be a {@codeTimeZone}
-     * object. This would be used only if the {@code ENFORCEMENT_TIME_ZONE} is not defined for the
+     * Key that is used to define the time zone that is passed in the {@code env} parameter while invoking the
+     * {@code getConditionDecision} method of a {@code SimpleTimeCondition}. Value for the key should be a
+     * {@code TimeZone} object. This would be used only if the {@code ENFORCEMENT_TIME_ZONE} is not defined for the
      * {@code SimpleTimeCondition}.
      *
      *  @see #ENFORCEMENT_TIME_ZONE
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/configuration/SmsQueryFilterVisitor.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/configuration/SmsQueryFilterVisitor.java
index 6798afe1f7..571f02cd2b 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/configuration/SmsQueryFilterVisitor.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/configuration/SmsQueryFilterVisitor.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.configuration;
 
@@ -24,7 +25,7 @@
 
 /**
  * Query filter visitor that understands attributes associated with the SMS layer.
- * 
                    
+ * 
                    
  * Due to the current way attributes are stored in LDAP via the SMS layer,
  * only supported operator is equality. All logical operators are supported.
  *
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/constraints/ConstraintValidator.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/constraints/ConstraintValidator.java
index 73096c13a1..9701e2f9d7 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/constraints/ConstraintValidator.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/constraints/ConstraintValidator.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.constraints;
 
@@ -19,7 +20,7 @@
 
 /**
  * Current validates resources and actions against the constraints within a resource type.
- * 
                    
+ * 
                    
  * This implementation is currently very specific but will become more general purpose, not only concerning itself
  * with resource constraints but also subject and environment constraints.
  *
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSaveIndex.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSaveIndex.java
index 8a218b38df..6fe5ef0274 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSaveIndex.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSaveIndex.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock Inc.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.indextree;
 
@@ -25,7 +26,7 @@
 
 /**
  * Implementation provides a simple save index, which is the passed policy rule as a path index.
- * 
                    
+ * 
                    
  * Expects the passed resource to have already been normalised.
  *
  * @author apforrest
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSearchIndexDelegate.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSearchIndexDelegate.java
index 0e1ff8e112..651d591e54 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSearchIndexDelegate.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/TreeSearchIndexDelegate.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2014 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.entitlement.indextree;
@@ -28,7 +28,7 @@
 
 /**
  * Implementation provides search index by means of an in memory rule index cache.
- * 
                    
+ * 
                    
  * Expects the passed resource to have already been normalised.
  */
 public class TreeSearchIndexDelegate implements ISearchIndex {
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/events/IndexChangeObserver.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/events/IndexChangeObserver.java
index 52f7d8b51d..264e0ce23d 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/events/IndexChangeObserver.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/indextree/events/IndexChangeObserver.java
@@ -12,12 +12,13 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock Inc.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.indextree.events;
 
 /**
  * Implemented by any class wanting to be notified of any index change events.
- * 
                    
+ * 
                    
  * It is essential that any implementing class is registered with the
  * {@link IndexChangeObservable#registerObserver(IndexChangeObserver)} in order to be included within any notifications.
  *
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java
index c3ac765558..64a7e022de 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2015-2016 ForgeRock AS.
  * Portions Copyrighted 2015 Nomura Research Institute, Ltd.
- * Portions copyright 2025 3A Systems, LLC.
+ * Portions copyright 2025-2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.rest;
 
@@ -235,7 +235,7 @@ private String generateResourceTypeName(CreateRequest request) throws Entitlemen
      * json definition for an application. It also expects that the mentioned application exists with exactly one
      * resource type - no resource types or many resource types is not acceptable, else it is impossible to determine
      * which resource type applies to the set of actions and resources being passed as part of the application json.
-     * 
                    
+     * 
                    
      * Changes to the actions and/or resources will be reflected in the applications associated resource type.
      *
      * @param context
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationsResource.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationsResource.java
index 1bf475ea84..826fc9babf 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationsResource.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationsResource.java
@@ -13,7 +13,7 @@
 *
 * Copyright 2014-2016 ForgeRock AS.
 * Portions Copyrighted 2019 Open Source Solution Technology Corporation.
-* Portions copyright 2025 3A Systems LLC.
+* Portions copyright 2025-2026 3A Systems LLC.
 */
 package org.forgerock.openam.entitlement.rest;
 
@@ -279,7 +279,7 @@ protected ApplicationWrapper createApplicationWrapper(JsonValue jsonValue, Subje
 
     /**
      * Creates an {@link ApplicationWrapper} to hold the {@link Application} object.
-     * 
                    
+     * 
                    
      * This method provides an abstraction to aid testing.
      *
      * @param application
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ConditionTypesResource.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ConditionTypesResource.java
index 2b05c9e9e0..fa5f9c0273 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ConditionTypesResource.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ConditionTypesResource.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.entitlement.rest;
@@ -121,8 +121,6 @@ public ConditionTypesResource(@Named("frRest") Debug debug, EntitlementRegistry
     }
 
     /**
-     * {@inheritDoc}
-     *
      * Uses the {@link EntitlementRegistry} to locate the {@link EntitlementCondition}s to return.
      *
      * Looks up all the names of conditions registered in the system, and then returns each one to the
@@ -168,8 +166,6 @@ public Promise queryCollection(Context context
     }
 
     /**
-     * {@inheritDoc}
-     *
      * Uses the {@link EntitlementRegistry} to locate the {@link EntitlementCondition} to return.
      */
     @Read(operationDescription = @Operation(
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResource.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResource.java
index 9ad5cd6e7d..20cfc361d8 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResource.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResource.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.entitlement.rest;
@@ -101,7 +101,7 @@ public DecisionCombinersResource(@Named("frRest") Debug debug, EntitlementRegist
     }
 
     /**
-     * {@inheritDoc}
+     * Queries all decision combiner types registered in the system.
      */
     @Query(operationDescription = @Operation(
             description = DECISION_COMBINERS_RESOURCE + QUERY_DESCRIPTION),
@@ -145,7 +145,7 @@ public Promise queryCollection(Context context
     }
 
     /**
-     * {@inheritDoc}
+     * Reads a single decision combiner type by its identifier.
      */
     @Read(operationDescription = @Operation(
             errors = {
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/PolicyResource.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/PolicyResource.java
index 38ae5ee71b..9b0aab23b4 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/PolicyResource.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/PolicyResource.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2014-2015 ForgeRock AS.
  * Portions Copyrighted 2019 Open Source Solution Technology Corporation.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.entitlement.rest;
@@ -134,7 +134,7 @@ public PolicyResource(final PolicyEvaluatorFactory factory,
     }
 
     /**
-     * {@inheritDoc}
+     * Evaluates policies for the given action request and returns the resulting policy decisions.
      */
     @Action(operationDescription = @Operation(
                     errors = {
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/SubjectTypesResource.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/SubjectTypesResource.java
index 16ccdf2ebb..8c33f59342 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/SubjectTypesResource.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/SubjectTypesResource.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.entitlement.rest;
@@ -113,8 +113,6 @@ public SubjectTypesResource(@Named("frRest") Debug debug, EntitlementRegistry en
     }
 
     /**
-     * {@inheritDoc}
-     *
      * Uses the {@link EntitlementRegistry} to locate the {@link EntitlementSubject}s to return.
      *
      * Looks up all the names of subjects registered in the system, and then returns each one to the
@@ -161,8 +159,6 @@ public Promise queryCollection(Context context
     }
 
     /**
-     * {@inheritDoc}
-     *
      * Uses the {@link EntitlementRegistry} to locate the {@link EntitlementSubject} to return.
      */
     @Read(operationDescription = @Operation(
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/JsonResourceType.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/JsonResourceType.java
index d0653ddcd8..b5198f4a38 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/JsonResourceType.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/JsonResourceType.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.rest.wrappers;
 
@@ -31,7 +32,7 @@
  * Wrapper for the conversion of ResourceType to and from JSON.
  *
  * Taking an instance of an {@link org.forgerock.openam.entitlement.ResourceType} this class exposes the necessary
- * parts of that class to the Jackson {@link org.codehaus.jackson.map.ObjectMapper} via annotations.
+ * parts of that class to the Jackson {@code org.codehaus.jackson.map.ObjectMapper} via annotations.
  */
 public class JsonResourceType {
 
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/ReferralWrapper.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/ReferralWrapper.java
index e6b4c0597c..5a7440f0a1 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/ReferralWrapper.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/wrappers/ReferralWrapper.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.entitlement.rest.wrappers;
@@ -29,7 +30,7 @@
 
 /**
  * Wrapper for the jsonification of {@link ReferralPrivilege} objects, for
- * interaction via the REST endpoint {@link org.forgerock.openam.forgerockrest.entitlements.ReferralsResource}.
+ * interaction via the REST endpoint {@code org.forgerock.openam.forgerockrest.entitlements.ReferralsResource}.
  */
 public class ReferralWrapper implements Comparable {
 
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/SimpleReferenceTree.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/SimpleReferenceTree.java
index 1880859eec..79dfb9627b 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/SimpleReferenceTree.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/SimpleReferenceTree.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock Inc.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.utils.indextree;
 
@@ -37,12 +38,12 @@
  * they and their immediate children have interest in the character. Any previously elected node that has interest is
  * reelected and any child nodes that have interest are elected for the first time; all other previously elected nodes
  * are disregarded. The same approach is taken for each character of the resource.
- * 
                    
+ * 
                    
  * Once this process has completed for all characters of the resource, any nodes that exist in the election pool will
  * have in some way matched the resource, whether explicitly or implicitly via the use of wildcards. Each node in the
  * pool is now asked whether it represents an end point and hence a previously added rule. The list of those that do
  * is the list that is returned.
- * 
                    
+ * 
                    
  * Rules are added in a tree structure, each node representing the next character within a rule. The tree node that
  * represents the last character of a rule is know as an end point; end point nodes mark this fact. The following
  * rules end up in the proceeding structure:
@@ -60,17 +61,17 @@
  * In the above scenario '/', 'p' and 'l' all become end points, marking in the tree where a policy rule ends. The three
  * rules equate to 85 characters, but once in the tree structure this reduces to 50 characters, giving a compression
  * just over 40% in this scenario.
- * 
                    
+ * 
                    
  * Only additions to the tree actually modify the trees structure and therefore concise synchronisation has been added
  * to this method, to ensure it's thread safe whilst not hindering the performance of the tree. Tree removes never
  * actually remove node elements but instead reduce end point markers on the matching nodes. Searches can rest assured
  * that the tree structure will always be stable, however due to the lack of synchronisation to keep performance high,
  * there's a chance that a read may retrieve stale data if an add occurs at the same time.
- * 
                    
+ * 
                    
  * This implementation makes use of simple tree node references to help improve tree navigation performance and to keep
  * the memory footprint to a minimal. It does this by using tree nodes that contain basic references to its position in
  * the tree as opposed to using other structures to assist, such as {@link List}.
- * 
                    
+ * 
                    
  * It makes use of a factory for the node creation so that the behavior of resource evaluation can be adapted.
  *
  * @author apforrest
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/RootNode.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/RootNode.java
index 69a718436e..40716dcbdb 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/RootNode.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/RootNode.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock Inc.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.utils.indextree.treenodes;
 
@@ -19,7 +20,7 @@
 
 /**
  * Root node of the tree structure.
- * 
                    
+ * 
                    
  * As there can be many nodes at the root level, the idea of this root node was created to represent the parent of those
  * potential nodes. This helps when describing algorithms by having a single point of access into the tree. It has no
  * other function than to be an 'anchor' to the structure.
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/TreeNode.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/TreeNode.java
index 0afb85972d..159a75c4c8 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/TreeNode.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/utils/indextree/treenodes/TreeNode.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock Inc.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.entitlement.utils.indextree.treenodes;
 
@@ -19,16 +20,16 @@
 
 /**
  * A representation of a node with a tree structure.
- * 
                    
+ * 
                    
  * A tree node can have one parent and many children. Children are represented by single references to one another. So
  * a parent has a single reference to its first child and then corresponding children can be accessed via a child's
  * sibling reference.
- * 
                    
+ * 
                    
  * A tree node represents a single character within an index rule. An index rule is the path in the tree up to an end
  * point. Each tree node is responsible for determining whether it has interest in a passed resource character. For
  * instance a tree node may represent a wildcard and therefore may have interest in a set of characters. Implementations
  * of this interface determine the concrete behaviour.
- * 
                    
+ * 
                    
  * Tree nodes have a notion of end points. An end point denotes the final character of an index rule that was added to
  * the tree structure. Therefore the path of an end point is an index rule. For instance, if two index rules "abcd" and
  * "abcdef" were added to the tree, there would be no way to determine that the path to tree node "d" represented an
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/ImportStep.java b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/ImportStep.java
index b931f7a324..7936f94de8 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/ImportStep.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/ImportStep.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.xacml.v3;
 
@@ -32,7 +33,7 @@ public interface ImportStep {
     /**
      * Name of the step. For example name of the resource type or application.
      *
-     * @return
+     * @return the name of the step
      */
     String getName();
 
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/CommonType.java b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/CommonType.java
index 9b2ce51d0b..420f022adc 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/CommonType.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/CommonType.java
@@ -22,12 +22,12 @@
  ~ your own identifying information:
  ~ "Portions Copyrighted [year] [name of copyright owner]"
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.xacml.v3.model;
 
 /**
  * Normalized Content Types from Specific Types.
- * 
                    
  *
  * @author jeff.schenk@forgerock.com
  * @see ContentType
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/ContentType.java b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/ContentType.java
index 77bdd10118..6acc4321bb 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/ContentType.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/model/ContentType.java
@@ -22,13 +22,14 @@
  ~ your own identifying information:
  ~ "Portions Copyrighted [year] [name of copyright owner]"
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.xacml.v3.model;
 
 /**
  * Various Content Types which are dealt with using XACML 3 via HTTP/REST.
- * 
                    
- * Extending MediaTypes, @see javax.ws.rs.core.MediaType.
+ * 
                    
+ * Extending MediaTypes, see {@code javax.ws.rs.core.MediaType}.
  *
  * @author jeff.schenk@forgerock.com
  */
@@ -60,8 +61,8 @@ public CommonType getCommonType() {
     /**
      * Normalize the Content Received from the actual HTTP Request.
      *
-     * @param contentTypeStringValue
-     * @return
+     * @param contentTypeStringValue the raw Content-Type value received from the HTTP request
+     * @return the matching {@link ContentType}, or {@code null} if the value is {@code null} or empty
      */
     public static ContentType getNormalizedContentType(final String contentTypeStringValue) {
         if ((contentTypeStringValue == null) || (contentTypeStringValue.isEmpty())) {
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3HomeResource.java b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3HomeResource.java
index 6cd8a63b3d..8224cced90 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3HomeResource.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3HomeResource.java
@@ -1,3 +1,29 @@
+/**
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ *
+ * 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
+ * http://forgerock.org/license/CDDLv1.0.html
+ * See the License for the specific language governing
+ * permission and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at http://forgerock.org/license/CDDLv1.0.html
+ * If applicable, add the following below the CDDL Header,
+ * 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.
+ */
 package org.forgerock.openam.xacml.v3.resources;
 
 import com.sun.identity.shared.debug.Debug;
@@ -11,7 +37,7 @@
 
 /**
  * XACML Resource for Home Documents
- * 
                    
+ * 
                    
  * Provides main end-point for all XACML Home requests.
  *
  * @author Jeff.Schenk@forgerock.com
@@ -32,8 +58,8 @@ private XACML3HomeResource() {
      * Creates Home Document Content providing hints.
      *
      * @return String -- Containing Response in requested ContentType.
-     * @throws jakarta.servlet.ServletException
-     * @throws java.io.IOException
+     * @throws org.json.JSONException if the home document cannot be built
+     * @throws java.io.IOException if writing the home document fails
      */
     public static String getHome() throws JSONException, IOException {
         String classMethod = "XacmlHomeResource:getHome";
@@ -54,7 +80,7 @@ public static String getHome() throws JSONException, IOException {
     /**
      * Home Document
      * XML Home Document using ATOM RFC4287
-     * @return
+     * @return the XML home document as a String
      */
     public static String getXMLHomeDocument() {
         StringBuilder sb = new StringBuilder();
@@ -74,7 +100,7 @@ public static String getXMLHomeDocument() {
      * Formulate our Home Document.
      *
      * @return JSONObject
-     * @throws org.json.JSONException
+     * @throws org.json.JSONException if the JSON home document cannot be built
      */
     public static JSONObject getJSONHomeDocument() throws JSONException {
         JSONObject resources = new JSONObject();
diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3Resource.java b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3Resource.java
index 4f2be69a4e..6c6ae471a3 100644
--- a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3Resource.java
+++ b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/resources/XACML3Resource.java
@@ -22,12 +22,13 @@
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.xacml.v3.resources;
 
 /**
  * XACML Resource
- * 
                    
+ * 
                    
  * Provides Top Level Object for XACML v3 Resources
  * which represent end components for the overall XACML Framework.
  *
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSample.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSample.java
index 99ee075280..0bba437b35 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSample.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSample.java
@@ -27,6 +27,7 @@
  */
 /*
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.idrepo;
@@ -47,7 +48,6 @@
  * This class
  *
  *
- * @author
  */
 public class IdRepoSample {
     static final String DEF_USERNAME = "amAdmin";
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleCreateId.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleCreateId.java
index 815006126d..caa06b4408 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleCreateId.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleCreateId.java
@@ -24,6 +24,7 @@
  *
  * $Id: IdRepoSampleCreateId.java,v 1.15 2008/09/24 19:50:10 goodearth Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.idrepo;
@@ -47,7 +48,6 @@
  * This class 
  *
  *
- * @author 
  */
 public class IdRepoSampleCreateId {
 
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleDeleteId.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleDeleteId.java
index 43d0dba563..5c67f0dac4 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleDeleteId.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleDeleteId.java
@@ -25,6 +25,7 @@
  * $Id: IdRepoSampleDeleteId.java,v 1.3 2008/06/25 05:41:13 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.idrepo;
@@ -46,7 +47,6 @@
  * This class 
  *
  *
- * @author 
  */
 public class IdRepoSampleDeleteId {
 
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleGetSpecialIds.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleGetSpecialIds.java
index 8b8ab2b6b0..e838027e3a 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleGetSpecialIds.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleGetSpecialIds.java
@@ -24,6 +24,7 @@
  *
  * $Id: IdRepoSampleGetSpecialIds.java,v 1.2 2008/06/25 05:41:14 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.idrepo;
@@ -44,7 +45,6 @@
  * This class 
  *
  *
- * @author 
  */
 public class IdRepoSampleGetSpecialIds {
 
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSearchIds.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSearchIds.java
index f942de694f..a9a212533f 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSearchIds.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSearchIds.java
@@ -25,6 +25,7 @@
  * $Id: IdRepoSampleSearchIds.java,v 1.4 2008/06/25 05:41:14 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.idrepo;
@@ -46,7 +47,6 @@
  * This class 
  *
  *
- * @author 
  */
 public class IdRepoSampleSearchIds {
 
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSubRealm.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSubRealm.java
index cc895dea37..cc5a660dce 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSubRealm.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleSubRealm.java
@@ -24,6 +24,7 @@
  *
  * $Id: IdRepoSampleSubRealm.java,v 1.2 2008/06/25 05:41:14 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.idrepo;
@@ -37,7 +38,6 @@
  * This class 
  *
  *
- * @author 
  */
 public class IdRepoSampleSubRealm {
 
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleUtils.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleUtils.java
index c51858e371..06d1a701f5 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleUtils.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/idrepo/IdRepoSampleUtils.java
@@ -24,6 +24,7 @@
  *
  * $Id: IdRepoSampleUtils.java,v 1.5 2008/08/07 22:08:20 goodearth Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.idrepo;
@@ -52,7 +53,6 @@
  * This class 
  *
  *
- * @author 
  */
 public class IdRepoSampleUtils {
 
diff --git a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/logging/LogSampleUtils.java b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/logging/LogSampleUtils.java
index a869bbf225..fc6b7bf1cb 100644
--- a/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/logging/LogSampleUtils.java
+++ b/openam-examples/openam-example-clientsdk-cli/src/main/java/com/sun/identity/samples/clientsdk/logging/LogSampleUtils.java
@@ -24,6 +24,7 @@
  *
  * $Id: LogSampleUtils.java,v 1.3 2008/07/29 20:34:57 bigfatrat Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.samples.clientsdk.logging;
@@ -48,7 +49,6 @@
  * This class 
  *
  *
- * @author 
  */
 public class LogSampleUtils {
 
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/federation/FederationPrincipal.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/federation/FederationPrincipal.java
index 17dcfb4445..a7ae807ac6 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/federation/FederationPrincipal.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/federation/FederationPrincipal.java
@@ -24,6 +24,7 @@
  *
  * $Id: FederationPrincipal.java,v 1.2 2008/06/25 05:49:31 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.modules.federation;
@@ -49,8 +50,6 @@ public FederationPrincipal(String name) {
     /**
      * Return the LDAP username for this FederationPrincipal.
      *
-     * 
                    
-     *
      * @return the LDAP username for this FederationPrincipal
      */
     public String getName() {
@@ -60,8 +59,6 @@ public String getName() {
     /**
      * Return a string representation of this FederationPrincipal.
      *
-     * 
                    
-     *
      * @return a string representation of this FederationPrincipal.
      */
     public String toString() {
@@ -74,8 +71,6 @@ public String toString() {
      * FederationPrincipal and the two FederationPrincipals
      * have the same username.
      *
-     * 
                    
-     *
      * @param o Object to be compared for equality with this
      *                FederationPrincipal.
      *
@@ -103,8 +98,6 @@ public boolean equals(Object o) {
     /**
      * Return a hash code for this FederationPrincipal.
      *
-     * 
                    
-     *
      * @return a hash code for this FederationPrincipal.
      */
     public int hashCode() {
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/sae/SAEPrincipal.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/sae/SAEPrincipal.java
index 3a16656548..e2119de0bd 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/sae/SAEPrincipal.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/authentication/modules/sae/SAEPrincipal.java
@@ -24,6 +24,7 @@
  *
  * $Id: SAEPrincipal.java,v 1.2 2008/06/25 05:49:31 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.authentication.modules.sae;
@@ -54,8 +55,6 @@ public SAEPrincipal (String name) {
     /**
      * Returns the username for this SAEPrincipal.
      *
-     * 
                    
-     *
      * @return the username for this SAEPrincipal
      */
     public String getName() {
@@ -65,8 +64,6 @@ public String getName() {
     /**
      * Returns a string representation of this SAEPrincipal.
      *
-     * 
                    
-     *
      * @return a string representation of this SAEPrincipal.
      */
     public String toString() {
@@ -79,8 +76,6 @@ public String toString() {
      * SAEPrincipal and the two SAEPrincipals
      * have the same username.
      *
-     * 
                    
-     *
      * @param o Object to be compared for equality with this
      *		SAEPrincipal.
      *
@@ -106,8 +101,6 @@ public boolean equals(Object o) {
     /**
      * Returns a hash code for this SAEPrincipal.
      *
-     * 
                    
-     *
      * @return a hash code for this SAEPrincipal.
      */
     public int hashCode() {
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DefaultDiscoAuthorizer.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DefaultDiscoAuthorizer.java
index f3fe0fabd3..b5c53a90e1 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DefaultDiscoAuthorizer.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/disco/plugins/DefaultDiscoAuthorizer.java
@@ -24,6 +24,7 @@
  *
  * $Id: DefaultDiscoAuthorizer.java,v 1.2 2008/06/25 05:49:56 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -176,7 +177,8 @@ private boolean checkInput(Object credential, String action, Object data,
      *          com.sun.identity.liberty.ws.soapbinding.Message.
      * @return AuthorizationDecision object contains authorization
      *             decision information for the given resource.
-     * @exception Exception
+     * @exception Exception if an error occurs while making the authorization
+     *             decision.
      */
     public Object getAuthorizationDecision(
                   Object credential,
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPAuthorizer.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPAuthorizer.java
index 572c518c4c..c04626b897 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPAuthorizer.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPAuthorizer.java
@@ -25,6 +25,7 @@
  * $Id: IDPPAuthorizer.java,v 1.6 2008/08/19 19:12:22 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.liberty.ws.idpp.plugin;
@@ -105,7 +106,8 @@ public boolean isAuthorized(Object credential, String action,
      *             decision information for the given data.
      *             For Personal Profile service, this object would be the 
      *             String authZ decision value.
-     * @exception Exception
+     * @exception Exception if an error occurs while making the authorization
+     *             decision.
      */
 
     public Object getAuthorizationDecision(
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultActionMapper.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultActionMapper.java
index c623b3a550..4af3477551 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultActionMapper.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultActionMapper.java
@@ -25,6 +25,7 @@
  * $Id: DefaultActionMapper.java,v 1.4 2008/08/19 19:12:24 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.plugins;
@@ -81,7 +82,6 @@ public DefaultActionMapper() {}
      * "urn:com:sun:identity"; and its SubjectConfirmationData contains
      * TEXT node only, then the method returns the concatenated string of all
      * the TEXT nodes. Otherwise, it returns null.
-     * 
                    
      * @see com.sun.identity.saml.plugins.ActionMapper#getSSOTokenID
      */
     public String getSSOTokenID(AuthorizationDecisionQuery query) {
@@ -105,7 +105,6 @@ public String getSSOTokenID(AuthorizationDecisionQuery query) {
      * This method exams the Evidence in the AuthorizationDecisionQuery.
      * It returns the first valid Assertion that contains at least one
      * AuthenticationStatement.
-     * 
                    
      * @see com.sun.identity.saml.plugins.ActionMapper#getSSOAssertion
      */
     public Assertion getSSOAssertion(AuthorizationDecisionQuery query,
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultSiteAttributeMapper.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultSiteAttributeMapper.java
index 5db2184ba9..8d726b1079 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultSiteAttributeMapper.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/DefaultSiteAttributeMapper.java
@@ -24,7 +24,7 @@
  *
  * $Id: DefaultSiteAttributeMapper.java,v 1.2 2009/01/08 04:29:00 hengming Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 
@@ -60,8 +60,6 @@
  * AttributeStatements elements, as part of the
  * Authentication Assertion returned to the partner during the
  * SSO scenario of Browser Artifact and POST profile.
- * 
                    
- *
  */
 public class DefaultSiteAttributeMapper implements ConsumerSiteAttributeMapper {
 
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/NameIDPartnerAccountMapper.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/NameIDPartnerAccountMapper.java
index 54cdcd7088..40a6c35a47 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/NameIDPartnerAccountMapper.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/saml/plugins/NameIDPartnerAccountMapper.java
@@ -25,6 +25,7 @@
  * $Id: NameIDPartnerAccountMapper.java,v 1.5 2010/01/09 19:41:52 qcheng Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.plugins;
@@ -44,7 +45,6 @@
  * the value is DN, the RND value will be returned. If value is email
  * address, the email id (without @domain) will be returned. Otherwise,
  * whole Name ID value will be returned.
- * 
                    
  */
 public class NameIDPartnerAccountMapper extends DefaultPartnerAccountMapper {
 
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..f385df9859 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
@@ -24,6 +24,7 @@
  *
  * $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;
 
@@ -238,9 +239,10 @@ public String getPolicy(ProviderConfig providerConfig)
      * 
      * @return the XML String representation for the web service provider
      *         input policy. 
-     * @throws com.sun.identity.wss.policy.WSSPolicyException
+     * @throws com.sun.identity.wss.policy.WSSPolicyException if the input
+     *         policy cannot be generated.
      */
-    public String getInputPolicy(ProviderConfig providerConfig) 
+    public String getInputPolicy(ProviderConfig providerConfig)
             throws WSSPolicyException {
         
         try {
@@ -292,7 +294,8 @@ public String getInputPolicy(ProviderConfig providerConfig)
      *        provider.
      * @return the XML String representation of ws-security policy for the
      *         web service provider.
-     * @throws com.sun.identity.wss.policy.WSSPolicyException 
+     * @throws com.sun.identity.wss.policy.WSSPolicyException if the output
+     *         policy cannot be generated.
      */
     public String getOutputPolicy(ProviderConfig providerConfig)
             throws WSSPolicyException {
@@ -330,7 +333,7 @@ public String getOutputPolicy(ProviderConfig providerConfig)
      * Returns the STS end point policy
      * @return the XML String representation of ws-security policy for the
      * STS service.
-     * @throws WSSPolicyException
+     * @throws WSSPolicyException if the STS policy cannot be generated.
      */
     public String getSTSPolicy()
             throws WSSPolicyException {
@@ -342,7 +345,8 @@ public String getSTSPolicy()
      * Returns the input policy for the STS service
      * @return the XML String representation of ws-security policy for the
      *         STS service.
-     * @throws com.sun.identity.wss.policy.WSSPolicyException
+     * @throws com.sun.identity.wss.policy.WSSPolicyException if the STS input
+     *         policy cannot be generated.
      */
     public String getSTSInputPolicy() throws WSSPolicyException {
         return getInputPolicy(getSTSConfig());
@@ -353,7 +357,8 @@ public String getSTSInputPolicy() throws WSSPolicyException {
      * Returns the output policy for the STS service
      * @return the XML String representation of ws-security policy for the
      *         STS service.
-     * @throws com.sun.identity.wss.policy.WSSPolicyException
+     * @throws com.sun.identity.wss.policy.WSSPolicyException if the STS output
+     *         policy cannot be generated.
      */
 
     public String getSTSOutputPolicy() throws WSSPolicyException {
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/STSConfig.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/STSConfig.java
index 381c698814..47ecada732 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/STSConfig.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/STSConfig.java
@@ -24,6 +24,7 @@
  *
  * $Id: STSConfig.java,v 1.10 2009/11/16 21:52:58 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /*
@@ -104,7 +105,7 @@ public String getKeyType() {
     
     /**
      * Sets the keytype
-     * @param keyType
+     * @param keyType the key type to set, for example symmetric or asymmetric.
      */
     public void setKeyType(String keyType) {
         this.keyType = keyType;
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/TrustAuthorityConfig.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/TrustAuthorityConfig.java
index ff49199dc3..a51e46aa7f 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/TrustAuthorityConfig.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/provider/TrustAuthorityConfig.java
@@ -24,6 +24,7 @@
  *
  * $Id: TrustAuthorityConfig.java,v 1.14 2009/02/28 00:59:42 mrudul_uchil Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.provider;
@@ -386,7 +387,8 @@ protected abstract void init(String name, String type, SSOToken ssoToken)
 
     /**
      * Deletes the trust authrority configuration.
-     * @exception ProviderException
+     * @exception ProviderException if the trust authority configuration is
+     *            unable to be deleted.
      */
     protected abstract void delete() throws ProviderException;
 
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/BinarySecurityToken.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/BinarySecurityToken.java
index c61350d0e9..1d045849cb 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/BinarySecurityToken.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/BinarySecurityToken.java
@@ -24,6 +24,7 @@
  *
  * $Id: BinarySecurityToken.java,v 1.9 2009/07/24 21:51:06 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.security;
@@ -188,7 +189,8 @@ public BinarySecurityToken(X509Certificate cert,
     /**
      * Constructor to create Kerberos Token
      * @param kbSpec The Kerberos Token Specification
-     * @throws com.sun.identity.wss.security.SecurityException
+     * @throws com.sun.identity.wss.security.SecurityException if the Kerberos
+     *         token cannot be created.
      */
     public BinarySecurityToken(KerberosTokenSpec kbSpec) 
                       throws SecurityException {
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/FAMSecurityToken.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/FAMSecurityToken.java
index 3202cc2983..df3c0449dc 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/FAMSecurityToken.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/FAMSecurityToken.java
@@ -24,6 +24,7 @@
  *
  * $Id: FAMSecurityToken.java,v 1.6 2009/12/23 22:32:28 mrudul_uchil Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.wss.security;
 
@@ -55,7 +56,8 @@ public class FAMSecurityToken implements SecurityToken {
      /**
       * Constructor for FAMSecurityToken
       * @param ssoToken Single Sign on token of the subject.
-      * @throws com.sun.identity.wss.security.SecurityException
+      * @throws com.sun.identity.wss.security.SecurityException if the single
+      *         sign-on token is invalid.
       */
      public FAMSecurityToken(SSOToken ssoToken) throws SecurityException {
          try {
@@ -72,7 +74,8 @@ public FAMSecurityToken(SSOToken ssoToken) throws SecurityException {
      /**
       * Constructor that uses DOM Element
       * @param element the DOM representation of security token.
-      * @throws com.sun.identity.wss.security.SecurityException
+      * @throws com.sun.identity.wss.security.SecurityException if the security
+      *         token cannot be parsed from the element.
       */
      public FAMSecurityToken(Element element) throws SecurityException {
         if(element == null) {
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/KerberosConfiguration.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/KerberosConfiguration.java
index 2b395a482b..b4b61f51b7 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/KerberosConfiguration.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/KerberosConfiguration.java
@@ -24,6 +24,7 @@
  *
  * $Id: KerberosConfiguration.java,v 1.2 2008/06/25 05:50:07 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.security;
@@ -34,7 +35,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 /**
- * This class KerberosConfiguration represents Kerberos 
+ * This class KerberosConfiguration represents Kerberos 
  * Configuration for web service clients and web service providers.
  */
 public class KerberosConfiguration extends Configuration  {
@@ -54,7 +55,7 @@ public class KerberosConfiguration extends Configuration  {
     /**
      * Constructor
      *
-     * @param config
+     * @param config the base configuration to delegate to.
      */
     public KerberosConfiguration (Configuration config) {
         this.config = config;
@@ -63,7 +64,7 @@ public KerberosConfiguration (Configuration config) {
     /**
      * Sets principal name.
      *
-     * @param principalName
+     * @param principalName the service principal name to set.
      */
     public void setPrincipalName(String principalName) {
         servicePrincipal = principalName;
@@ -72,7 +73,7 @@ public void setPrincipalName(String principalName) {
     /**
      * Sets key tab file.
      *
-     * @param keytabFile
+     * @param keytabFile the keytab file to use.
      */
     public void setKeyTab(String keytabFile) {
         keytab = keytabFile;
@@ -80,7 +81,7 @@ public void setKeyTab(String keytabFile) {
 
     /**
      * Sets a boolean value to refresh the configuration.
-     * @param refresh
+     * @param refresh whether the configuration should be refreshed.
      */
     public void setRefreshConfig(String refresh) {
         refreshConf = refresh;
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/SecurityMechanism.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/SecurityMechanism.java
index ff9ad0bf56..701536fc21 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/SecurityMechanism.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/SecurityMechanism.java
@@ -24,6 +24,7 @@
  *
  * $Id: SecurityMechanism.java,v 1.8 2008/08/31 15:50:03 mrudul_uchil Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.security;
@@ -717,7 +718,7 @@ public static List getLibertySecurityMechanismURIs() {
     /**
      * Returns all the list of SecurityMechanisms supported
      * by the Web Services Client.
-     * @return the list of SecurityMechanisms supported
+     * @return the list of SecurityMechanisms supported
      * by the Web Services Client.
      */
     public static List getAllWSCSecurityMechanisms() {
@@ -737,7 +738,7 @@ public static List getAllWSCSecurityMechanisms() {
     }
 
     /**
-     * Returns all the list of SecurityMechanisms supported
+     * Returns all the list of SecurityMechanisms supported
      *     by the Web Services Provider.
      * @return the list of SecurityMechanisms supported
      *     by the Web Services Provider.
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/UserNameToken.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/UserNameToken.java
index b107dd628f..7f48831a48 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/UserNameToken.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/UserNameToken.java
@@ -24,6 +24,7 @@
  *
  * $Id: UserNameToken.java,v 1.8 2009/01/24 01:31:25 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.security;
@@ -315,7 +316,7 @@ public String toString() {
     /**
      * Returns the XML document element for the username security token.
      * @return Element the XML Element for the username security token.
-     * @exception if the XML document conversion is failed.
+     * @exception SecurityException if the XML document conversion is failed.
      */
     public Element toDocumentElement() throws SecurityException {
         Document document = XMLUtils.toDOMDocument(toString(), debug);
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/WSSUtils.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/WSSUtils.java
index c0b7ae6c0c..1875df1b92 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/WSSUtils.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/WSSUtils.java
@@ -25,7 +25,7 @@
  * $Id: WSSUtils.java,v 1.23 2010/01/23 00:20:26 mrudul_uchil Exp $
  *
  *  Portions Copyrighted 2012-2014 ForgeRock AS
- *  Portions Copyrighted 2025 3A Systems LLC.
+ *  Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.wss.security;
@@ -779,7 +779,7 @@ public static WSSCacheRepository getWSSCacheRepository() {
     }
     
     /**
-     * Returns the SAML Attribute Map>. The attribute map
+     * Returns the SAML Attribute {@code Map>}. The attribute map
      * is generated from the given SSOToken first and if not found, then it
      * will try to find from the repository.
      * @param subjectName the principal to be used for retrieving the user
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandler.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandler.java
index 5153a3bd86..dc43ed6602 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandler.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandler.java
@@ -24,7 +24,7 @@
  *
  * $Id: SOAPRequestHandler.java,v 1.47 2010/01/15 18:54:34 mrudul_uchil Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.wss.security.handler;
@@ -183,7 +183,8 @@ public void init(Map config) throws SecurityException {
      *        to store Principals and credentials validated in the request.
      *
      * @param sharedState that may be used to store any shared state 
-     *        information between validateRequest and 
+     *        information between validateRequest and
+     *        secureResponse
      *
      * @param request the HttpServletRequest associated with 
      *        this SOAP Message request.
@@ -619,7 +620,7 @@ public SOAPMessage secureResponse (SOAPMessage soapMessage,
      *
      * @param soapMessage the SOAPMessage that needs to be secured.
      *
-     * @param subject  the Subject of the authenticating entity.
+     * @param subject  the Subject of the authenticating entity.
      *
      * @param sharedState Any shared state information that may be used between
      *        the secureRequest and validateResponse. 
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandlerInterface.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandlerInterface.java
index 751fd78620..e4e9ccc5c0 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandlerInterface.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SOAPRequestHandlerInterface.java
@@ -24,7 +24,7 @@
  *
  * $Id: SOAPRequestHandlerInterface.java,v 1.2 2008/06/25 05:50:11 qcheng Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.wss.security.handler;
@@ -66,7 +66,8 @@ public interface SOAPRequestHandlerInterface {
      *        to store Principals and credentials validated in the request.
      *
      * @param sharedState that may be used to store any shared state 
-     *        information between validateRequest and 
+     *        information between validateRequest and
+     *        secureResponse
      *
      * @param request the HttpServletRequest associated with 
      *        this SOAP Message request.
@@ -105,7 +106,7 @@ public SOAPMessage secureResponse (SOAPMessage soapMessage,
      *
      * @param soapMessage the SOAPMessage that needs to be secured.
      *
-     * @param subject  the Subject of the authenticating entity.
+     * @param subject  the Subject of the authenticating entity.
      *
      * @param sharedState Any shared state information that may be used between
      *        the secureRequest and validateResponse. 
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SecureSOAPMessage.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SecureSOAPMessage.java
index 812fe30a5f..e2c3216226 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SecureSOAPMessage.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/security/handler/SecureSOAPMessage.java
@@ -24,7 +24,7 @@
  *
  * $Id: SecureSOAPMessage.java,v 1.30 2010/01/23 00:20:27 mrudul_uchil Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.wss.security.handler;
@@ -979,8 +979,8 @@ private List getSigningIds() throws Exception {
      }
 
      /**
-      * Returns the messageID from the  header.
-      * @return the messageID from the  header.
+      * Returns the messageID from the {@code } header.
+      * @return the messageID from the {@code } header.
       */
      public String getMessageID() {
          return messageID;
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/sts/ClientUserToken.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/sts/ClientUserToken.java
index 3cd6d5b603..d217506867 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/sts/ClientUserToken.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/sts/ClientUserToken.java
@@ -24,6 +24,7 @@
  *
  * $Id: ClientUserToken.java,v 1.5 2008/08/27 19:05:53 mrudul_uchil Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.sts;
@@ -53,8 +54,9 @@ public interface ClientUserToken extends Token {
     
     /**
      * Initializes client user token.
-     * @param obj credential object to initialize the user token     
-     * @throws com.sun.identity.wss.sts.FAMSTSException
+     * @param obj credential object to initialize the user token
+     * @throws com.sun.identity.wss.sts.FAMSTSException if the user token
+     *         cannot be initialized.
      */
     public void init(Object obj) throws FAMSTSException;
     
@@ -62,15 +64,17 @@ public interface ClientUserToken extends Token {
      * Parses the custom token element. This method is used at the 
      * receiving end (STS server side).
      * @param element the custom token element
-     * @throws com.sun.identity.wss.sts.FAMSTSException
+     * @throws com.sun.identity.wss.sts.FAMSTSException if the token element
+     *         cannot be parsed.
      */
     public void parse(Element element) throws FAMSTSException;
 
     /**
      * Returns the principal name that the client user token carries.
      * @return the principal name that the client user token carries
-     * @throws com.sun.identity.wss.sts.FAMSTSException
-     */     
+     * @throws com.sun.identity.wss.sts.FAMSTSException if the principal name
+     *         cannot be retrieved.
+     */
     public String getPrincipalName() throws FAMSTSException;
 
     /**
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/BinarySecret.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/BinarySecret.java
index cefd7ab381..92a11e01ae 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/BinarySecret.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/BinarySecret.java
@@ -24,6 +24,7 @@
  *
  * $Id: BinarySecret.java,v 1.1 2009/08/29 03:05:59 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust;
@@ -59,14 +60,16 @@ public  void setSecret(byte[] secret) {
     /**
      * Returns the DOM Element representation for the binary secret.
      * @return the DOM Element representation for the binary secret.
-     * @throws com.sun.identity.wss.sts.protocol.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the DOM element
+     *         cannot be created.
      */
     public abstract Element toDOMElement()  throws WSTException;
     
     /**
      * Converts into XML String
      * @return the XML String for BinarySecret.
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the XML string
+     *         cannot be created.
      */
     public abstract String toXMLString() throws WSTException;
     
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/ClaimType.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/ClaimType.java
index cc016131d9..86c85571e1 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/ClaimType.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/ClaimType.java
@@ -24,6 +24,7 @@
  *
  * $Id: ClaimType.java,v 1.1 2009/10/13 23:19:49 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust;
@@ -55,7 +56,8 @@ public ClaimType(String nameSpaceURI) {
     /**
      * Constructor
      * @param element the claimtype element
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the claim type element
+     *         cannot be parsed.
      */
     public ClaimType(Element element) throws WSTException {
         if(element == null) {
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityToken.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityToken.java
index 58d9fb35be..d778324b96 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityToken.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityToken.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequestSecurityToken.java,v 1.2 2009/10/13 23:19:49 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust;
@@ -158,14 +159,16 @@ public void setClaimTypes(List claimTypes) {
     /**
      * Returns the DOM Element representation for the request security token.
      * @return the DOM Element representation for the request security token.
-     * @throws com.sun.identity.wss.sts.protocol.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the DOM element
+     *         cannot be created.
      */
     public abstract Element toDOMElement()  throws WSTException;
     
     /**
      * Converts into XML String
      * @return the XML String for RequestSecurityToken.
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the XML string
+     *         cannot be created.
      */
     public abstract String toXMLString() throws WSTException;
         
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponse.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponse.java
index 80aa583ef4..9f3f4ff9cc 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponse.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponse.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequestSecurityTokenResponse.java,v 1.2 2009/08/29 03:05:59 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust;
@@ -147,7 +148,8 @@ public void setRequestedProofToken(RequestedProofToken requestedProofToken){
     /**
      * Converts into XML String
      * @return the XML String for RequestSecurityTokenResponse.
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the XML string
+     *         cannot be created.
      */
     public abstract String toXMLString() throws WSTException;
         
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponseCollection.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponseCollection.java
index 43cb5bd991..e98f99d02a 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponseCollection.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestSecurityTokenResponseCollection.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequestSecurityTokenResponseCollection.java,v 1.1 2008/09/19 16:00:56 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust;
@@ -52,9 +53,9 @@ public List getRequestSecurityTokenResponses() {
     }
     
     /**
-     * Sets the list of RequestSecurityTokenResponses.
+     * Sets the list of RequestSecurityTokenResponses.
      * @param rstrResponses the list of
-     *            RequestSecurityTokenResponses.
+     *            RequestSecurityTokenResponses.
      */
     public void setRequestSecurityTokenResponses(List rstrResponses) {
         this.rstResponses = rstrResponses;
@@ -64,7 +65,8 @@ public void setRequestSecurityTokenResponses(List rstrResponses) {
      * Converts into DOM Element.
      * @return the DOM Element for the
      *          RequestSecurityTokenResponseCollection
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the DOM element
+     *         cannot be created.
      */
     public abstract Element toDOMElement() throws WSTException;
     
@@ -72,7 +74,8 @@ public void setRequestSecurityTokenResponses(List rstrResponses) {
      * Converts into XML String.
      * @return the XML String for the
      *                     RequestSecurityTokenResponseCollection
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the XML string
+     *         cannot be created.
      */
     public abstract String toXMLString() throws WSTException;
 
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestedProofToken.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestedProofToken.java
index 3bd078deb2..f141cf770a 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestedProofToken.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/RequestedProofToken.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequestedProofToken.java,v 1.1 2009/08/29 03:06:00 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust;
@@ -71,14 +72,16 @@ public void setProofToken(Object proofToken) {
     /**
      * Returns the DOM Element representation for the requested proof token.
      * @return the DOM Element representation for the requested proof token.
-     * @throws com.sun.identity.wss.sts.protocol.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the DOM element
+     *         cannot be created.
      */
     public abstract Element toDOMElement()  throws WSTException;
     
     /**
      * Converts into XML String
      * @return the XML String for RequestedProofToken.
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the XML string
+     *         cannot be created.
      */
     public abstract String toXMLString() throws WSTException;
         
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/WSTrustFactory.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/WSTrustFactory.java
index d09c73a1a4..8ca359842d 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/WSTrustFactory.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/WSTrustFactory.java
@@ -24,6 +24,7 @@
  *
  * $Id: WSTrustFactory.java,v 1.1 2008/09/19 16:00:56 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust;
@@ -90,7 +91,8 @@ public RequestSecurityToken createRequestSecurityToken() {
      *        given DOM Element.
      * @param element the DOM Element for RequestSecurityToken
      * @return the instance of RequestSecurityToken
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the request security
+     *         token cannot be created from the element.
      */
     public RequestSecurityToken createRequestSecurityToken(Element element) 
                     throws WSTException {
@@ -123,7 +125,8 @@ public RequestSecurityTokenResponse createRequestSecurityTokenResponse() {
      * @param element the DOM element representation of
      *          RequestSecurityTokenResponse
      * @return an instance of RequestSecurityTokenResponse
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the request security
+     *         token response cannot be created from the element.
      */
     public RequestSecurityTokenResponse createRequestSecurityTokenResponse
             (Element element) throws WSTException {
@@ -156,8 +159,9 @@ public RequestSecurityTokenResponse createRequestSecurityTokenResponse() {
      * for a given DOM Element.
      * @param element the DOM Element representation of
      *        RequestSecurityTokenResponseCollection
-     * @return the RequestSecurityTokenResponseCollection
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @return the RequestSecurityTokenResponseCollection
+     * @throws com.sun.identity.wss.trust.WSTException if the request security
+     *         token response collection cannot be created from the element.
      */
     public RequestSecurityTokenResponseCollection 
             createRequestSecurityTokenResponseCollection(Element element)
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst10/BinarySecret_Impl.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst10/BinarySecret_Impl.java
index fed77bbb4a..b0935e4535 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst10/BinarySecret_Impl.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst10/BinarySecret_Impl.java
@@ -24,6 +24,7 @@
  *
  * $Id: BinarySecret_Impl.java,v 1.1 2009/08/29 03:06:00 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust.wst10;
@@ -71,7 +72,8 @@ public BinarySecret_Impl(Element element) throws WSTException {
     /**
      * Returns the DOM Element representation for the binary secret.
      * @return the DOM Element representation for the binary secret.
-     * @throws com.sun.identity.wss.sts.protocol.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the DOM element
+     *         cannot be created.
      */
     public Element toDOMElement()  throws WSTException {
         if(secretE != null) {
@@ -84,7 +86,8 @@ public Element toDOMElement()  throws WSTException {
     /**
      * Converts into XML String
      * @return the XML String for BinarySecret.
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the XML string
+     *         cannot be created.
      */
     public String toXMLString() throws WSTException {
         
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst13/BinarySecret_Impl.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst13/BinarySecret_Impl.java
index 21e9107f38..1864c86600 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst13/BinarySecret_Impl.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/trust/wst13/BinarySecret_Impl.java
@@ -24,6 +24,7 @@
  *
  * $Id: BinarySecret_Impl.java,v 1.1 2009/08/29 03:06:01 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.trust.wst13;
@@ -71,7 +72,8 @@ public BinarySecret_Impl(Element element) throws WSTException {
     /**
      * Returns the DOM Element representation for the binary secret.
      * @return the DOM Element representation for the binary secret.
-     * @throws com.sun.identity.wss.sts.protocol.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the DOM element
+     *         cannot be created.
      */
     public Element toDOMElement()  throws WSTException {
         if(secretE != null) {
@@ -84,7 +86,8 @@ public Element toDOMElement()  throws WSTException {
     /**
      * Converts into XML String
      * @return the XML String for BinarySecret.
-     * @throws com.sun.identity.wss.trust.WSTException
+     * @throws com.sun.identity.wss.trust.WSTException if the XML string
+     *         cannot be created.
      */
     public String toXMLString() throws WSTException {
         
diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/xmlsig/WSSSignatureProvider.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/xmlsig/WSSSignatureProvider.java
index 9565c8c09d..8ba680f608 100644
--- a/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/xmlsig/WSSSignatureProvider.java
+++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/wss/xmlsig/WSSSignatureProvider.java
@@ -25,6 +25,7 @@
  * $Id: WSSSignatureProvider.java,v 1.13 2009/11/16 21:53:00 mallas Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wss.xmlsig;
@@ -807,12 +808,13 @@ private PublicKey getPublicKeyFromWSSToken(Document doc) {
     
     /**
      * Sign with Kerberos Token
-     * @param doc
-     * @param key
-     * @param algorithm
-     * @param ids
+     * @param doc the document to be signed.
+     * @param key the key to sign with.
+     * @param algorithm the signature algorithm to use.
+     * @param ids the list of element ids to be signed.
      * @return Kerberos Security Token signature
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the message
+     *         cannot be signed.
      */
     public org.w3c.dom.Element signWithKerberosToken(
             org.w3c.dom.Document doc,
@@ -936,7 +938,8 @@ public org.w3c.dom.Element signWithKerberosToken(
      * @param document the document to be validated
      * @param key the secret key to be used for validating signature
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the
+     *         signature cannot be verified.
      */
     public boolean verifyWSSSignature(org.w3c.dom.Document document,
                          java.security.Key key)
@@ -953,7 +956,8 @@ public boolean verifyWSSSignature(org.w3c.dom.Document document,
      * @param encryptAlias the certificate alias that may be used to decrypt
      *        the symmetric key that is part of KeyInfo
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the
+     *         signature cannot be verified.
      */
     public boolean verifyWSSSignature(Document doc, java.security.Key key,
           String certAlias, String encryptAlias) throws XMLSignatureException {
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..4a78a82b4e 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,6 +25,7 @@
  * $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;
 
@@ -977,7 +978,7 @@ public boolean isInCircleOfTrust(String realm, String name,
      * @param realm the realm the circle of trust is in.
      * @param name the circle of trust name.
      * @return true if circle of trust name is valid.
-     * @throws COTException if the circle of trust name is invalid.
+     * @throws COTException if the circle of trust name is invalid.
      */
     boolean isValidCOTName(String realm,String name) throws COTException {
         String classMethod = "COTManager.isValidCOTName: ";
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..aadd23b01e 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
@@ -24,6 +24,7 @@
  *
  * $Id: FSAccountManager.java,v 1.5 2008/06/25 05:46:39 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.accountmgmt;
@@ -47,7 +48,7 @@
 import java.util.logging.Level;
 
 /**
- * This class is used for storing & retrieving user account's federation
+ * This class is used for storing & retrieving user account's federation
  * specific information.
  */
 public class FSAccountManager {
@@ -313,9 +314,9 @@ public void removeAccountFedInfo(String userID, FSAccountFedInfo fedInfo)
      * @param userID user id
      * @param fedInfo  Account federation info as FSAccountFedInfo object.
      * @param fedInfoKey Account Fed Info Key which contains NameSpace
-     * & opaque handle sent/received.
+     * & opaque handle sent/received.
      * @param oldFedInfoKey Account Fed Info Key which contains NameSpace
-     * & opaque handle sent/received, which will be removed.
+     * & opaque handle sent/received, which will be removed.
      * @throws FSAccountMgmtException if illegal argument passed.
      */
     public void writeAccountFedInfo(
@@ -332,7 +333,7 @@ public void writeAccountFedInfo(
      * Removes Account's federation Info Key in data store.
      * @param userID user id
      * @param fedInfoKey Account Fed Info Key which contains NameSpace
-     * & opaque handle sent/received, which will be removed.
+     * & opaque handle sent/received, which will be removed.
      * @throws FSAccountMgmtException if illegal argument passed.
      */
     public void removeAccountFedInfoKey(
@@ -391,10 +392,10 @@ public void removeAccountFedInfoKey(
      * in fedInfo object.
      * @param userID user id
      * @param fedInfoKey Account Fed Info Key which contains NameSpace
-     * & opaque handle sent/received.
+     * & opaque handle sent/received.
      * @param providerID Remote ProviderID value.
      * @throws FSAccountMgmtException - If Account fed info is not found for 
-     * given user & given ProviderID.
+     * given user & given ProviderID.
      */
     public void removeAccountFedInfo(
         String userID, 
@@ -678,7 +679,7 @@ public Set readAllFederatedProviderID(String providerID, String userID)
      * @return true/false if Account's federation Status is Active / Inactive
      *  for given providerID.
      * @throws FSAccountMgmtException - If Account fed info is not found for 
-     *  given user & given ProviderID.
+     *  given user & given ProviderID.
      */
     public boolean isFederationActive(
         String userID, 
@@ -791,10 +792,10 @@ public boolean hasAnyActiveFederation(
     }
     
     /**
-     * Searches user with given combination of ProviderID & Opaque handle
+     * Searches user with given combination of ProviderID & Opaque handle
      * in Default Organization.
      * @param fedInfoKey Account Fed Info Key which contains NameSpace
-     * & opaque handle sent/received.
+     * & opaque handle sent/received.
      * @param env - Extra parameters that can be used for user mapping.
      * @throws FSAccountMgmtException - If Unable to get Organization
      * @return User DN if user found with given combination else returns null.
@@ -809,10 +810,10 @@ public String getUserID(
     }
 
     /**
-     * Searches user with given combination of ProviderID & Opaque handle
+     * Searches user with given combination of ProviderID & Opaque handle
      * in given Organization.
      * @param fedInfoKey Account Fed Info Key which contains NameSpace
-     * & opaque handle sent/received.
+     * & opaque handle sent/received.
      * @param orgDN organization DN.
      * @param env Extra parameters that can be used for user mapping.
      * @throws FSAccountMgmtException - If Unable to get Organization.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/package-info.java
index 1739ccf933..6078659d96 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/accountmgmt/package-info.java
@@ -24,12 +24,13 @@
  *
  * $Id: package-info.java,v 1.4 2008/06/25 05:46:40 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Defines Federation Account Management API.
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.federation.accountmgmt;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSException.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSException.java
index 81129ca8ea..e08ea48a37 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSException.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSException.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSException.java,v 1.3 2008/06/25 05:46:40 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.common;
@@ -34,7 +35,7 @@
 
 /**
  * This class is the super-class for all Federation checked exceptions.
- * 
                    
+ * 
                      * Some Exception throwing guidelines:
  * -------------------------------------
  *
@@ -136,22 +137,22 @@
  *       }
  *
  * 3. Throwing an Exception using the ResourceSetManager
- * 
- * 
+ * <TBD : write some eg & format for properties file>
+ *
  * - Logging/Dealing with an Exception, inclunding all nested exceptions
  *       try {
  *               .......
  *               .......
  *       } catch (FSException fse) {
  *           if (fse.getRootCause() instanceof UMSException) {
- *               PrintWriter pw = new PrintWriter();
+ *               PrintWriter pw = new PrintWriter(<some file stream>);
  *               fse.log(pw);
  *           } else {
  *               System.out.println(fse.getMessage());
  *           }
  *       }
  *
- * 
                    
+ * 
                    
  *
  * @see #FSException(String, Object[], Throwable)
  * @see #getRootCause()
@@ -303,9 +304,9 @@ public String toString() {
     }
     
     /**
-     * Prints this exception's stack trace to System.err.
+     * Prints this exception's stack trace to System.err.
      * If this exception has a root exception; the stack trace of the
-     * root exception is printed to System.err instead.
+     * root exception is printed to System.err instead.
      */
     public void printStackTrace() {
         printStackTrace( System.err );
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSRedirectException.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSRedirectException.java
index 085d335cc5..61b4c77f52 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSRedirectException.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSRedirectException.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSRedirectException.java,v 1.2 2008/06/25 05:46:40 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /*
@@ -141,7 +142,7 @@
  *       }
  *
  * 3. Throwing an Exception using the ResourceSetManager
- * 
+ * <TBD : write some eg & format for properties file>
  * 
  * - Logging/Dealing with an Exception, inclunding all nested exceptions
  *       try {
@@ -150,7 +151,7 @@
  *       } catch (FSRedirectException fse) {
  *
  *               if (fse.getRootCause() instanceof UMSException) {
- *                       PrintWriter pw = new PrintWriter();
+ *                       PrintWriter pw = new PrintWriter(<some file stream>);
  *                       fse.log(pw);
  *               } else {
  *                      System.out.println(fse.getMessage());
@@ -305,9 +306,9 @@ public String toString() {
     }
     
     /**
-     * Prints this exception's stack trace to System.err.
+     * Prints this exception's stack trace to System.err.
      * If this exception has a root exception; the stack trace of the
-     * root exception is printed to System.err instead.
+     * root exception is printed to System.err instead.
      * 
      */
     public void printStackTrace() {
@@ -362,7 +363,7 @@ public void printStackTrace(java.io.PrintWriter pw) {
      *   java.lang.Throwable
      *   java.lang.Exception
      *   FSRedirectException
-     *   
+     *   <name of exception being thrown>
      * 
                  
      */
     static private String getStackTrace(Throwable xcpt) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSUtils.java
index 3ea00046a5..8502f5d2a7 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSUtils.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/FSUtils.java
@@ -25,7 +25,7 @@
  * $Id: FSUtils.java,v 1.10 2009/11/20 23:52:57 ww203982 Exp $
  *
  * Portions Copyrighted 2013-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.common;
@@ -240,7 +240,7 @@ public static void checkHTTPRequestLength(HttpServletRequest request)
      *  in  the same web container as current opensso web
      * apps serving the request.
      * @param request HttpServletRequest
-     * @param url
+     * @param url the URL to test against the current web container
      * @return true if request and url are in the same web container else false
      */
     public static boolean isSameContainer(
@@ -743,7 +743,7 @@ public static void postToTarget(HttpServletRequest request, HttpServletResponse
      *
      * @param exception
      *         Thrown and caught exception
-     * @throws SAML2Exception
+     * @throws SAML2Exception if a SAML2 error occurs
      *         Single general exception that is thrown on
      */
     private static void handleForwardException(Exception exception) throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/package-info.java
index bc7a94524a..a8381aa73c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/common/package-info.java
@@ -24,12 +24,13 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:46:41 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Defines Federation Common Utils.
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.federation.common;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertion.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertion.java
index 5bdcc24480..e45e949e6a 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertion.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertion.java
@@ -25,6 +25,7 @@
  * $Id: FSAssertion.java,v 1.2 2008/06/25 05:46:43 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -86,7 +87,7 @@ public class FSAssertion extends Assertion {
     protected String id;
     
     /**
-     * The value of the MinorVersion attribute in
+     * The value of the MinorVersion attribute in
      * the Assertion.
      */
     protected int minorVersion = IFSConstants.FF_11_ASSERTION_MINOR_VERSION;
@@ -378,7 +379,7 @@ public String getID(){
     }
     
     /**
-     * Sets  value of id attribute.
+     * Sets  value of id attribute.
      *
      * @param id value of id attribute.
      * @see #getID
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertionArtifact.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertionArtifact.java
index 0672296531..af3f89cf4d 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertionArtifact.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAssertionArtifact.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAssertionArtifact.java,v 1.3 2008/06/25 05:46:43 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message;
@@ -79,7 +80,7 @@ protected FSAssertionArtifact() {
      * Constructor to create AssertionArtifact object.
      *
      * @param theArtifact is the string that is generated by a provider.
-     * @throws SAMLException if there is an error decoding
+     * @throws FSMsgException if there is an error decoding
      *         the artifact string , the length of the artifact string
      *         is incorrect , the TYPE CODE in the artifact
      *         or other errors which prevent creation of
@@ -135,7 +136,7 @@ public FSAssertionArtifact(String theArtifact) throws FSMsgException {
      *
      * @param idBytes the source identifier in the Assertion
      * @param handleBytes the assertion identifier
-     * @throws SAMLException if wrong input or couldn't encode the artifact.
+     * @throws FSMsgException if wrong input or couldn't encode the artifact.
      */
     public FSAssertionArtifact(byte[] idBytes, byte[] handleBytes)
     throws FSMsgException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthenticationStatement.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthenticationStatement.java
index 451549dcb8..4c97d5b233 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthenticationStatement.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthenticationStatement.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAuthenticationStatement.java,v 1.2 2008/06/25 05:46:43 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message;
@@ -295,7 +296,7 @@ public FSAuthenticationStatement(Element element)
     /**
      * Returns the value of SessionIndex attribute.
      *
-     * @return the value of SessionIndex attribute.
+     * @return the value of SessionIndex attribute.
      * @see #setSessionIndex(String)
      */
     public String getSessionIndex(){
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequest.java
index 5cfc7d8ab5..1511935b06 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequest.java
@@ -25,7 +25,7 @@
  * $Id: FSAuthnRequest.java,v 1.4 2008/07/08 06:03:37 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.federation.message;
@@ -109,7 +109,7 @@ public FSAuthnRequest() {
      * @param authnCxt Authentication Context used for the SSO.
      * @param relaySt Relay State i.e. original URL to be redirected after SSO.
      * @param authContextCompType AuthContext comparison type.
-     * @throws FSMsgException on error.
+     * @throws FSMsgException on error.
      */
     public FSAuthnRequest(String requestId,
             List respondWiths,
@@ -164,7 +164,7 @@ public FSAuthnRequest(String requestId,
      * Constructor to create FSAuthnRequest object.
      *
      * @param root the Document Element object.
-     * @throws FSMsgException on error.
+     * @throws FSMsgException on error.
      */
     public FSAuthnRequest(Element root) throws FSMsgException {
         String tag = null;
@@ -791,9 +791,9 @@ public void setNameIDPolicy(String nameIDPolicy) {
     }
     
     /**
-     * Returns the value of ProtocolProfile attribute.
+     * Returns the value of ProtocolProfile attribute.
      *
-     * @return the value of ProtocolProfile attribute.
+     * @return the value of ProtocolProfile attribute.
      * @see #setProtocolProfile(String)
      */
     public String getProtocolProfile() {
@@ -801,9 +801,9 @@ public String getProtocolProfile() {
     }
     
     /**
-     * Sets the value of ProtocolProfile attribute.
+     * Sets the value of ProtocolProfile attribute.
      *
-     * @param protocolProf the value of ProtocolProfile attribute.
+     * @param protocolProf the value of ProtocolProfile attribute.
      * @see #getProtocolProfile()
      */
     public void setProtocolProfile(String protocolProf) {
@@ -854,7 +854,7 @@ public void setAuthnContext(RequestAuthnContext authnCxt) {
      * Returns the value of ProviderID attribute.
      *
      * @return the value of ProviderID attribute.
-     * @see #setProviderId(String).
+     * @see #setProviderId(String)
      */
     public String getProviderId() {
         return providerId;
@@ -1533,7 +1533,7 @@ public static FSAuthnRequest parseBASE64EncodedString(String encodedReq)
      * Signs the Request.
      *
      * @param certAlias the Certificate Alias.
-     * @throws XMLSignatureException if FSAuthnRequest
+     * @throws SAMLException if FSAuthnRequest
      *         cannot be signed.
      */
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequestEnvelope.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequestEnvelope.java
index 99053fd64e..c282d139ba 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequestEnvelope.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnRequestEnvelope.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAuthnRequestEnvelope.java,v 1.2 2008/06/25 05:46:43 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message;
@@ -180,7 +181,7 @@ public void setMinorVersion(int minorVersion) {
      * based on the Liberty Request schema.
      *
      * @return XML String representing the request.
-     * @throws FSMsgException if there is an error.
+     * @throws FSMsgException if there is an error.
      */
     
     public String toXMLString() throws FSMsgException {
@@ -212,7 +213,7 @@ public String toXMLString(boolean includeNS,boolean declareNS)
      * @param includeHeader Determines whether the output include the xml
      *        declaration header.
      * @return A string containing the valid XML for this element.
-     * @throws FSMsgException if there is an error.
+     * @throws FSMsgException if there is an error.
      */
     public String toXMLString(boolean includeNS,
             boolean declareNS,
@@ -433,7 +434,7 @@ public void setOtherElements(List otherElements) {
      * request String.
      *
      * @param encodedReq the encoded string.
-     * @throws FSMsgException if there is an error
+     * @throws FSMsgException if there is an error
      *         creating FSAuthnRequestEnvelope object.
      */
     
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponse.java
index df14f917ed..3b1cb57025 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponse.java
@@ -25,6 +25,7 @@
  * $Id: FSAuthnResponse.java,v 1.2 2008/06/25 05:46:43 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -100,7 +101,7 @@ public FSAuthnResponse(String responseID,String inResponseTo,
     * Creates FSAuthnResponse object from XML Schema.
     *
     * @param xml the XML Schema for this object.
-    * @throws SAMLException on error.
+    * @throws SAMLException on error.
     * @throws FSMsgException on error.
     */
     public static FSAuthnResponse parseAuthnResponseXML(
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponseEnvelope.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponseEnvelope.java
index 9daf1f63c3..ca3339e16b 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponseEnvelope.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSAuthnResponseEnvelope.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAuthnResponseEnvelope.java,v 1.2 2008/06/25 05:46:43 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message;
@@ -138,7 +139,7 @@ public int getMinorVersion() {
    }
 
   /**
-   * Sets the value of MinorVersion attribute.
+   * Sets the value of MinorVersion attribute.
    *
    * @param minorVersion the MinorVersion attribute.
    */
@@ -238,7 +239,7 @@ public String toXMLString() throws FSMsgException {
     }
     
    /**
-    * Creates a String representation of the Response object.
+    * Creates a String representation of the Response object.
     * @param includeNS : Determines whether or not the namespace qualifier
     *        is prepended to the Element when converted
     * @param declareNS : Determines whether or not the namespace is declared
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSFederationTerminationNotification.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSFederationTerminationNotification.java
index 4f0ae4acbc..30ae24d413 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSFederationTerminationNotification.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSFederationTerminationNotification.java
@@ -25,7 +25,7 @@
  * $Id: FSFederationTerminationNotification.java,v 1.3 2008/06/25 05:46:44 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.message;
@@ -94,7 +94,7 @@ public FSFederationTerminationNotification() {
     }
     
     /**
-     * Creates FSFederationTerminationNotification from
+     * Creates FSFederationTerminationNotification from
      * a Document Element.
      *
      * @param root the Document Element.
@@ -544,7 +544,7 @@ public void setMinorVersion(int version) {
      * Returns the value of ProviderID attribute.
      *
      * @return the value of ProviderID attribute.
-     * @see #setProviderId(String).
+     * @see #setProviderId(String)
      */
     public String getProviderId() {
         return providerId;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSLogoutResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSLogoutResponse.java
index bc46aa28f5..10006e5d15 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSLogoutResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSLogoutResponse.java
@@ -25,7 +25,7 @@
  * $Id: FSLogoutResponse.java,v 1.4 2008/06/25 05:46:44 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.message;
@@ -107,7 +107,7 @@ public FSLogoutResponse() {
      * @param status the  Logout Status  object.
      * @param providerId the value of ProviderID attribute.
      * @param relayState the value of RelayState attribute.
-     * @throws FSMsgException if this object cannot be created.
+     * @throws FSMsgException if this object cannot be created.
      */
     public FSLogoutResponse(String responseID,
             String inResponseTo,
@@ -338,7 +338,7 @@ public void setID(String id){
      * Returns the value of ProviderID attribute.
      *
      * @return the value of ProviderID attribute.
-     * @see #setProviderId(String).
+     * @see #setProviderId(String)
      */
     
     public String getProviderId(){
@@ -398,7 +398,7 @@ public Status getStatus() {
     /**
      * Sets the Logout Status.
      *
-     * @param status the Logout StatusStatus.
      * @see #getStatus
      */
     public void setStatus(String status) {
@@ -416,7 +416,7 @@ public void setStatus(String status) {
     /**
      * Sets the Logout Status.
      *
-     * @param status the Logout StatusStatus object.
      * @see #getStatus
      */
     public void setStatus(Status status) {
@@ -752,7 +752,7 @@ public void signXML() {
      * Signs the LogoutResponse.
      *
      * @param certAlias the Certificate Alias.
-     * @throws XMLSignatureException if this object cannot be signed.
+     * @throws SAMLException if this object cannot be signed.
      */
     public void signXML(String certAlias) throws SAMLException {
         FSUtils.debug.message("FSLogoutResponse.signXML: Called");
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameIdentifierMappingRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameIdentifierMappingRequest.java
index a5df988c1b..f6ce8535c8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameIdentifierMappingRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameIdentifierMappingRequest.java
@@ -25,6 +25,7 @@
  * $Id: FSNameIdentifierMappingRequest.java,v 1.2 2008/06/25 05:46:44 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message;
@@ -61,7 +62,7 @@
 
 /**
  * The class FSNameIdentifierMappingRequest is used to
- * create or parse NameIdentifierMappingRequest.
+ * create or parse NameIdentifierMappingRequest.
  *
  * 
  * @deprecated since 12.0.0
@@ -76,7 +77,7 @@ public class FSNameIdentifierMappingRequest extends AbstractRequest {
     private String signatureString;
     
     /**
-     * Constructor to create  FSNameIdentifierMappingRequest.
+     * Constructor to create  FSNameIdentifierMappingRequest.
      *
      * @param providerID the requesting provider's ID
      * @param nameIdentifier the NameIdentifier qualified by the
@@ -97,7 +98,7 @@ public FSNameIdentifierMappingRequest(String providerID,
     }
     
     /**
-     * Constructor to create  FSNameIdentifierMappingRequest from
+     * Constructor to create  FSNameIdentifierMappingRequest from
      * the Document Element.
      *
      * @param root the NameIdentifierMappingRequest Document
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationRequest.java
index 7aea15a2ee..f9cbb10845 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationRequest.java
@@ -25,7 +25,7 @@
  * $Id: FSNameRegistrationRequest.java,v 1.4 2008/06/25 05:46:44 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.message;
@@ -202,7 +202,7 @@ public FSNameRegistrationRequest(
     }
     
     /**
-     * Constructor creates FSNameRegistrationRequest> object
+     * Constructor creates FSNameRegistrationRequest object
      * from a Document Element.
      *
      * @param root the Document Element.
@@ -504,7 +504,7 @@ public OldProvidedNameIdentifier getOldProvidedNameIdentifier() {
      * Returns the value of ProviderID attribute.
      *
      * @return the value of ProviderID attribute.
-     * @see #setProviderId(String).
+     * @see #setProviderId(String)
      */
     public String getProviderId() {
         return this.providerId;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationResponse.java
index 1e0f37bdd2..7325723f25 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSNameRegistrationResponse.java
@@ -25,7 +25,7 @@
  * $Id: FSNameRegistrationResponse.java,v 1.3 2008/06/25 05:46:45 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.message;
@@ -132,7 +132,7 @@ public void setID(String id){
      * Returns the value of ProviderID attribute.
      *
      * @return the value of ProviderID attribute.
-     * @see #setProviderId(String).
+     * @see #setProviderId(String)
      */
     public String getProviderId(){
         return providerId;
@@ -364,7 +364,7 @@ public Status getStatus() {
     /**
      * Sets the Response Status.
      *
-     * @param status the Response StatusStatus object.
      * @see #getStatus
      */
     public void setStatus(Status status) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSRequest.java
index 7e32552543..175c087ea9 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSRequest.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSRequest.java,v 1.3 2008/06/25 05:46:45 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
@@ -116,7 +117,7 @@ protected FSRequest() {
      *        value is null then one will be generated.
      * @param query AuthenticationQuery to be included in
      *        the Request.
-     * @throws SAMLException on error.
+     * @throws SAMLException on error.
      */
     public FSRequest(String requestId, Query query) throws SAMLException {
         super(requestId, query);
@@ -140,7 +141,7 @@ public FSRequest(String requestId, Query query) throws SAMLException {
      *            AttributeQuery, 1 or more
      *            AssertionIDReference, or 1 or more of
      *            AssertionArtifact.
-     * @throws SAMLException throws errors on exception.
+     * @throws SAMLException throws errors on exception.
      */
     public FSRequest(String requestId, List contents) throws SAMLException {
         super(requestId, contents);
@@ -175,7 +176,7 @@ public void setMinorVersion(int version) {
      *
      * @param xml the XML Document string.
      * @return the Request object.
-     * @throws SAMLException on error.
+     * @throws SAMLException on error.
      */
     public static Request parseXML(String xml) throws SAMLException {
         // parse the xml string
@@ -189,7 +190,7 @@ public static Request parseXML(String xml) throws SAMLException {
      * a XML Document Element.
      *
      * @param root the XML Document Element.
-     * @throws SAMLException on error.
+     * @throws SAMLException on error.
      */
     public FSRequest(Element root) throws SAMLException {
         // Make sure this is a Request
@@ -391,7 +392,7 @@ public FSRequest(Element root) throws SAMLException {
     /* Returns the value of RespondWith attribute.
      *
      * @return value of the RespondWith attribute.
-     * @throws SAMLException on error.
+     * @throws SAMLException on error.
      */
     private String checkAndGetRespondWith(String respondWith)
     throws SAMLException {
@@ -427,7 +428,7 @@ private String checkAndGetRespondWith(String respondWith)
      *
      * @param majorVer a String representing the MajorVersion to
      *        be set.
-     * @throws FSMsgException on error.
+     * @throws FSMsgException on error.
      */
     
     private void parseMajorVersion(String majorVer) throws SAMLException {
@@ -466,7 +467,7 @@ private void parseMajorVersion(String majorVer) throws SAMLException {
      *
      * @param minorVer a String representing the MinorVersion to
      *        be set.
-     * @throws SAMLException when the version mismatchs.
+     * @throws SAMLException when the version mismatchs.
      */
     private void parseMinorVersion(String minorVer) throws SAMLException {
         try {
@@ -501,7 +502,7 @@ private void parseMinorVersion(String minorVer) throws SAMLException {
      * AttributeQeury, or AuthorizationDecisionQuery.
      *
      * @param child a DOM Node.
-     * @throws SAMLException if the Query is invalid.
+     * @throws SAMLException if the Query is invalid.
      */
     private void parseQuery(Node child) throws SAMLException {
         NamedNodeMap nm = child.getAttributes();
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSResponse.java
index fa7a19fc65..6650f037d6 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSResponse.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSResponse.java,v 1.2 2008/06/25 05:46:45 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message;
@@ -514,7 +515,7 @@ public String toBASE64EncodedString() throws FSMsgException {
      * Signs the Response.
      *
      * @param certAlias the Certificate Alias.
-     * @throws XMLSignatureException if FSAuthnRequest
+     * @throws SAMLException if FSAuthnRequest
      *         cannot be signed.
      */
     public void signXML(String certAlias) throws SAMLException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSScoping.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSScoping.java
index c977f5be2a..5752fd7b89 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSScoping.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/FSScoping.java
@@ -24,7 +24,7 @@
  *
  * $Id: FSScoping.java,v 1.2 2008/06/25 05:46:45 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.message;
@@ -244,7 +244,6 @@ public String toURLEncodedQueryString() throws FSMsgException {
      * object.
      *
      * @param request the HttpServletRequest object.
-     * @throws FSMsgException if there is an error creating this object.
      */
     public static FSScoping parseURLEncodedRequest(HttpServletRequest request) {
         
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptableNameIdentifier.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptableNameIdentifier.java
index 9ad52eee42..56ae6961cc 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptableNameIdentifier.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/EncryptableNameIdentifier.java
@@ -25,6 +25,7 @@
  * $Id: EncryptableNameIdentifier.java,v 1.4 2008/06/25 05:46:46 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message.common;
@@ -90,11 +91,11 @@ public EncryptableNameIdentifier(NameIdentifier ni) throws FSException {
     /**
      * Consturctor creates EncryptableNameIdentifier object.
      *
-     * @param name 
-     * @param nameQualifier
-     * @param format
+     * @param name the name identifier value.
+     * @param nameQualifier the security or administrative domain that qualifies the name.
+     * @param format the format of the name identifier.
      * @param issueInstant the Issue Instant
-     * @param nonce
+     * @param nonce the nonce value used for encryption.
      * @throws FSException if there is an error.
      */
     public EncryptableNameIdentifier(String name,String nameQualifier,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/Extension.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/Extension.java
index a444f379c9..2fd8e1a515 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/Extension.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/Extension.java
@@ -24,7 +24,7 @@
  *
  * $Id: Extension.java,v 1.2 2008/06/25 05:46:46 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.message.common;
@@ -284,7 +284,7 @@ public String toXMLString(boolean includeNS, boolean declareNS)
      * @param prefix the string that is prepended to the key of query
      *     string.
      * @param minorVersion the MinorVersion.
-     * @return  object.
+     * @return Extension object.
      * @throws FSMsgException if there is an error creating
      *     Extension object.
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPEntry.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPEntry.java
index 2fc47e7ddd..a3291bda14 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPEntry.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPEntry.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPEntry.java,v 1.2 2008/06/25 05:46:47 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -66,7 +67,7 @@ public IDPEntry() {
      *
      * @param providerID the Identity Provider identifier.
      * @param providerName the Identity Provider name.
-     * @param location
+     * @param location the location URL of the Identity Provider.
      */
     public IDPEntry(String providerID,String providerName,String location) {
         this.providerID = providerID;
@@ -226,8 +227,8 @@ public String toXMLString(boolean includeNS,boolean declareNS,
      * Constructor creates IDPEntry Object from
      * Document Element.
      *
-     * @param root Document Element of IDPEntry object.
-     * @throws FSMsgException if IDPEntry cannot be created.
+     * @param root Document Element of IDPEntry object.
+     * @throws FSMsgException if IDPEntry cannot be created.
      */
     
     public IDPEntry(Element root) throws FSMsgException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPProvidedNameIdentifier.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPProvidedNameIdentifier.java
index 94316f134b..91eea69c64 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPProvidedNameIdentifier.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/IDPProvidedNameIdentifier.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPProvidedNameIdentifier.java,v 1.2 2008/06/25 05:46:47 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message.common;
@@ -51,8 +52,8 @@ public class IDPProvidedNameIdentifier extends NameIdentifier {
      * Constructor creates IDPProvidedNameIdentifier object.
      *
      * @param name the Identity Provider name.
-     * @param nameQualifier 
-     * @param format
+     * @param nameQualifier the security or administrative domain that qualifies the name.
+     * @param format the format of the name identifier.
      * @throws SAMLException on error.
      */
     public IDPProvidedNameIdentifier(String name,String nameQualifier,
@@ -109,8 +110,8 @@ public IDPProvidedNameIdentifier(Element idpProvidedNameIdentifierElement)
     /**
      * Constructor creates  IDPProvidedNameIdentifier object.
      *
-     * @param securityDomain
-     * @param name
+     * @param securityDomain the security domain of the name identifier.
+     * @param name the name identifier value.
      * @throws FSMsgException on error.
      */
     public IDPProvidedNameIdentifier(
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/OldProvidedNameIdentifier.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/OldProvidedNameIdentifier.java
index 99096bf42f..7977736a3b 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/OldProvidedNameIdentifier.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/OldProvidedNameIdentifier.java
@@ -24,6 +24,7 @@
  *
  * $Id: OldProvidedNameIdentifier.java,v 1.2 2008/06/25 05:46:47 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -51,9 +52,9 @@ public class OldProvidedNameIdentifier extends NameIdentifier {
     /**
      * Constructor to create OldProvidedNameIdentifier object.
      *
-     * @param name
-     * @param nameQualifier
-     * @param format
+     * @param name the name identifier value.
+     * @param nameQualifier the security or administrative domain that qualifies the name.
+     * @param format the format of the name identifier.
      * @throws SAMLException on error.
      */
     public OldProvidedNameIdentifier(String name,String nameQualifier,
@@ -110,8 +111,8 @@ public OldProvidedNameIdentifier(
     /**
      * Constructor creates OldProvidedNameIdentifier object.
      *
-     * @param securityDomain
-     * @param name
+     * @param securityDomain the security domain of the name identifier.
+     * @param name the name identifier value.
      * @throws FSMsgException it there is an error creating this object.
      */
     public OldProvidedNameIdentifier(
@@ -155,7 +156,7 @@ public int getMinorVersion() {
      * Returns a String representation of this object.
      *
      * @return a String representation of this object.
-     * @throws FSMsgExceptionif there is an error converting
+     * @throws FSMsgException if there is an error converting
      *         this object to a string.
      */
     public String toXMLString() throws FSMsgException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/RequestAuthnContext.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/RequestAuthnContext.java
index 46373f7d90..e095466ae2 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/RequestAuthnContext.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/RequestAuthnContext.java
@@ -24,7 +24,7 @@
  *
  * $Id: RequestAuthnContext.java,v 1.2 2008/06/25 05:46:47 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.message.common;
@@ -70,7 +70,7 @@ public class RequestAuthnContext {
      *        Note: authnContextClassRefList and authContextStatementRefList
      *        are mutually exclusive lists.
      * @param authnContextComparison AuthnContext Comparison Type.
-     *        Possible values are  exact, minimum,
+     *        Possible values are  exact, minimum,
      *        better and maximum.
      */
     public RequestAuthnContext (
@@ -392,7 +392,7 @@ public String toXMLString(boolean includeNS, boolean declareNS,
      * object.
      *
      * @param request the HttpServletRequest object.
-     * @return  object.
+     * @return RequestAuthnContext object.
      * @throws FSMsgException if there is an error
      *         creating RequestAuthnContext object.
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/SPProvidedNameIdentifier.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/SPProvidedNameIdentifier.java
index 81aca20eab..f1568c8348 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/SPProvidedNameIdentifier.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/SPProvidedNameIdentifier.java
@@ -24,6 +24,7 @@
  *
  * $Id: SPProvidedNameIdentifier.java,v 1.2 2008/06/25 05:46:48 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.message.common;
@@ -52,9 +53,9 @@ public class SPProvidedNameIdentifier extends NameIdentifier {
     /**
      * Constructor creates SPProvidedNameIdentifier object.
      *
-     * @param name
-     * @param nameQualifier
-     * @param format
+     * @param name the name identifier value.
+     * @param nameQualifier the security or administrative domain that qualifies the name.
+     * @param format the format of the name identifier.
      * @throws SAMLException on errors.
      */
     public SPProvidedNameIdentifier(String name, String nameQualifier,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/package-info.java
index dec46a9b60..44e36787f4 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/common/package-info.java
@@ -24,12 +24,13 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:46:48 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Defines common classes used by federation protocol messages.
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.federation.message.common;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/package-info.java
index 4cd69a0c38..ad4642ba5c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/message/package-info.java
@@ -24,12 +24,13 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:46:45 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Defines federation protocol message classes. 
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.federation.message;
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..704814b24e 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
@@ -24,6 +24,7 @@
  *
  * $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;
 
@@ -202,9 +203,9 @@ private boolean containsValue(List list, String name) {
      * @param entityConfig the EntityConfigElement object
      * @param objFactory the object factory object
      * @param idffMetaMgr the IDFFMetaManager object.
-     * @throws IDFFMetaException if there is an error retrieving
+     * @throws IDFFMetaException if there is an error retrieving
      *         and updating the entityConfig.
-     * @throws JAXBException if there is an error setting the
+     * @throws JAXBException if there is an error setting the
      *         config.
      */
     private void updateCOTAttrInConfig(String realm,
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..c77ac1ff67 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
@@ -24,6 +24,7 @@
  *
  * $Id: IDFFMetaUtils.java,v 1.5 2008/11/10 22:56:57 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
@@ -398,8 +399,8 @@ public static List getAttributeValueFromConfig(
     /**
      * Returns the realm by parsing the metaAlias. MetaAlias format is
      * 
                  -     * <realm>/<any string without '/'> for non-root realm or
-     * /<any string without '/'> for root realm.
+     * <realm>/<any string without '/'> for non-root realm or
+     * /<any string without '/'> for root realm.
      * 
                  
      * @param metaAlias The metaAlias.
      * @return the realm associated with the metaAlias.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/plugins/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/plugins/package-info.java
index 2636a0b874..ba0b1273e2 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/plugins/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/plugins/package-info.java
@@ -24,12 +24,13 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:46:50 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Defines Federation Adapter for Service Provider.
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.federation.plugins;
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..7ddfeafeb4 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;
@@ -375,7 +376,8 @@ public static synchronized FSAssertionManager getInstance(
      * @param inResponseTo value to InResponseTo attribute. It's the request ID.
      * @param minorVersion request minor version, used to determine assertion's
      *  minor version
-     * @exception FSException,SAMLException if error occurrs
+     * @exception FSException if error occurrs
+     * @exception SAMLException if error occurrs
      */
     public AssertionArtifact createFSAssertionArtifact(
         String id,
@@ -446,7 +448,8 @@ public AssertionArtifact createFSAssertionArtifact(
      * @param idpHandle identity provider issued NameIdentifier
      * @param inResponseTo value to InResponseTo attribute. It's the request ID.
      * @param assertionMinorVersion minor version the assertion should use
-     * @exception FSException,SAMLException if error occurrs
+     * @exception FSException if error occurrs
+     * @exception SAMLException if error occurrs
      */
     public FSAssertion createFSAssertion(
         String id,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerClient.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerClient.java
index 7a3473000e..16f111c126 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerClient.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerClient.java
@@ -25,6 +25,7 @@
  * $Id: FSAssertionManagerClient.java,v 1.8 2008/08/19 19:11:06 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -91,7 +92,7 @@ public final class FSAssertionManagerClient {
      * Returns an instance of AssertionManagerClient.
      *
      * @param metaAlias hosted provider's meta alias.
-     * @throws FSException
+     * @throws FSException if a federation error occurs
      */
     public FSAssertionManagerClient(String metaAlias) throws FSException
     {
@@ -141,7 +142,7 @@ public FSAssertionManagerClient(String metaAlias) throws FSException
      * @param metaAlias hosted provider's meta alias.
      * @param url the FSAssertionManager service URL that
      *  will be used to create, get and delete Assertions
-     * @throws FSException
+     * @throws FSException if a federation error occurs
      */
     public FSAssertionManagerClient(String metaAlias, String url)
         throws FSException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerIF.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerIF.java
index aac4e58eb9..52504eb8d7 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerIF.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerIF.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAssertionManagerIF.java,v 1.4 2008/06/25 05:46:51 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -46,7 +47,8 @@ public interface FSAssertionManagerIF extends Remote {
      * @param destID The destination site requesting the assertion using
      *  the artifact.
      * @return The Assertion referenced to by artifact.
-     * @exception FSRemoteException, RemoteException If an error occurred during
+     * @exception FSRemoteException If an error occurred during
+     * @exception RemoteException If an error occurred during
      *  the process
      */
     public String getAssertion(
@@ -58,7 +60,8 @@ public String getAssertion(
      * @param metaAlias hosted provider meta alias
      * @param artifact assertion artifact string
      * @return destination id
-     * @exception FSRemoteException, RemoteException if error occurred.
+     * @exception FSRemoteException if error occurred.
+     * @exception RemoteException if error occurred.
      */
     public String getDestIdForArtifact(String metaAlias, String artifact)
         throws FSRemoteException, RemoteException;
@@ -69,7 +72,8 @@ public String getDestIdForArtifact(String metaAlias, String artifact)
      * @param metaAlias hosted provider's meta alias
      * @return true if the user exists; false 
      *  otherwise.
-     * @exception FSRemoteException,RemoteException if error occurred.
+     * @exception FSRemoteException if error occurred.
+     * @exception RemoteException if error occurred.
      */
     public boolean isUserExists(String userDN, String metaAlias)
         throws FSRemoteException, RemoteException;
@@ -77,7 +81,7 @@ public boolean isUserExists(String userDN, String metaAlias)
     /**
      * Returns the error status of a given artifact.
      * @param metaAlias hosted provider's meta alias
-     * @param artifact
+     * @param artifact the assertion artifact whose status is requested
      * @return status encoded in XML
      */
     public String getErrorStatus( String metaAlias, String artifact )
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerImpl.java
index 1d7fb31000..3b73dad08e 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAssertionManagerImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAssertionManagerImpl.java,v 1.5 2008/11/10 22:56:58 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -63,7 +64,7 @@ public void checkForLocal() {
      * @param destID The destination site requesting the assertion using
      *  the artifact.
      * @return The Assertion referenced to by artifact.
-     * @exception FSRemoteException, RemoteException If an error occurred during     *  the process
+     * @exception FSRemoteException if an error occurred during the process
      */
     public String getAssertion(
         String metaAlias, String artifact, String destID)
@@ -127,7 +128,7 @@ public String getDestIdForArtifact(String metaAlias, String artifact)
      * @param metaAlias provider's Meta Alias.
      * @return true if the user exists; false
      *  otherwise.
-     * @exception FSRemoteException,RemoteException if error occurred.
+     * @exception FSRemoteException if error occurred.
      */
     public boolean isUserExists(String userDN, String metaAlias)
         throws FSRemoteException
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributeMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributeMapper.java
index 7f752f0922..37c3a22a08 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributeMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributeMapper.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAttributeMapper.java,v 1.3 2008/06/25 05:46:52 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -41,7 +42,6 @@
  * Identity provider to local attributes so that the assertion consumer
  * service will populate these attributes to the application via the
  * single sign-on token.
- * 
                  
  * @deprecated This SPI is deprecated.
  * @see com.sun.identity.federation.services.FSRealmAttributeMapper
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributePlugin.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributePlugin.java
index c1c1343f60..74bad0008d 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributePlugin.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSAttributePlugin.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSAttributePlugin.java,v 1.3 2008/06/25 05:46:52 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -37,7 +38,6 @@
  * AttributeStatements into the Assertion by the Identity Provider
  * during the Single Sign-on process. The implementation of this plugin
  * must return list of SAML AttributeStatements.
- * 
                  
  * 
  * @deprecated This SPI is deprecated.
  * @see com.sun.identity.federation.services.FSRealmAttributePlugin
@@ -50,7 +50,7 @@ public interface FSAttributePlugin {
      * @param remoteProviderID Remote ProviderID.
      * @param subject FSSubject to use in the statements
      * @param token session object
-     * @return List A list of SAML AttributeStatements.
+     * @return List A list of SAML AttributeStatements.
      * @deprecated This method is deprecated.
      * @see com.sun.identity.federation.services.FSRealmAttributePlugin
      */
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..ad8200ef8d 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
@@ -24,6 +24,7 @@
  *
  * $Id: FSDefaultAttributePlugin.java,v 1.4 2008/11/10 22:56:58 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -70,7 +71,7 @@ public class FSDefaultAttributePlugin implements FSAttributePlugin {
      * @param remoteEntityID Remote provider's entity id
      * @param subject Subject subject of the authenticated principal.
      * @param token user's session.
-     * @return list of SAML AttributeStatements.
+     * @return list of SAML AttributeStatements.
      * @deprecated This method is deprecated.
      * @see #getAttributeStatements(String,String,String,FSSubject,Object)
      */
@@ -92,7 +93,7 @@ public List getAttributeStatements(
      * @param remoteEntityID Remote provider's entity id
      * @param subject Subject subject of the authenticated principal.
      * @param token user's session.
-     * @return list of SAML AttributeStatements.
+     * @return list of SAML AttributeStatements.
      */
     public List getAttributeStatements(
            String realm,
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..1147e32490 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
@@ -24,6 +24,7 @@
  *
  * $Id: FSDefaultRealmAttributePlugin.java,v 1.2 2008/06/25 05:46:53 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -71,7 +72,7 @@ public class FSDefaultRealmAttributePlugin implements FSRealmAttributePlugin {
      * @param remoteEntityID Remote provider's entity id
      * @param subject Subject subject of the authenticated principal.
      * @param token user's session.
-     * @return list of SAML AttributeStatements.
+     * @return list of SAML AttributeStatements.
      */
     public List getAttributeStatements(
            String realm,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelperException.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelperException.java
index b6212677ec..d4320ed657 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelperException.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSLoginHelperException.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSLoginHelperException.java,v 1.2 2008/06/25 05:46:55 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -31,7 +32,7 @@
 import com.sun.identity.federation.common.FSException;
 
 /**
- * This class handles all preLogin & postLogin exceptions.
+ * This class handles all preLogin & postLogin exceptions.
  *
  * @see com.sun.identity.federation.common.FSException
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributeMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributeMapper.java
index 35304d37a5..68943e176c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributeMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributeMapper.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSRealmAttributeMapper.java,v 1.2 2008/06/25 05:46:55 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -41,7 +42,6 @@
  * Identity provider to local attributes so that the assertion consumer
  * service will populate these attributes to the application via the
  * single sign-on token.
- * 
                  
  * 
  * @deprecated since 12.0.0
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributePlugin.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributePlugin.java
index 7ac470ca7b..2235499e8f 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributePlugin.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSRealmAttributePlugin.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSRealmAttributePlugin.java,v 1.2 2008/06/25 05:46:55 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -37,7 +38,6 @@
  * AttributeStatements into the Assertion by the Identity Provider
  * during the Single Sign-on process. The implementation of this plugin
  * must return list of SAML AttributeStatements.
- * 
                  
  * 
  */ 
 public interface FSRealmAttributePlugin {
@@ -49,7 +49,7 @@ public interface FSRealmAttributePlugin {
      * @param remoteProviderID Remote ProviderID.
      * @param subject FSSubject to use in the statements
      * @param token session object
-     * @return List A list of SAML AttributeStatements.
+     * @return List A list of SAML AttributeStatements.
      */
     public List getAttributeStatements(
         String realm,
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..437bc12854 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.
  */
 
 
@@ -135,7 +135,8 @@ public FSSOAPReceiver() {
      * Handles post request.
      * @param request http request object
      * @param response http response object
-     * @exception ServletException, IOException if error occurrs.
+     * @exception ServletException if error occurrs.
+     * @exception java.io.IOException if error occurrs.
      */
     public void doPost(HttpServletRequest request, HttpServletResponse response)
         throws jakarta.servlet.ServletException, java.io.IOException
@@ -1467,7 +1468,7 @@ private void handleLECPRequest(
      * @param msg request soap message
      * @param cert Certificate to be used in verifying the signature.
      * @return boolean true if signature verfication successful;
-     *  otherwise return false.
+     *  otherwise return false.
      */
     protected boolean verifyRequestSignature(
         Element elt, 
@@ -1504,7 +1505,8 @@ protected boolean verifyRequestSignature(
      * @param id the value of the id attributer to be signed
      * @param hostedConfig hosted provider's extended meta
      * @return SOAPMessage the signed response message
-     * @exception SAMLException, FSMsgException if error occurrs
+     * @exception SAMLException if error occurrs
+     * @exception FSMsgException if error occurrs
      */
     protected SOAPMessage signResponse (
         SOAPMessage msg,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPService.java
index 68fd026cf6..95c3924b21 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPService.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSOAPService.java
@@ -24,7 +24,7 @@
  *
  * $Id: FSSOAPService.java,v 1.4 2008/11/10 22:56:58 veiming Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.federation.services;
@@ -135,7 +135,8 @@ public SOAPMessage bind(String xmlString) {
      * @param msg the SOAPMessage to be sent
      * @param soapEndPoint the SOAPEndpoint URL of remote provider
      * @return SOAPMessage response message from remote provider
-     * @exception IOException, SOAPException if error occurrs
+     * @exception IOException if error occurrs
+     * @exception SOAPException if error occurrs
      */
     public SOAPMessage sendMessage(
         SOAPMessage msg,
@@ -430,7 +431,8 @@ private Node getFederationElement(Element body, String nodeName)
      * @param needAuthn determines forced authn
      * @return SOAPMessage corresponding to liberty 
      *  request/response message
-     * @exception IOException, SOAPException if error occurrs
+     * @exception IOException if error occurrs
+     * @exception SOAPException if error occurrs
      */
     public SOAPMessage doSyncCall(
         HttpServletResponse response,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSPAuthenticationContextInfo.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSPAuthenticationContextInfo.java
index 97bbddb767..17244633c1 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSPAuthenticationContextInfo.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/FSSPAuthenticationContextInfo.java
@@ -24,6 +24,7 @@
  *
  * $Id: FSSPAuthenticationContextInfo.java,v 1.3 2008/11/10 22:56:58 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services;
@@ -97,7 +98,7 @@ public FSSPAuthenticationContextInfo(String mapping)
      * Creates new FSSPAuthenticationContextInfo 
      * @param authenticationContext the authContext name.
      * @param authenticationLevel the authentication level.
-     * @throws FSSPAuthenticationContextInfo if
+     * @throws FSException if
      *         authenticationContext or
      *         authenticationLevel is invalid.
      */
@@ -115,7 +116,7 @@ public FSSPAuthenticationContextInfo(
      *
      * @param authenticationContext the authContext name.
      * @param authenticationLevel the authentication level.
-     * @throws FSSPAuthenticationContextInfo if
+     * @throws FSException if
      *         authenticationContext or
      *         authenticationLevel is invalid.
      */
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..b86dd86898 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;
@@ -87,7 +87,8 @@ public FSAssertionConsumerService() {
      * Handles artifact profile.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException, IOException if error occurrs.
+     * @exception ServletException if error occurrs.
+     * @exception IOException if error occurrs.
      */
     public void doGet(
         HttpServletRequest request, 
@@ -225,7 +226,8 @@ public void doGet(
      * Handles post profile.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException, IOException if error occurs.
+     * @exception ServletException if error occurs.
+     * @exception IOException if error occurs.
      */
     public void doPost(
         HttpServletRequest request, 
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..e19002eac7 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.
  */
 
 
@@ -90,7 +90,8 @@ public class FSIDPFinderService extends HttpServlet {
      * request to the IDP.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException, IOException if error occurred.
+     * @exception ServletException if error occurred.
+     * @exception IOException if error occurred.
      */
     public void doGet(
         HttpServletRequest request,
@@ -195,7 +196,8 @@ public void doGet(
      * request to the IDP.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException, IOException if error occurred.
+     * @exception ServletException if error occurred.
+     * @exception IOException if error occurred.
      */
     public void doPost(
         HttpServletRequest request,
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..052698f1d7 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;
@@ -306,7 +306,8 @@ private String signAndReturnQueryString(
      * Generates AuthnRequest and sends it to IDP.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException,IOException if error occurred
+     * @exception ServletException if error occurred
+     * @exception IOException if error occurred
      */
     public void doGet(
         HttpServletRequest request, 
@@ -506,7 +507,8 @@ public void doGet(
      * Generates AuthnRequest and sends it to IDP.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException,IOException if error occurred
+     * @exception ServletException if error occurred
+     * @exception IOException if error occurred
      */
     public void doPost(
         HttpServletRequest request, 
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..7c8ba38319 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;
@@ -109,7 +109,8 @@ public void init(ServletConfig config) throws ServletException {
      * Processes single sign on request.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException, IOException if an error occurred
+     * @exception ServletException if an error occurred
+     * @exception IOException if an error occurred
      */
     public void doGet(
         HttpServletRequest request, 
@@ -269,7 +270,8 @@ public void doGet(
      * Processes single sign on POST request.
      * @param request HttpServletRequest object
      * @param response HttpServletResponse object
-     * @exception ServletException, IOException if an error occurred
+     * @exception ServletException if an error occurred
+     * @exception IOException if an error occurred
      */
     public void doPost(
         HttpServletRequest request, 
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..6e06e8e268 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.
  */
 
 
@@ -635,7 +635,8 @@ private void doLogoutInitiation(
      * @param remoteEntity Id the remote provider's entity id
      * @return true if the signature is valid; false
      *  otherwise.
-     * @exception SAMLException, FSException if an error occurred during the
+     * @exception SAMLException if an error occurred during the
+     * @exception FSException if an error occurred during the
      *  process
      */
     private boolean verifyLogoutSignature(
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..d348854052 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;
@@ -352,7 +352,8 @@ private void doGetPost(HttpServletRequest  request,
      * @param isRemoteIDP whether the remote provider is an IDP or not
      * @return true if the signature is verified; null
      *  otherwise.
-     * @exception SAMLException, FSException
+     * @exception SAMLException if a SAML error occurs
+     * @exception FSException if a federation error occurs
      */
     private boolean verifyResponseSignature(
         HttpServletRequest request,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnSessionManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnSessionManager.java
index 3f3a291d50..b98ca089b2 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnSessionManager.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/logout/FSReturnSessionManager.java
@@ -25,6 +25,7 @@
  * $Id: FSReturnSessionManager.java,v 1.4 2009/01/28 05:35:07 ww203982 Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.federation.services.logout;
@@ -135,7 +136,7 @@ public void removeUserProviderInfo(String userDN){
     /**
      * Gets the singleton instance of FSReturnSessionManager.
      * There is a single instance for each hosted provider.
-     * @return metaAlias the hosted provider whose instance needs to be
+     * @param metaAlias the hosted provider whose instance needs to be
      *  returned
      * @return the singleton FSReturnSessionManager instance
      */
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..d147ecc9e1 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;
@@ -1656,7 +1656,8 @@ private boolean supportSOAPProfile(ProviderDescriptorType currentDesc)
      * @param idAttrName id attribute name
      * @param id id attribute value
      * @return the signed logout request
-     * @exception SAMLException, FSMsgException if an error occurred during
+     * @exception SAMLException if an error occurred during
+     * @exception FSMsgException if an error occurred during
      *  the process
      */
     private SOAPMessage signLogoutRequest(
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/namemapping/FSNameMappingHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/namemapping/FSNameMappingHandler.java
index 9d394e1cbc..ea6bf39680 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/namemapping/FSNameMappingHandler.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/namemapping/FSNameMappingHandler.java
@@ -24,7 +24,7 @@
  *
  * $Id: FSNameMappingHandler.java,v 1.3 2008/06/25 05:47:02 qcheng Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 
@@ -106,7 +106,8 @@ public FSNameMappingHandler(
      *  a local provider; false otherwise.
      * @return NameIdentifier of an user corresponding to
      *  remoteProviderID.
-     * @exception FSAccountMgmtException, SAMLException if an error occurred.
+     * @exception FSAccountMgmtException if an error occurred.
+     * @exception SAMLException if an error occurred.
      */
     public NameIdentifier getNameIdentifier(
         String userID,
@@ -158,7 +159,8 @@ public NameIdentifier getNameIdentifier(
      *  a local provider; false otherwise.
      * @return NameIdentifier corresponding to
      *  remoteProviderID.
-     * @exception FSAccountMgmtException, SAMLException if an error occurred.
+     * @exception FSAccountMgmtException if an error occurred.
+     * @exception SAMLException if an error occurred.
      */
     public NameIdentifier getNameIdentifier(
         FSNameIdentifierMappingRequest mappingRequest,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/package-info.java
index 2cf368ded3..c2b6ec6c55 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/package-info.java
@@ -24,12 +24,13 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:46:57 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Handles ID-FF federation profiles.
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.federation.services;
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSNameRegistrationHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSNameRegistrationHandler.java
index 226d4fb6cd..24136cee8e 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSNameRegistrationHandler.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/federation/services/registration/FSNameRegistrationHandler.java
@@ -24,7 +24,7 @@
  *
  * $Id: FSNameRegistrationHandler.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.
  */
 
 
@@ -1564,7 +1564,8 @@ public void returnLocallyAtSource(
      * @param idAttrName name of the id attribute to be signed
      * @param id the value of the id attribute to be signed
      * @return signed Name registration request
-     * @exception SAMLException, FSMsgException if error occurred.
+     * @exception SAMLException if error occurred.
+     * @exception FSMsgException if error occurred.
      */
     protected SOAPMessage signRegistrationRequest(
         SOAPMessage msg, String idAttrName, String id) 
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..da689ace61 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.
  */
 
 
@@ -141,7 +141,8 @@ public void doPost(
      *  request the client has made of the servlet.
      * @param response HttpServletResponse object that contains
      *  the response the servlet sends to the client.
-     * @exception ServletException, IOException if the request could not be
+     * @exception ServletException if the request could not be
+     * @exception IOException if the request could not be
      *  handled
      */
     private void doGetPost(
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..d5a2f0e294 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;
@@ -408,7 +408,8 @@ private void doRequestProcessing(
      * @return true if the signature is verified;
      *  false
      *  otherwise
-     * @exception SAMLException, FSException if an error occurred during
+     * @exception SAMLException if an error occurred during
+     * @exception FSException if an error occurred during
      *  the process
      */
     private boolean verifyRegistrationSignature(
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..bf553bfa02 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;
@@ -289,7 +289,8 @@ private void doGetPost(HttpServletRequest request,
      * @param isIDP whether the remote provider is an IDP or not
      * @return true if the signature is valid; false
      *  otherwise.
-     * @exception SAMLException, FSException if an error occurred during the
+     * @exception SAMLException if an error occurred during the
+     * @exception FSException if an error occurred during the
      *  process
      */
     private boolean verifyResponseSignature(
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..551c90dcae 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.
  */
 
 
@@ -119,7 +119,8 @@ public void doPost(
      *  request the client has made of the servlet.
      * @param response HttpServletResponse object that contains
      *  the response the servlet sends to the client.
-     * @exception ServletException,IOException if the request could not be
+     * @exception ServletException if the request could not be
+     * @exception IOException if the request could not be
      *  handled
      */
     private void doGetPost(
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..62900443d4 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.
  */
 
 
@@ -403,7 +403,8 @@ private void doRequestProcessing (
      * @param isIDP whether the remote provider is an IDP or not
      * @return true if signatre is valid; false
      *  otherwise.
-     * @exception SAMLException, FSException if an error occurred during the
+     * @exception SAMLException if an error occurred during the
+     * @exception FSException if an error occurred during the
      *  process
      */
     private boolean verifyTerminationSignature(
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..27d1ed6eea 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;
@@ -386,7 +386,8 @@ public static String getBaseURL (HttpServletRequest request) {
      * Outputs the DOM representation given as root as XML string.
      * @param root The DOM representation to be outputted
      * @return string representation of DOM node.
-     * @exception TransformerException, TransformerConfigurationException,
+     * @exception TransformerException if an error occurs
+     * @exception TransformerConfigurationException if an error occurs
      *  FileNotFoundException
      */
     public static String printDocument (Node root) throws TransformerException, TransformerConfigurationException,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/mechanism/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/mechanism/package-info.java
index 4da1d05b9e..cd876bc771 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/mechanism/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/mechanism/package-info.java
@@ -24,13 +24,14 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:47:07 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Defines interface to handle different SASL mechanisms.
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.liberty.ws.authnsvc.mechanism;
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/package-info.java
index 200f8865ed..a54c78ddb8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/package-info.java
@@ -24,13 +24,14 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:47:06 qcheng Exp $
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Provides classes to manage liberty authentication service.
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.liberty.ws.authnsvc;
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/protocol/package-info.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/protocol/package-info.java
index 8954d0302b..e7ee89553e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/protocol/package-info.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/authnsvc/protocol/package-info.java
@@ -24,13 +24,14 @@
  *
  * $Id: package-info.java,v 1.2 2008/06/25 05:47:08 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
  * Provides classes to manage liberty authentication service protocol.
  *
  * 
- * @deprecated since 12.0.0
+ * Deprecated since 12.0.0.
  */
 package com.sun.identity.liberty.ws.authnsvc.protocol;
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/Status.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/Status.java
index 07cb8e0eff..05743890c1 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/Status.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/Status.java
@@ -24,6 +24,7 @@
  *
  * $Id: Status.java,v 1.2 2008/06/25 05:47:09 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -36,18 +37,18 @@
  * The following schema fragment specifies the expected content within the  
  * Status object.
  * 
                  - * <complexType name="Status">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="Status" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Status">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="Status" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/wsse/BinarySecurityToken.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/wsse/BinarySecurityToken.java
index 63549c3ab8..245e44ea73 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/wsse/BinarySecurityToken.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/common/wsse/BinarySecurityToken.java
@@ -24,6 +24,7 @@
  *
  * $Id: BinarySecurityToken.java,v 1.5 2008/08/06 17:28:07 exu Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -50,31 +51,30 @@
  * Certificate Token Profile and Liberty ID-WSF Security Mechanisms 
  * specifications.
  *  
                  The following schema fragment specifies the expected content within the BinarySecurityToken object.
- * 
                  
  * 
                  - * <element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType/>
- * <complexType name="BinarySecurityTokenType">
- *   <simpleContent>
- *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>EncodedString">
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * <xsd:complexType name="EncodedString">
- *   <xsd:simpleContent>
- *     <xsd:extension base="wsse:AttributedString">
- *       <xsd:attribute name="EncodingType" type="xsd:QName"/>
- *     </xsd:extension>
- *   </xsd:simpleContent>
- * </xsd:complexType>
- * <xsd:complexType name="AttributedString">
- *   <xsd:simpleContent>
- *     <xsd:extension base="xsd:string">
- *       <xsd:attribute ref="wsu:Id"/>
- *         <xsd:anyAttribute namespace="##other" processContents="lax"/>
- *     </xsd:extension>
- *   </xsd:simpleContent>
- * </xsd:complexType>
+ * <element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType/>
+ * <complexType name="BinarySecurityTokenType">
+ *   <simpleContent>
+ *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>EncodedString">
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ * <xsd:complexType name="EncodedString">
+ *   <xsd:simpleContent>
+ *     <xsd:extension base="wsse:AttributedString">
+ *       <xsd:attribute name="EncodingType" type="xsd:QName"/>
+ *     </xsd:extension>
+ *   </xsd:simpleContent>
+ * </xsd:complexType>
+ * <xsd:complexType name="AttributedString">
+ *   <xsd:simpleContent>
+ *     <xsd:extension base="xsd:string">
+ *       <xsd:attribute ref="wsu:Id"/>
+ *         <xsd:anyAttribute namespace="##other" processContents="lax"/>
+ *     </xsd:extension>
+ *   </xsd:simpleContent>
+ * </xsd:complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Description.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Description.java
index ac917f52c8..a47ddf390c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Description.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Description.java
@@ -24,6 +24,7 @@
  *
  * $Id: Description.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -46,23 +47,22 @@
  * Description Type of a service instance.
  * 
                  The following schema fragment specifies the expected content within the
  * Description object.
- * 
                  
  * 
                  - * <complexType name="DescriptionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *         <element name="CredentialRef" type="{http://www.w3.org/2001/XMLSchema}IDREF" maxOccurs="unbounded" minOccurs="0"/>
- *         <choice>
- *           <group ref="{urn:liberty:disco:2003-08}WsdlRef"/>
- *           <group ref="{urn:liberty:disco:2003-08}BriefSoapHttpDescription"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DescriptionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *         <element name="CredentialRef" type="{http://www.w3.org/2001/XMLSchema}IDREF" maxOccurs="unbounded" minOccurs="0"/>
+ *         <choice>
+ *           <group ref="{urn:liberty:disco:2003-08}WsdlRef"/>
+ *           <group ref="{urn:liberty:disco:2003-08}BriefSoapHttpDescription"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Directive.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Directive.java
index 0afdb459b3..973f780df7 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Directive.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Directive.java
@@ -24,6 +24,7 @@
  *
  * $Id: Directive.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -49,13 +50,13 @@
  * The following schema fragment specifies the expected content within the
  * DirectiveType object.
  * 
                  - * <complexType name="DirectiveType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="descriptionIDRefs" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DirectiveType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="descriptionIDRefs" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/EncryptedResourceID.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/EncryptedResourceID.java
index c64e8dc6e6..824d340fab 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/EncryptedResourceID.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/EncryptedResourceID.java
@@ -24,6 +24,7 @@
  *
  * $Id: EncryptedResourceID.java,v 1.4 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -43,19 +44,18 @@
  * Resource ID element for the Discovery Service.
  * 
                  The following schema fragment specifies the expected content within the
  * EncryptedResourceID object.
- * 
                  
  * 
                  - * <xs:element name="EncryptedResourceID" type="EncryptedResourceIDType"/>
- * <complexType name="EncryptedResourceIDType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <xs:element name="EncryptedResourceID" type="EncryptedResourceIDType"/>
+ * <complexType name="EncryptedResourceIDType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/InsertEntry.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/InsertEntry.java
index fe6e75d242..29b8cc7209 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/InsertEntry.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/InsertEntry.java
@@ -24,6 +24,7 @@
  *
  * $Id: InsertEntry.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -43,19 +44,18 @@
  * Modify request.
  * 
                  The following schema fragment specifies the expected content within the
  * InsertEntry object.
- * 
                  
  * 
                  - * <xs:element name="InsertEntry" type="InsertEntryType">
- * <complexType name="InsertEntryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <xs:element name="InsertEntry" type="InsertEntryType">
+ * <complexType name="InsertEntryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Modify.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Modify.java
index 9b78899c77..ee36ae31c8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Modify.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Modify.java
@@ -24,6 +24,7 @@
  *
  * $Id: Modify.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -41,19 +42,19 @@
  * The following schema fragment specifies the expected content within
  * the Modify object.
  * 
                  - * <xs:element name="Modify" type="ModifyType"/>
- * <complexType name="ModifyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
- *         <element name="InsertEntry" type="{urn:liberty:disco:2003-08}InsertEntryType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="RemoveEntry" type="{urn:liberty:disco:2003-08}RemoveEntryType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <xs:element name="Modify" type="ModifyType"/>
+ * <complexType name="ModifyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
+ *         <element name="InsertEntry" type="{urn:liberty:disco:2003-08}InsertEntryType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="RemoveEntry" type="{urn:liberty:disco:2003-08}RemoveEntryType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ModifyResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ModifyResponse.java
index 30b1a472bc..1e2c936d72 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ModifyResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ModifyResponse.java
@@ -24,6 +24,7 @@
  *
  * $Id: ModifyResponse.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -46,23 +47,22 @@
  * modify request.
  * 
                  The following schema fragment specifies the expected content within the
  * ModifyResponse object.
- * 
                  
  * 
                  - * <complexType name="ModifyResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}Status"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="newEntryIDs">
- *         <simpleType>
- *           <list itemType="{urn:liberty:disco:2003-08}IDReferenceType" />
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ModifyResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}Status"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="newEntryIDs">
+ *         <simpleType>
+ *           <list itemType="{urn:liberty:disco:2003-08}IDReferenceType" />
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Query.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Query.java
index c46c32c4fc..6b54c8f0b7 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Query.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/Query.java
@@ -24,6 +24,7 @@
  *
  * $Id: Query.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -41,29 +42,29 @@
  * The following schema fragment specifies the expected content within the
  * Query object.
  * 
                  - * <xs:element name="Query" type="Query"/> 
- * <complexType name="Query">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
- *         <element name="RequestedServiceType" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
- *                   <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <xs:element name="Query" type="Query"/> 
+ * <complexType name="Query">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
+ *         <element name="RequestedServiceType" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
+ *                   <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/QueryResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/QueryResponse.java
index cf0ad2ec1b..ee6b2516ce 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/QueryResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/QueryResponse.java
@@ -24,6 +24,7 @@
  *
  * $Id: QueryResponse.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -47,28 +48,28 @@
  * The following schema fragment specifies the expected content within the
  * QueryResponse object.
  * 
                  - * <complexType name="QueryResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}Status"/>
- *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Credentials" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}Status"/>
+ *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Credentials" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RemoveEntry.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RemoveEntry.java
index a2408fd1be..6cad7117d3 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RemoveEntry.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RemoveEntry.java
@@ -24,6 +24,7 @@
  *
  * $Id: RemoveEntry.java,v 1.2 2008/06/25 05:47:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -36,16 +37,15 @@
  * the discovery modify request.
  * 
                  The following schema fragment specifies the expected content 
  * within the RemoveEntry object.
- * 
                  
  * 
                  - * <xs:element name="RemoveEntry" type="RemoveEntryType">
- * <complexType name="RemoveEntryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="entryID" type="{urn:liberty:disco:2003-08}IDReferenceType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <xs:element name="RemoveEntry" type="RemoveEntryType">
+ * <complexType name="RemoveEntryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="entryID" type="{urn:liberty:disco:2003-08}IDReferenceType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RequestedService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RequestedService.java
index 8af5b73145..fc17f07032 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RequestedService.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/RequestedService.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequestedService.java,v 1.2 2008/06/25 05:47:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -42,25 +43,23 @@
  * instance complying with one of the specified service type.
  * 
                  The following schema fragment specifies the expected content 
  * within the RequestedService object.
- * 
                  
  * 
                  - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
- *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
- *   *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
+ *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
+ *   *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
- * 
                  
  * 
                    * In this implementation, the value of Options has the following meanings:
  * When the List of options is null, no Options element will be created;
  * When the List of options is an empty List, or is Collection.EMPTY_LIST,
- *        empty Options element <Options></Options> will be created;
+ *        empty Options element <Options></Options> will be created;
  * When the List of options is not empty,
  *        Options element with child Option element(s) will be created.
  * 
                  
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceID.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceID.java
index 32021f64cc..dcad682cba 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceID.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceID.java
@@ -24,6 +24,7 @@
  *
  * $Id: ResourceID.java,v 1.2 2008/06/25 05:47:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,14 +41,14 @@
  * The following schema fragment specifies the expected content within the
  * ResourceID object.
  * 
                  - * <xs:element name="ResourceID" type="ResourceIDType"/>
- * <complexType name="ResourceIDType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <xs:element name="ResourceID" type="ResourceIDType"/>
+ * <complexType name="ResourceIDType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceOffering.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceOffering.java
index 12a34bf24a..ca3646fd2a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceOffering.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ResourceOffering.java
@@ -24,6 +24,7 @@
  *
  * $Id: ResourceOffering.java,v 1.2 2008/06/25 05:47:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -44,50 +45,49 @@
  * instance that provides access to that resource.
  * 
                  The following schema fragment specifies the expected content within the
  * ResourceOffering object.
- * 
                  
  * 
                  - * <complexType name="ResourceOfferingType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
- *         <element name="ServiceInstance" type="{urn:liberty:disco:2003-08}ServiceInstanceType"/>
- *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
- *         <element name="Abstract" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="entryID" type="{urn:liberty:disco:2003-08}IDType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResourceOfferingType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
+ *         <element name="ServiceInstance" type="{urn:liberty:disco:2003-08}ServiceInstanceType"/>
+ *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
+ *         <element name="Abstract" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="entryID" type="{urn:liberty:disco:2003-08}IDType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * An example of the ResourceOffering is :
  * 
                  - * <ResourceOffering xmlns="urn:liberty:disco:2003-08">
- *     <ResourceID>http://profile-provider.com/profiles/l4m0B82k15csaUxs</ResourceID>
- *     <ServiceInstance xmlns="urn:liberty:disco:2003-08">
- *         <ServiceType>urn:liberty:idpp:2003-08</ServiceType>
- *         <ProviderID>http://profile-provider.com/</ProviderID>
- *         <Description>
- *             <SecurityMechID>urn:liberty:disco:2003-08:anonymous</SecurityMechID>
- *             <SecurityMechID>urn:liberty:security:2003-08:x509</SecurityMechID>
- *             <SecurityMechID>urn:liberty:security:2003-08:saml</SecurityMechID>
- *             <Endpoint>https://soap.profile-provider.com/soap/</Endpoint>
- *         </Description>
- *         <Description>
- *             <SecurityMechID>urn:ietf:rfc:2246</SecurityMechID>
- *             <Endpoint>https://soap-auth.profile-provider.com/soap/</Endpoint>
- *         </Description>
- *      </ServiceInstance>
- *      <Options>
- *          <Option>urn:liberty:idpp</Option>
- *          <Option>urn:liberty:idpp:cn</Option>
- *          <Option>urn:liberty:idpp:can</Option>
- *          <Option>urn:liberty:idpp:can:cn</Option>
- *      </Options>
- *      <Abstract>
+ * <ResourceOffering xmlns="urn:liberty:disco:2003-08">
+ *     <ResourceID>http://profile-provider.com/profiles/l4m0B82k15csaUxs</ResourceID>
+ *     <ServiceInstance xmlns="urn:liberty:disco:2003-08">
+ *         <ServiceType>urn:liberty:idpp:2003-08</ServiceType>
+ *         <ProviderID>http://profile-provider.com/</ProviderID>
+ *         <Description>
+ *             <SecurityMechID>urn:liberty:disco:2003-08:anonymous</SecurityMechID>
+ *             <SecurityMechID>urn:liberty:security:2003-08:x509</SecurityMechID>
+ *             <SecurityMechID>urn:liberty:security:2003-08:saml</SecurityMechID>
+ *             <Endpoint>https://soap.profile-provider.com/soap/</Endpoint>
+ *         </Description>
+ *         <Description>
+ *             <SecurityMechID>urn:ietf:rfc:2246</SecurityMechID>
+ *             <Endpoint>https://soap-auth.profile-provider.com/soap/</Endpoint>
+ *         </Description>
+ *      </ServiceInstance>
+ *      <Options>
+ *          <Option>urn:liberty:idpp</Option>
+ *          <Option>urn:liberty:idpp:cn</Option>
+ *          <Option>urn:liberty:idpp:can</Option>
+ *          <Option>urn:liberty:idpp:can:cn</Option>
+ *      </Options>
+ *      <Abstract>
  *          This is a personal profile containing common name information. 
- *      </Abstract>
- * </ResourceOffering>
+ *      </Abstract>
+ * </ResourceOffering>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ServiceInstance.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ServiceInstance.java
index be4c74ed1b..0e05ab676f 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ServiceInstance.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/ServiceInstance.java
@@ -24,6 +24,7 @@
  *
  * $Id: ServiceInstance.java,v 1.2 2008/06/25 05:47:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -44,20 +45,19 @@
  * distinct protocol endpoint.
  * 
                  The following schema fragment specifies the expected content 
  * within the ServiceInstance object.
- * 
                  
  * 
                  - * <xs:element name="ServiceInstance" type="ServiceInstanceType"/>
- * <complexType name="ServiceInstanceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
- *         <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
- *         <element name="Description" type="{urn:liberty:disco:2003-08}DescriptionType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <xs:element name="ServiceInstance" type="ServiceInstanceType"/>
+ * <complexType name="ServiceInstanceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
+ *         <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
+ *         <element name="Description" type="{urn:liberty:disco:2003-08}DescriptionType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
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 e263f0cf39..6fd520dff4 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
@@ -86,10 +86,10 @@ private DiscoUtils() {
      * @param token token of this soap session.
      * @return Map of following key value pairs:
      *  
                  -     *  Key: OFFERINGS
-     *  Value: List of ResourceOfferings
-     *  Key: CREDENTIALS
-     *  Value: List of credentials (Assertions)
+     *  Key: <code>OFFERINGS</code>
+     *  Value: List of <code>ResourceOffering</code>s
+     *  Key: <code>CREDENTIALS</code>
+     *  Value: List of credentials (<code>Assertion</code>s)
      *  
                  
      */
     public static Map checkPolicyAndHandleDirectives(
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..d306f1432a 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
@@ -24,6 +24,7 @@
  *
  * $Id: IDFFNameIdentifierMapper.java,v 1.3 2008/06/25 05:47:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -47,7 +48,6 @@
 /**
  * The class IDFFNameIdentifierMapper is an implementation
  * of NameIdentifierMapper for Liberty ID-FF providers.
- * 
                  
  *
  */
 public class IDFFNameIdentifierMapper implements NameIdentifierMapper {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/NameIdentifierMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/NameIdentifierMapper.java
index e92c64e397..edd76b9773 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/NameIdentifierMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/disco/plugins/NameIdentifierMapper.java
@@ -24,6 +24,7 @@
  *
  * $Id: NameIdentifierMapper.java,v 1.2 2008/06/25 05:47:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -37,7 +38,6 @@
  * The class NameIdentifierMapper is an interface that is 
  * used to map user's NameIdentifier from one provider 
  * to another.
- * 
                  
  * 
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTClient.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTClient.java
index dc0851874b..920d6c212c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTClient.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTClient.java
@@ -24,7 +24,7 @@
  *
  * $Id: DSTClient.java,v 1.5 2008/12/16 01:48:32 exu Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.liberty.ws.dst;
@@ -288,7 +288,7 @@ public DSTClient(ResourceOffering resourceOffering,
     /**
      * Parses the given discovery resource offering for the Data service.
      * @param offering ResourceOffering 
-     * @exception DSTException.
+     * @exception DSTException .
      */
     private void parseResourceOffering(ResourceOffering offering)
     throws DSTException {
@@ -452,7 +452,7 @@ private void parseResourceOffering(ResourceOffering offering)
     /**
      * Generates X509 security token for the WSC.
      * @param credential Credential of WSC
-     * @exception DSTException
+     * @exception DSTException if a data service error occurs
      */
     private void generateBinarySecurityToken(Object credential)
      throws DSTException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTData.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTData.java
index 138db7521d..87f0e562c0 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTData.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTData.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTData.java,v 1.2 2008/06/25 05:47:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -43,18 +44,18 @@
  * The following schema fragment specifies the expected content within 
  * the DSTData object.
  * 
                  - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
  *       <attribute name="itemIDRef" 
- *       type="{urn:liberty:idpp:2003-08}IDReferenceType" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *       type="{urn:liberty:idpp:2003-08}IDReferenceType" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
@@ -84,7 +85,7 @@ public DSTData (java.util.List data, String serviceNS) {
      * Constructor
      *
      * @param element DOM Element
-     * @throws DSTException
+     * @throws DSTException if a data service error occurs
      */
     public DSTData(org.w3c.dom.Element element) throws DSTException{
         if(element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModification.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModification.java
index 0b5d12cb29..2ce2c1ae44 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModification.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModification.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTModification.java,v 1.2 2008/06/25 05:47:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -47,33 +48,32 @@
  * 
  * 
                  The following schema fragment specifies the expected content within
  * the DSTModification object.
- * 
                  
  * 
                  - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
  *         <element name="Select"
- *         type="{urn:liberty:idpp:2003-08}SelectType"/>
- *         <element name="NewData" minOccurs="0">
- *           <complexType>
- *             <complexContent>
+ *         type="{urn:liberty:idpp:2003-08}SelectType"/>
+ *         <element name="NewData" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
  *               <restriction base="{http://www.w3.org/2001/XMLSchema}
- *               anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
+ *               anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
  *       <attribute name="overrideAllowed"
- *       type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
@@ -112,7 +112,7 @@ public DSTModification(String select,
      * Constructor
      *
      * @param element DOM Element.
-     * @throws DSTException
+     * @throws DSTException if a data service error occurs
      */
     public DSTModification(org.w3c.dom.Element element) throws DSTException{
         if(element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModify.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModify.java
index f498e64fb0..521f5f9d65 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModify.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModify.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTModify.java,v 1.2 2008/06/25 05:47:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -46,48 +47,48 @@
  * the DSTModify object.
  * 
  * 
                  - * <complexType name="ModifyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:idpp:2003-08}ResourceIDGroup"/>
- *         <element name="Modification" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
+ * <complexType name="ModifyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:idpp:2003-08}ResourceIDGroup"/>
+ *         <element name="Modification" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
  *               <restriction base="{http://www.w3.org/2001/XMLSchema}
- *                anyType">
- *                 <sequence>
+ *                anyType">
+ *                 <sequence>
  *                   <element name="Select"
- *                   type="{urn:liberty:idpp:2003-08}SelectType"/>
- *                   <element name="NewData" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
+ *                   type="{urn:liberty:idpp:2003-08}SelectType"/>
+ *                   <element name="NewData" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
  *                         <restriction 
- *                         base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                           <any/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
+ *                         base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                           <any/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
  *                 <attribute name="overrideAllowed"
- *                 type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                 type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *                 <attribute name="id"
- *                 type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
+ *                 type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
  *         <element ref="{urn:liberty:idpp:2003-08}Extension"
- *         maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="itemID" type="{urn:liberty:idpp:2003-08}IDType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *         maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="itemID" type="{urn:liberty:idpp:2003-08}IDType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
@@ -158,7 +159,7 @@ public DSTModify(
     /**
      * Constructor
      * @param element DOM Element.
-     * @exception DSTException
+     * @exception DSTException if a data service error occurs
      */
     public DSTModify(org.w3c.dom.Element element) throws DSTException{
         if(element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModifyResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModifyResponse.java
index 49a5fbed2d..a548bf90e0 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModifyResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTModifyResponse.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTModifyResponse.java,v 1.2 2008/06/25 05:47:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -46,22 +47,22 @@
  * The following schema fragment specifies the expected content within the
  * DSTModifyResponse object.
  * 
                  - * <complexType name="ResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:idpp:2003-08}Status"/>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:idpp:2003-08}Status"/>
  *         <element ref="{urn:liberty:idpp:2003-08}Extension"
- *         maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
+ *         maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
  *       <attribute name="timeStamp"
- *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
  *       <attribute name="itemIDRef"
- *       type="{urn:liberty:idpp:2003-08}IDReferenceType" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *       type="{urn:liberty:idpp:2003-08}IDReferenceType" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
@@ -84,7 +85,7 @@ public DSTModifyResponse () {}
     /**
      * Constructor
      * @param element DOM Element.
-     * @throws DSTException
+     * @throws DSTException if a data service error occurs
      */
     public DSTModifyResponse(org.w3c.dom.Element element) throws DSTException{
         if(element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQuery.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQuery.java
index 0e4ff665cf..b2aea844c9 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQuery.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQuery.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTQuery.java,v 1.3 2008/06/25 05:47:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -42,42 +43,41 @@
  * The DSTQuery class represents a DST query request.
  * 
                  The following schema fragment specifies the expected content within the
  * DSTQuery  object.
- * 
                  
  * 
                  - * <complexType name="QueryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:idpp:2003-08}ResourceIDGroup"/>
- *         <element name="QueryItem" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
+ * <complexType name="QueryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:idpp:2003-08}ResourceIDGroup"/>
+ *         <element name="QueryItem" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
  *               <restriction base="{http://www.w3.org/2001/XMLSchema}
- *               anyType">
- *                 <sequence>
+ *               anyType">
+ *                 <sequence>
  *                   <element name="Select" 
- *                   type="{urn:liberty:idpp:2003-08}SelectType"/>
- *                 </sequence>
+ *                   type="{urn:liberty:idpp:2003-08}SelectType"/>
+ *                 </sequence>
  *                 <attribute name="id"
- *                 type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *                 type="{http://www.w3.org/2001/XMLSchema}ID" />
  *                 <attribute name="changedSince"
- *                 type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *                 type="{http://www.w3.org/2001/XMLSchema}dateTime" />
  *                 <attribute name="itemID"
- *                 type="{urn:liberty:idpp:2003-08}IDType" />
+ *                 type="{urn:liberty:idpp:2003-08}IDType" />
  *                 <attribute name="includeCommonAttributes"
- *                 type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
+ *                 type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
  *         <element ref="{urn:liberty:idpp:2003-08}Extension"
- *         maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="itemID" type="{urn:liberty:idpp:2003-08}IDType" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *         maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="itemID" type="{urn:liberty:idpp:2003-08}IDType" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
@@ -144,7 +144,7 @@ public DSTQuery(com.sun.identity.liberty.ws.disco.EncryptedResourceID
      * Constructor
      *
      * @param element DOM Element.
-     * @throws DSTException
+     * @throws DSTException if a data service error occurs
      */
     public DSTQuery(org.w3c.dom.Element element) throws DSTException{
         if(element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryItem.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryItem.java
index 0acbda9c29..1cfcf7e4b2 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryItem.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryItem.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTQueryItem.java,v 1.2 2008/06/25 05:47:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.liberty.ws.dst;
@@ -42,26 +43,26 @@
  * The following schema fragment specifies the expected content within the
  * DSTQueryItem object.
  * 
                  - * <element name="QueryItem" maxOccurs="unbounded">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
+ * <element name="QueryItem" maxOccurs="unbounded">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
  *           <element name="Select"
- *           type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
- *         </sequence>
+ *           type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
+ *         </sequence>
  *         <attribute name="itemID"
- *         type="{urn:liberty:id-sis-pp:2003-08}IDType" />
+ *         type="{urn:liberty:id-sis-pp:2003-08}IDType" />
  *         <attribute name="changedSince"
- *         type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *         type="{http://www.w3.org/2001/XMLSchema}dateTime" />
  *         <attribute name="includeCommonAttributes" 
- *         type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *         type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *         <attribute name="id" 
- *         type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ *         type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                  
  *
  * 
@@ -109,7 +110,7 @@ public DSTQueryItem (String select,
     /**
      * Constructor
      * @param element DOM Element 
-     * @throws DSTException
+     * @throws DSTException if a data service error occurs
      */
     public DSTQueryItem(org.w3c.dom.Element element) throws DSTException{
         if(element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryResponse.java
index 72d703df47..60742e1224 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/DSTQueryResponse.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTQueryResponse.java,v 1.2 2008/06/25 05:47:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -46,38 +47,38 @@
  * The following schema fragment specifies the expected content within
  * the DSTQueryResponse object.
  * 
                  - * <complexType name="QueryResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:idpp:2003-08}Status"/>
- *         <element name="Data" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
+ * <complexType name="QueryResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:idpp:2003-08}Status"/>
+ *         <element name="Data" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
  *               <restriction 
- *               base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
+ *               base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
  *                 <attribute name="itemIDRef" 
- *                 type="{urn:liberty:idpp:2003-08}IDReferenceType" />
+ *                 type="{urn:liberty:idpp:2003-08}IDReferenceType" />
  *                 <attribute name="id"
- *                 type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
+ *                 type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
  *         <element ref="{urn:liberty:idpp:2003-08}Extension" 
- *         maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
+ *         maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
  *       <attribute name="timeStamp" 
- *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
  *       <attribute name="itemIDRef"
- *       type="{urn:liberty:idpp:2003-08}IDReferenceType" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *       type="{urn:liberty:idpp:2003-08}IDReferenceType" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  *  
@@ -114,7 +115,7 @@ public DSTQueryResponse(java.util.List data, String serviceNS) {
      * Constructor
      *
      * @param element DOM Element 
-     * @throws DSTException
+     * @throws DSTException if a data service error occurs
      */
     public DSTQueryResponse(org.w3c.dom.Element element) throws DSTException {
         if(element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/service/DSTRequestHandler.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/service/DSTRequestHandler.java
index 18f09c90a6..e0bd745dd3 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/service/DSTRequestHandler.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/dst/service/DSTRequestHandler.java
@@ -24,6 +24,7 @@
  *
  * $Id: DSTRequestHandler.java,v 1.3 2008/06/25 05:47:14 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.liberty.ws.dst.service;
@@ -135,7 +136,7 @@ private List processSOAPBodies(List requestBodies,
      * Generates the binary security token if the security profile is X509.
      * @param msg Request Message. 
      * @return BinarySecurityToken.
-     * @exception DSTException.
+     * @exception DSTException .
      */
     private BinarySecurityToken generateBinarySecurityToken(Message msg)
     throws DSTException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPInteractionHelper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPInteractionHelper.java
index 096796b6a8..8315c5bf16 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPInteractionHelper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/PPInteractionHelper.java
@@ -24,6 +24,7 @@
  *
  * $Id: PPInteractionHelper.java,v 1.2 2008/06/25 05:47:14 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -45,8 +46,8 @@
  * Personal Profile Service for creating questions for Interaction for value 
  * and interaction for consent.
  * The question key will always be of the following form in a properties file.
- * Question: _Value_Question for interact for value
- * Question: _Consent_Question for interfact for consent
+ * Question: {@code _Value_Question} for interact for value
+ * Question: {@code _Consent_Question} for interfact for consent
  * For e.g. CN_Value_Question or CN_Consent_Question.
  * There will be a default question key for Consent if there's not one for the
  * rquested attribute., but it's not true for interact for the value.
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..1b5c342e98 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
@@ -24,6 +24,7 @@
  *
  * $Id: PPRequestHandler.java,v 1.2 2008/06/25 05:47:14 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -104,8 +105,7 @@ public PPRequestHandler() {
      * @param requestMsg Request Message.
      * @param responseMsg Response Message.
      * @return Object processed response object.
-     * @exception SOAPFaultException for the interaction redirects 
-     * @exception Exception for any failure.
+     * @exception SOAPFaultException for the interaction redirects
      */
     public Object processDSTRequest(
         Object request, 
@@ -366,7 +366,7 @@ public Object processDSTRequest(
       * Get the data from the queried results
       * @param queryResults map of DSTQueryItems and the corresponding results.
       * @return List queried data.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      private List getData(Map queryResults) throws IDPPException {
  
@@ -665,7 +665,7 @@ private Map getPolicyEnvMap(String resourceID, Message requestMsg) {
      * Gets the query response and set the status to OK.
      * @param query JAXB query object.
      * @return QueryResponseElement JAXB query response.
-     * @exception IDPPException
+     * @exception IDPPException if an error occurs
      */
     public QueryResponseElement getQueryResponse(QueryElement query)
     throws IDPPException {
@@ -694,7 +694,7 @@ public QueryResponseElement getQueryResponse(QueryElement query)
      * Gets the modify response and set the status to OK.
      * @param modify JAXB modify object.
      * @return ModifyResponseElement JAXB modify response.
-     * @exception IDPPException
+     * @exception IDPPException if an error occurs
      */
     public ModifyResponseElement getModifyResponse(ModifyElement modify)
     throws IDPPException {
@@ -809,7 +809,7 @@ private void initInteraction(boolean isQuery, Map interactResourceMap,
      * @param resource resource that needs an interaction
      * @param msg Message.
      * @return Confirm Interaction JAXB Confirm Element
-     * @exception IDPPException
+     * @exception IDPPException if an error occurs
      */
     private Confirm getInteractConfirmElement(
          boolean isQuery, String resource, Message msg) 
@@ -853,7 +853,7 @@ private Confirm getInteractConfirmElement(
      * @param resource resource that needs an interaction
      * @param msg Message.
      * @return List list of Interaction JAXB TextElements.
-     * @exception IDPPException
+     * @exception IDPPException if an error occurs
      */
 
     private List getInteractTextElements(
@@ -1056,7 +1056,7 @@ private String getLanguage(Message requestMsg) {
     /**
      * Gets the service instance update header.
      * 
-     * @exception SOAPFaultException.
+     * @exception SOAPFaultException .
      */
     private ServiceInstanceUpdateHeader getServiceInstanceUpdateHeader()
       throws SOAPFaultException {
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 ac77564875..6ff0a88032 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
@@ -106,7 +106,7 @@ public PersonalProfile() {
       *                       it's value.
       * @return Map map of processed query items and the correspoding list 
       * of results.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
       public Map queryData(Object credential,
                           String resourceID, 
@@ -416,7 +416,7 @@ private IDPPContainer getIDPPContainer(
        * @param String userDN.
        * @param List list of DSTQueryItems.
        * @return Map of user attribute value pairs.
-       * @throws IDPPException.
+       * @throws IDPPException .
        */
       private Map getUserData(String userDN, List dstQueryItems) 
       throws IDPPException {
@@ -490,7 +490,7 @@ private Map getUserData(String userDN, List dstQueryItems)
      *                       it's value. 
      * @param request a Document object 
      * @return true if successful in modifying the data.
-     * @exception IDPPException.
+     * @exception IDPPException .
      */
       public boolean modifyData(Object credential,
                                 String resourceID,
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..b1c2544ae7 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -64,7 +65,7 @@ public IDPPAddressCard() {
       * Gets the container object i.e. LegalIdentity JAXB Object 
       * @param userMap user map
       * @return LegalIdentityElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
 
@@ -229,7 +230,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select select expression
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
       throws IDPPException {
@@ -269,7 +270,7 @@ public Map getDataMapForSelect(String select, List data)
      * @param expContext Given select expression context.
      * @param dataElement DataElement. 
      * @return Map Modifiable attribute value pair.
-     * @exception IDPPException.
+     * @exception IDPPException .
      */
     private Map getDataMap(String expContext, Object dataElement)
        throws IDPPException {
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..9aa80ce767 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;
@@ -309,7 +310,7 @@ protected DSTInteger getDSTInteger(String value) {
       * Gets AnalyzedName JAXB Object.
       * @param userMap user map
       * @return AnalyzedNameType JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      protected AnalyzedNameType getAnalyzedName(Map userMap) 
      throws IDPPException {
@@ -366,7 +367,7 @@ userMap, getAttributeMapper().getDSAttribute(
       * This method is an implementation of IDPPContainer. 
       * @param userMap user map
       * @return Document XML document representation of container.
-      * @exception IDPPException
+      * @exception IDPPException if an error occurs
       */
      public Document toXMLDocument(Map userMap) 
      throws IDPPException {
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..7ef6ff87c6 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -61,7 +62,7 @@ public IDPPCommonName() {
       * Gets the common name jaxb element 
       * @param userMap user map
       * @return CommonNameElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
 
@@ -167,7 +168,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @throws IDPPException.
+      * @throws IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
@@ -284,7 +285,7 @@ private Map getCommonNameMap(Object obj, Map map)
       * @param dataObject list of data objects
       * @param map map to be filled in
       * @return Map map to be returned
-      * @exception IDPPException
+      * @exception IDPPException if an error occurs
       */
      private Map getAltCNMap(List dataObject, Map map) throws IDPPException {
         IDPPUtils.debug.message("IDPPCommonName:getAltCNMap:Init");
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..659950a98c 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -61,7 +62,7 @@ public IDPPDemographics() {
       * Gets the common name jaxb element 
       * @param userMap user map
       * @return CommonNameElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
 
@@ -172,7 +173,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Map Attribute key value pair map for the given select.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
@@ -261,7 +262,7 @@ public Map getDataMapForSelect(String select, List data)
       * @param obj DemographicsType JAXB object.
       * @param map map that sets attribute/value pairs.
       * @return Map Attribute value pair map that needs to be modified. 
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      private Map getDemographicsMap(Object obj, Map map) 
         throws IDPPException {
@@ -303,7 +304,7 @@ private Map getDemographicsMap(Object obj, Map map)
       * @param dataObject list of data objects
       * @param map map to be filled in
       * @return Map map to be returned
-      * @exception IDPPException
+      * @exception IDPPException if an error occurs
       */
      private Map getLanguageMap(List dataObject, Map map) throws IDPPException {
         IDPPUtils.debug.message("IDPPDemographics:getLanguageMap:Init");
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..0a18b24660 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -59,7 +60,7 @@ public IDPPEmergencyContact() {
       * Gets the Emergency Contact Object 
       * @param userMap user map
       * @return EmergencyContactElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPEmergencyContact:getContainerObject:Init");
@@ -108,7 +109,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
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..82b267eaf6 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -59,7 +60,7 @@ public IDPPEmploymentIdentity() {
       * Gets the employment identity jaxb object 
       * @param userMap user map
       * @return EmploymentIdentityElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
          IDPPUtils.debug.message("IDPPEmploymentIdentity:getContainerObj:Init");
@@ -141,7 +142,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
@@ -230,7 +231,7 @@ private Map getEmploymentIdentityMap(Object obj, Map map)
       * @param dataObject list of data objects
       * @param map map to be filled in
       * @return Map map to be returned
-      * @exception IDPPException
+      * @exception IDPPException if an error occurs
       */
      private Map getAltOMap(List dataObject, Map map) throws IDPPException {
         IDPPUtils.debug.message("IDPPEmploymentIdentity:getAltOMap:Init");
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..fb72e10c2b 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -59,7 +60,7 @@ public IDPPEncryptKey() {
       * Gets the common name jaxb element 
       * @param userMap user map
       * @return EncryptKeyElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPEncryptKey:getContainerObject:Init");
@@ -124,7 +125,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @throws IDPPException.
+      * @throws IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
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..df82e28e03 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -64,7 +65,7 @@ public IDPPExtensionContainer() {
       * Gets the container extension jaxb object.
       * @param userMap user map
       * @return ExtensionElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPContainers:getContainerObject:Init");
@@ -175,7 +176,7 @@ private String getExtAttributeName(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
@@ -231,7 +232,7 @@ public Map getDataMapForSelect(String select, List data)
       * Gets the PP ISExtension element.
       * @param attrName Extension attribute name.
       * @param attrValue Extension attribute value.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */ 
      private PPISExtensionElement getISExtension(
          String attrName, String attrValue) throws 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 3e2c2c3d16..e525df29eb 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -61,7 +62,7 @@ public IDPPFacade() {
       * Gets the Facade JAXB Element. 
       * @param userMap user map
       * @return FacadeElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
 
@@ -162,7 +163,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select Expression.
       * @param data list of new data objects.
       * @return Map Key/value data map.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
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..5ce698704c 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -57,7 +58,7 @@ public IDPPInformalName() {
       * Gets the Informal Name JAXB Object 
       * @param userMap user map
       * @return InformalNameElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPInformalName:getInformalName:Init");
@@ -107,7 +108,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select Excepression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @throws IDPPException.
+      * @throws IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
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..3f064bed18 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -60,7 +61,7 @@ public IDPPLegalIdentity() {
       * Gets the container object i.e. LegalIdentity JAXB Object 
       * @param userMap user map
       * @return LegalIdentityElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
 
@@ -134,7 +135,7 @@ userMap, getAttributeMapper().getDSAttribute(
       * Gets the AltIDType JAXB Object.
       * @param userMap user data
       * @return AltIDType JAXB Object
-      * @exception IDPPException
+      * @exception IDPPException if an error occurs
       */
      private AltIDType getAltID(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPLegalIdentity:getAltID:Init");
@@ -175,7 +176,7 @@ userMap, getAttributeMapper().getDSAttribute(
       * Gets the VATType JAXB Object.
       * @param userMap user data
       * @return VATType JAXB Object
-      * @exception IDPPException
+      * @exception IDPPException if an error occurs
       */
      private VATType getVAT(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPLegalIdentity:getVATType:Init");
@@ -290,7 +291,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select select expression
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
@@ -490,7 +491,7 @@ private Map getLegalIdentityMap(Object obj, Map map)
       * @param dataObject List of altID objects
       * @param map map of attrib/val pairs
       * @return Map map of attrib/val pairs
-      * @exception IDPPException
+      * @exception IDPPException if an error occurs
       */ 
      private Map getAltIDMap(List dataObject, Map map) throws IDPPException {
         //Currently, we handle only one AltID.
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..94ad62ad40 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -60,7 +61,7 @@ public IDPPMsgContact() {
       * Gets the common name jaxb element 
       * @param userMap user map
       * @return InformalNameElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPMsgContact:getContainerObject:Init");
@@ -98,7 +99,7 @@ public Object getContainerObject(Map userMap) throws IDPPException {
       * @param entry MsgContact Entry
       * @userMap UserData Map.
       * @return MsgContactElement. 
-      * @exception JAXBException.
+      * @exception JAXBException .
       */
      private MsgContactElement parseEntry(String entry, Map userMap)
         throws JAXBException {
@@ -197,7 +198,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @throws IDPPException.
+      * @throws IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
         throws IDPPException {
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..4b0f4b533c 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
@@ -24,6 +24,7 @@
  *
  * $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;
@@ -59,7 +60,7 @@ public IDPPSignKey() {
       * Gets the common name jaxb element 
       * @param userMap user map
       * @return InformalNameElement JAXB Object.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Object getContainerObject(Map userMap) throws IDPPException {
         IDPPUtils.debug.message("IDPPSignKey:getContainerObject:Init");
@@ -126,7 +127,7 @@ public Set getContainerAttributesForSelect(String select) {
       * @param select Select expression.
       * @param data list of new data objects.
       * @return Attribute key value pair for the given select.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data) 
      throws IDPPException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPContainer.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPContainer.java
index 634150748d..bed8b501c3 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPContainer.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPContainer.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPPContainer.java,v 1.2 2008/06/25 05:47:17 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.liberty.ws.idpp.plugin;
@@ -49,7 +50,7 @@ public interface IDPPContainer {
       * Converts all the supported container values into an XML document.
       * @param userMap user data map
       * @return Document XML representation of container.
-      * @exception IDPPException. 
+      * @exception IDPPException .
       */
      public Document toXMLDocument(Map userMap) throws IDPPException;
 
@@ -71,7 +72,7 @@ public interface IDPPContainer {
       * @param select select expression.
       * @param data list of new data objects.
       * @return Map Attribute value pair for the given select and data.
-      * @exception IDPPException.
+      * @exception IDPPException .
       */
      public Map getDataMapForSelect(String select, List data)
      throws IDPPException;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPExtension.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPExtension.java
index 98992b2427..22fee0ccb0 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPExtension.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/IDPPExtension.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPPExtension.java,v 1.2 2008/06/25 05:47:17 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -51,7 +52,7 @@ public interface IDPPExtension {
      *                   
      * @return list of PPISExtensionElement JAXB
      * Objects.
-     * @exception IDPPException.
+     * @exception IDPPException .
      */
     public List getExtAttributes() throws IDPPException;
 
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..5f62d56ec7 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;
@@ -253,7 +253,7 @@ private InteractionManager() {
      * @throws InteractionException for generic interaction error
      * @throws InteractionRedirectException if user agent is redirected to 
      *                     WSP for resource owner interactions
-     * @throws SOAPBindingException  for generic SOAP binding errors
+     * @throws SOAPBindingException for generic SOAP binding errors
      * @throws SOAPFaultException if the response message has SOAP fault
      *
      * 
@@ -398,7 +398,7 @@ public Message resendRequest(String returnToURL,
      * @throws InteractionException for generic interaction error
      * @throws InteractionRedirectException if user agent is redirected to 
      *                     WSP for resource owner interactions
-     * @throws SOAPBindingException  for generic SOAP errors
+     * @throws SOAPBindingException for generic SOAP errors
      * @throws SOAPFaultException if the response message has SOAP fault
      *
      * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interfaces/Authorizer.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interfaces/Authorizer.java
index cd0ad07feb..e61f2f47c2 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interfaces/Authorizer.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/interfaces/Authorizer.java
@@ -24,6 +24,7 @@
  *
  * $Id: Authorizer.java,v 1.2 2008/06/25 05:47:18 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.liberty.ws.interfaces;
@@ -97,7 +98,7 @@ public boolean isAuthorized(Object credential, String action,
      *          com.sun.identity.liberty.ws.soapbinding.Message.
      * @return AuthorizationDecision object contains authorization 
      *             decision information for the given resource.
-     * @exception Exception
+     * @exception Exception if an error occurs while making the authorization decision.
      */
     public Object getAuthorizationDecision(
                   Object credential,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSRequest.java
index f2a4f701f8..96da658cb8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSRequest.java
@@ -24,6 +24,7 @@
  *
  * $Id: PAOSRequest.java,v 1.3 2008/06/25 05:47:20 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -214,7 +215,7 @@ public String toXMLString() throws PAOSException {
      *  @param declareNS determines whether or not the namespace is declared
      *      within the Element.
      *  @return a String representation of this Object.
-     *  @exception PAOSException ,if it could not create String object.
+     *  @exception PAOSException if it could not create String object.
      */
     public String toXMLString(boolean includeNSPrefix,boolean declareNS)
         throws PAOSException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSResponse.java
index 1f688c24af..483e5590f9 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/paos/PAOSResponse.java
@@ -24,6 +24,7 @@
  *
  * $Id: PAOSResponse.java,v 1.3 2008/06/25 05:47:20 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -167,7 +168,7 @@ public String toXMLString() throws PAOSException {
      *  @param declareNS determines whether or not the namespace is declared
      *      within the Element.
      *  @return a String representation of this Object.
-     *  @exception PAOSException ,if it could not create String object.
+     *  @exception PAOSException if it could not create String object.
      */
     public String toXMLString(boolean includeNSPrefix,boolean declareNS)
         throws PAOSException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/LibSecurityTokenProvider.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/LibSecurityTokenProvider.java
index f22f3cf821..06e9e9743e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/LibSecurityTokenProvider.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/LibSecurityTokenProvider.java
@@ -220,7 +220,7 @@ public void setCertificate(X509Certificate cert)
     /**
      * Gets X509 certificate from key store based on the certAlias
      *
-     * @return the X509Certificate in the keystore.
+     * @return the X509Certificate in the keystore.
      * @throws SecurityTokenException if there is an error retrieving
      *         the certificate.
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityAssertion.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityAssertion.java
index b037426725..e5fd3488c7 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityAssertion.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityAssertion.java
@@ -24,6 +24,7 @@
  *
  * $Id: SecurityAssertion.java,v 1.3 2009/10/01 18:42:07 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.liberty.ws.security;
@@ -299,8 +300,6 @@ public Subject getBearerSubject() {
      * @return A string containing the valid XML for this element.
      * By default name space name is prepended to the element name
      * example <saml:Assertion>.
-     *
-     * @return the String representation of this element.
      */
     public java.lang.String toString() {
         // call toString() with includeNS true by default and declareNS false
@@ -312,7 +311,7 @@ public java.lang.String toString() {
      * element.
      *
      * @param includeNS if true prepends all elements by their Namespace
-     *        name example <saml:Assertion>;
+     *        name example <saml:Assertion>
      * @param declareNS if true includes the namespace within the generated
      *        XML.
      * @return A string containing the valid XML for this element.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenManagerImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenManagerImpl.java
index d43861f29c..b304041a84 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenManagerImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenManagerImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: SecurityTokenManagerImpl.java,v 1.3 2008/06/25 05:47:21 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -139,7 +140,7 @@ public String  getSAMLAuthenticationToken(String senderIdentity)
      *        Assertion (for AuthorizeRequester directive). If
      *        false, a SessionContextStatement will be included i
      *        the Assertion (for AuthenticationSessionContext
-     *        directive). In the case when both AuthorizeRequesterAuthorizeRequester
      *        and AuthenticationSessionContext directive need to be
      *        handled, use "true" as parameter here since the
      *        SessionContext will always be included in the
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenProvider.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenProvider.java
index 8d7faba905..982581e6f6 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenProvider.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SecurityTokenProvider.java
@@ -24,6 +24,7 @@
  *
  * $Id: SecurityTokenProvider.java,v 1.3 2008/06/25 05:47:21 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -104,7 +105,7 @@ public BinarySecurityToken getX509CertificateToken()
      * @return Assertion which contains an AuthenticationStatement.
      * @throws SecurityTokenException if the assertion could not be
      *        obtained.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public SecurityAssertion getSAMLAuthenticationToken(
 				NameIdentifier senderIdentity)
@@ -118,7 +119,7 @@ public SecurityAssertion getSAMLAuthenticationToken(
      * @param senderIdentity name identifier of the sender.
      * @param invocatorSession SessionContext of  the invocation
      *        identity, it is normally obtained by the credential reference in
-     *        the SAML AttributeDesignator for discovery resource
+     *        the SAML AttributeDesignator for discovery resource
      *        offering which is part of the liberty ID-FF
      *        AuthenResponse.
      * @param resourceID id for the resource to be accessed.
@@ -140,7 +141,7 @@ public SecurityAssertion getSAMLAuthenticationToken(
      * @param recipientProviderID recipient's provider ID.
      * @return SecurityAssertion object.
      * @throws SecurityTokenException if the assertion could not be obtained
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public SecurityAssertion getSAMLAuthorizationToken(
 				NameIdentifier senderIdentity,
@@ -172,7 +173,7 @@ public SecurityAssertion getSAMLAuthorizationToken(
      *        Assertion (for AuthorizeRequester directive). If
      *        false, a SessionContextStatement will be included i
      *        the Assertion (for AuthenticationSessionContext
-     *        directive). In the case when both AuthorizeRequesterAuthorizeRequester
      *        and AuthenticationSessionContext directive need to be
      *        handled, use "true" as parameter here since the
      *        SessionContext will always be included in the
@@ -252,7 +253,7 @@ public SecurityAssertion getSAMLBearerToken(
      *        false, a SessionContextStatement will be included
      *        in the Assertion (for AuthenticationSessionContext
      *        directive). In the case when both AuthorizeRequester
-     *        and AuthenticationSessionContext/code> directive need to be
+     *        and AuthenticationSessionContext directive need to be
      *	      handled, use "true" as parameter here since the
      *	      SessionContext will always be included in the
      *	      ResourceAccessStatement.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SessionSubject.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SessionSubject.java
index 91f45ef4e6..064638392d 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SessionSubject.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/security/SessionSubject.java
@@ -24,6 +24,7 @@
  *
  * $Id: SessionSubject.java,v 1.2 2008/06/25 05:47:22 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -52,7 +53,7 @@
 public class SessionSubject extends FSSubject {
     
     /**
-     * Constructs a SessionSubject object from a
+     * Constructs a SessionSubject object from a
      * NameIdentifier object, SubjectConfirmation and
      * IDPProvidedNameIdentifier object.
      *
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/ConsentHeader.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/ConsentHeader.java
index 50a5ed4ada..cc61de9e34 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/ConsentHeader.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/ConsentHeader.java
@@ -24,6 +24,7 @@
  *
  * $Id: ConsentHeader.java,v 1.2 2008/06/25 05:47:22 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -134,8 +135,8 @@ public String getId() {
     }
 
     /**
-     * Returns value of mustUnderstand attribute.
-     * @return value of mustUnderstand attribute
+     * Returns value of mustUnderstand attribute.
+     * @return value of mustUnderstand attribute
      */
     public Boolean getMustUnderstand() {
         return mustUnderstand;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPReceiver.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPReceiver.java
index 39427ee6a9..6467df8008 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPReceiver.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/soapbinding/SOAPReceiver.java
@@ -24,6 +24,7 @@
  *
  * $Id: SOAPReceiver.java,v 1.3 2008/06/25 05:47:23 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /*
@@ -74,7 +75,7 @@
  * binding SM schema and store in a static HashMap. Each 
  * RequestHandler is associated with a unique key. When a web
  * service client uses Client to send request, the SOAP URL must
- * be in the format of 'this_servlet_URL>/key'. The SOAPReceiver
+ * be in the format of {@code 'this_servlet_URL>/key'}. The SOAPReceiver
  * will parse the SOAP URL to get the key and use it to find corresponding
  * RequestHandler. After it is done processing, it will invoke
  * RequestHandler.processRequest to let web service to do further
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/ProviderUtil.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/ProviderUtil.java
index 846fbd1cb2..4ac5dc896a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/ProviderUtil.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/liberty/ws/util/ProviderUtil.java
@@ -24,6 +24,7 @@
  *
  * $Id: ProviderUtil.java,v 1.4 2008/08/06 17:28:12 exu Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.liberty.ws.util;
@@ -58,7 +59,7 @@ public class ProviderUtil {
      * class name is specified with property 
      * "com.sun.identity.liberty.ws.uti.providerManagerClass"
      * in FederationConfig.
-     * @return ProviderManagerProviderManager.
      */
     public static ProviderManager getProviderManager() {
         return providerManager;
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/MultiProtocolUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/MultiProtocolUtils.java
index b1121fa520..7073b41ae3 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/MultiProtocolUtils.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/multiprotocol/MultiProtocolUtils.java
@@ -24,7 +24,7 @@
  *
  * $Id: MultiProtocolUtils.java,v 1.4 2009/03/20 21:06:32 weisun2 Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.multiprotocol;
@@ -343,7 +343,7 @@ public static void invalidateSession(Object session,
      *         LOGOUT_NO_ACTION_STATUS  - single loglout not
      *                                                 performed.
      * @return single logout status in string form. Possible values:
-     *         IFSConstants.LOGOUT_SUCCESS,
+     *         IFSConstants.LOGOUT_SUCCESS,
      *         IFSConstants.LOGOUT_FAILURE
      */
     public static String getLogoutStatus(int status) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/datastore/DataStoreProvider.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/datastore/DataStoreProvider.java
index 030e565494..a0a2a49f5b 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/datastore/DataStoreProvider.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/datastore/DataStoreProvider.java
@@ -24,6 +24,7 @@
  *
  * $Id: DataStoreProvider.java,v 1.2 2008/06/25 05:47:27 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
@@ -37,7 +38,7 @@
 
 
 /**
- * Interface used for storing & retrieving information. Also used to search
+ * Interface used for storing & retrieving information. Also used to search
  * user.
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/monitoring/MonitorManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/monitoring/MonitorManager.java
index 231bad9433..d02b46980f 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/monitoring/MonitorManager.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/monitoring/MonitorManager.java
@@ -24,6 +24,7 @@
  *
  * $Id: MonitorManager.java,v 1.1 2009/06/19 02:48:04 bigfatrat Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.plugin.monitoring;
@@ -68,7 +69,6 @@ public final class MonitorManager {
      * Returns an instance of the FedMonAgent object.
      *
      * @return instance of Logger object.
-     * @exception LogException if there is an error.
      */
     public static FedMonAgent getAgent() {
         if (agentProvider != null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/session/SessionProvider.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/session/SessionProvider.java
index 49ccb15679..41ee77123b 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/session/SessionProvider.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/plugin/session/SessionProvider.java
@@ -25,7 +25,7 @@
  * $Id: SessionProvider.java,v 1.7 2008/06/25 05:47:28 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.plugin.session;
@@ -278,7 +278,7 @@ public void addListener(Object session, SessionListener listener)
      * Returns the time left for this session in seconds.
      * @param session Session object.
      * @return The time left for this session.
-     * @exception A SessionException is thrown if the session reached its maximum
+     * @exception SessionException if the session reached its maximum
      * session time, or the session was destroyed, or there was an error during
      * communication with session service.
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/sae/api/SecureAttrs.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/sae/api/SecureAttrs.java
index 8e39ea58ea..25509f5f60 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/sae/api/SecureAttrs.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/sae/api/SecureAttrs.java
@@ -25,6 +25,7 @@
  * $Id: SecureAttrs.java,v 1.12 2009/03/31 17:18:10 exu Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.sae.api;
@@ -47,7 +48,7 @@
  * Exchange" (SAE) feature. The class uses off the shelf digital
  * signing and encryption algorithms to generate tamperproof/nonrepudiable
  * strings representing attribute maps and to verify these strings.
- * Typical SAE usage is to securely send attributes (authentication &
+ * Typical SAE usage is to securely send attributes (authentication &
  * use profile data) from an asserting application (eg running on an IDP) to 
  * a relying application (eg running on an SP). In this scenario the
  * asserting party uses the "signing" interfaces to generate secure
@@ -293,7 +294,7 @@ public class SecureAttrs
 
     /**
      * Returns an instance to perform crypto operations.
-     *  @param name 
+     *  @param name the name of the SecureAttrs instance to return
      *  @return SecureAttrs instance.
      * 
      */
@@ -307,7 +308,7 @@ public static synchronized SecureAttrs getInstance(String name)
      * Use SecureAttrs.getIstance(name) to obtain the instance.
      * @param name Name of the SecureAttrs instance.
      * @param type Cryptographic key type. Possible values are
-     *         SecureAttrs.SAE_CRYPTO_TYPE_SYM, and
+     *         SecureAttrs.SAE_CRYPTO_TYPE_SYM, and
      *         SecureAttrs.SAE_CRYPTO_TYPE_ASYM
      * @param properties : please see SAE_CONFIG_* constants for configurable 
      *                     values.
@@ -572,12 +573,12 @@ public Map getRawAttributesFromEncodedData(String str, String encSecret)
 
     /** 
      * This interface allows to set the private to be used for signing
-     * as an alternative to passing down SAE_CONFIG_PRIVATE_KEY_ALIAS
+     * as an alternative to passing down SAE_CONFIG_PRIVATE_KEY_ALIAS
      * via init. Use this interface if you do not want
      * SecureAttr to obtain the signing key from a configured keystore.
      * To use this key during signing, specify secret as null.
-     * @param privatekey
-     * 
+     * @param privatekey the private key to be used for signing
+     *
      */
     public void setPrivateKey(PrivateKey privatekey)
     {
@@ -588,7 +589,7 @@ public void setPrivateKey(PrivateKey privatekey)
      * This interface allows to register a public key to be used for signature
      * verification. Use this interface if you do not want SecureAttrs to
      * obtain public keys from a configured keystore.
-     * @param pubkeyalias
+     * @param pubkeyalias the alias under which to register the public key
      * @param x509certificate instance.
      * 
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/SAMLClient.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/SAMLClient.java
index a14d66a375..a6d98caf6e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/SAMLClient.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/SAMLClient.java
@@ -25,7 +25,7 @@
  * $Id: SAMLClient.java,v 1.6 2008/08/19 19:11:11 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.saml; 
@@ -357,7 +357,7 @@ public static boolean setLocalFlag(URL url) {
      * wrapped around the request object. 
      * @param req A SAML request object 
      * @return a SOAPMessage 
-     * @exception SAMLException
+     * @exception SAMLException if a SAML error occurs
      */
     private static String createSOAPMessage(Request req)
                                throws SAMLException {
@@ -593,7 +593,7 @@ private static Response getSAMLResponse(String xmlString)
      * @param samlresponse A SAML Response object
      * @param alist a List  
      * @return a List object representing a list of Assertion
-     * @exception SAMLException
+     * @exception SAMLException if a SAML error occurs
      */
     private static List getAssertionList(Response samlresponse, List alist) 
                                          throws SAMLException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Attribute.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Attribute.java
index acd5b272fa..3e39d3e6cb 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Attribute.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Attribute.java
@@ -24,6 +24,7 @@
  *
  * $Id: Attribute.java,v 1.4 2008/09/03 22:28:40 weisun2 Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -247,7 +248,7 @@ public Attribute(String name, String nameSpace, String attributeValue)
      *
      * @return A list of DOM Element representing the
      * AttributeValue block.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public  List getAttributeValue()  throws SAMLException {
         return _attributeValue; 
@@ -257,7 +258,7 @@ public  List getAttributeValue()  throws SAMLException {
      * Adds AttributeValue to the Attribute.
      *
      * @param value A String representing AttributeValue. 
-     * @exception SAMLException 
+     * @exception SAMLException if a SAML error occurs
      */
     public void addAttributeValue(String value) throws SAMLException {
         if (value == null || value.length() == 0) {
@@ -302,7 +303,7 @@ public void addAttributeValue(String value) throws SAMLException {
      *
      * @param element An Element object representing
      *        AttributeValue.
-     * @exception SAMLException 
+     * @exception SAMLException if a SAML error occurs
      */
     public void addAttributeValue(Element element) throws SAMLException {
         if (element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Evidence.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Evidence.java
index f5686e7cd1..39efe29fb7 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Evidence.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/Evidence.java
@@ -24,6 +24,7 @@
  *
  * $Id: Evidence.java,v 1.2 2008/06/25 05:47:32 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.assertion;
@@ -60,7 +61,7 @@ public Evidence(org.w3c.dom.Element assertionSpecifierElement)
     }    
     
     /**
-     * Constructs a new Evidence> element containing a
+     * Constructs a new Evidence element containing a
      * set of Assertion objects.
      *
      * @param evidenceContent A set of Assertion and
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/EvidenceBase.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/EvidenceBase.java
index 640f9ad42d..ec546a9035 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/EvidenceBase.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/EvidenceBase.java
@@ -24,6 +24,7 @@
  *
  * $Id: EvidenceBase.java,v 1.2 2008/06/25 05:47:32 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.assertion;
@@ -119,7 +120,7 @@ public EvidenceBase(org.w3c.dom.Element assertionSpecifierElement)
     }    
     
     /**
-     * Constructs a new Evidence> element containing a
+     * Constructs a new Evidence element containing a
      * set of Assertion objects.
      *
      * @param evidenceContent A set of Assertion and
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectConfirmation.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectConfirmation.java
index fbe3d0e6b9..6f12b5edde 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectConfirmation.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectConfirmation.java
@@ -24,6 +24,7 @@
  *
  * $Id: SubjectConfirmation.java,v 1.2 2008/06/25 05:47:33 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
   
 package com.sun.identity.saml.assertion;
@@ -59,7 +60,7 @@ public class SubjectConfirmation {
      *
      * @param subjectConfirmationElement a DOM Element representing the 
      *        SubjectConfirmation object. 
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public SubjectConfirmation(org.w3c.dom.Element subjectConfirmationElement) 
         throws SAMLException 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectLocality.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectLocality.java
index f8f7810306..336a26b020 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectLocality.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/assertion/SubjectLocality.java
@@ -24,6 +24,7 @@
  *
  * $Id: SubjectLocality.java,v 1.2 2008/06/25 05:47:33 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.assertion;
@@ -119,7 +120,7 @@ public java.lang.String getIPAddress() {
     }
    
     /**
-     * Sets the DNS address for SubjectLocality> locality.
+     * Sets the DNS address for SubjectLocality locality.
      *
      * @param dnsAddress A String representation of DNS address.
      * @return true indicating the success of the operation.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLConstants.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLConstants.java
index 32cc4e3250..89eeabb14f 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLConstants.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLConstants.java
@@ -25,6 +25,7 @@
  * $Id: SAMLConstants.java,v 1.17 2009/06/12 22:21:39 mallas Exp $
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.common;
@@ -72,7 +73,7 @@ public final class SAMLConstants
     public static final String RIGHT_ANGLE              = ">";
 
     /**
-     * String to identify "/>".
+     * String to identify {@code "/>"}.
      */
     public static final String END_ELEMENT              = "/>";
 
@@ -233,7 +234,7 @@ public final class SAMLConstants
                 "urn:oasis:names:tc:SAML:1.0:ghpp";
 
     /**
-     * String used in the ActionNamespace attribute to refer to
+     * String used in the ActionNamespace attribute to refer to
      * common sets of actions to perform on resources. 
      *
      * Title: UNIX File Permissions
@@ -243,12 +244,15 @@ public final class SAMLConstants
      * digit numeric code: extended user group world 
      * Where the extended access permission has the value  
      * 
                    
-     * 
                  • +2 if sgid is set
-     * 
                  • +4 if suid is set
-     * The user group and world access permissions have the value 
-     * 
                  • +1 if execute permission is granted
-     * 
                  • +2 if write permission is granted
-     * 
                  • +4 if read permission is granted
+     * 
                  • +2 if sgid is set
                    • 
+     * 
                  • +4 if suid is set
                    • 
+     * 
                  
+     * The user group and world access permissions have the value
+     * 
                    
+     * 
                  • +1 if execute permission is granted
                    • 
+     * 
                  • +2 if write permission is granted
                    • 
+     * 
                  • +4 if read permission is granted
                    • 
+     * 
                  
      * For example 0754 denotes the UNIX file access permission: user read,
      * write and execute, group read and execute and world read. 
      *
@@ -1422,7 +1426,7 @@ public final class SAMLConstants
     public static final String TAG_KEYNAME = "KeyName";
 
     /**
-     * Tag name for KeyValue.
+     * Tag name for KeyValue.
      */
     public static final String TAG_KEYVALUE = "KeyValue";
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLServiceManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLServiceManager.java
index 7d4c7d9b45..2f3695d6f9 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLServiceManager.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLServiceManager.java
@@ -24,6 +24,7 @@
  *
  * $Id: SAMLServiceManager.java,v 1.10 2008/12/15 23:02:19 hengming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.common;
@@ -90,7 +91,7 @@ private SAMLServiceManager() {
 
     /**
      * This class contains the mapping between supported target 
-     * host:port(target) and its saml-aware-servlet URL & sourceid.
+     * host:port(target) and its saml-aware-servlet URL & sourceid.
      * target is the primary Key.
      */
     public static class SiteEntry {
@@ -294,7 +295,7 @@ public SOAPEntry(String sourceid, String soapUrl, String authType,
         /**
          * Returns certificate alias can be used to verify a signature signed
          * by the partner site. It is used when the signature doesn't contain
-         * a <KeyInfo> element.
+         * a <KeyInfo> element.
          * @return String certificate alias.
          */
         public String getCertAlias() {return certalias;}
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLUtils.java
index 9ec9bbd627..d4283dd4b7 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLUtils.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/common/SAMLUtils.java
@@ -25,7 +25,7 @@
  * $Id: SAMLUtils.java,v 1.16 2010/01/09 19:41:06 qcheng Exp $
  *
  * Portions Copyrighted 2012-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.saml.common;
@@ -814,8 +814,8 @@ public static boolean postYN(String targetIn) {
     }
     
     /**
-     * Replaces every occurence of ch with 
-     * "&#<ascii code of ch>;"
+     * Replaces every occurence of ch with
+     * {@code "&#;"}
      * @param srcStr orginal string to to be encoded.
      * @param ch the charactor needs to be encoded.
      * @return encoded string
@@ -1542,7 +1542,7 @@ public static Map processArtifact(String[] artifact, String target)
      * @param request HttpServletRequest
      * @param response HttpServletResponse
      * @param attrMap Attribute Map 
-     * @exception if failed to create Session
+     * @exception SAMLException if failed to create Session
      */
     public static Object generateSession(HttpServletRequest request,
         HttpServletResponse response, 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/DefaultAttributeMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/DefaultAttributeMapper.java
index 6233cc6313..23d64d0776 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/DefaultAttributeMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/DefaultAttributeMapper.java
@@ -24,6 +24,7 @@
  *
  * $Id: DefaultAttributeMapper.java,v 1.4 2009/09/22 23:04:36 exu Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -80,7 +81,6 @@ public DefaultAttributeMapper() {}
      * SubjectConfirmationData contains TEXT node only, then the method
      * returns the concatenated string of all the TEXT nodes. Otherwise,
      * it returns null.
-     * 
                  
      * @param query the AttributeQuery object.
      * @see com.sun.identity.saml.plugins.AttributeMapper#getSSOTokenID
      */
@@ -105,7 +105,6 @@ public String getSSOTokenID(AttributeQuery query) {
      * This method exams the SubjectConfirmationData of the Subject in the
      * AttributeQuery. It returns the first Assertion that contains at least
      * one AuthenticationStatement.
-     * 
                  
      * @see com.sun.identity.saml.plugins.AttributeMapper#getSSOAssertion
      */
     public Assertion getSSOAssertion(AttributeQuery query) {
@@ -157,7 +156,6 @@ public Assertion getSSOAssertion(AttributeQuery query) {
      * of the query. If there is no AttributeDesignator in the query,
      * attributes of services specified as userServiceNameList in
      * amSAML.properties will be returned.
-     * 
                  
      *
      * @param query the AttributeQuery object.
      * @param sourceID the Source Identifier.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/PartnerAccountMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/PartnerAccountMapper.java
index 0d27330a62..528e96f080 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/PartnerAccountMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/plugins/PartnerAccountMapper.java
@@ -25,6 +25,7 @@
  * $Id: PartnerAccountMapper.java,v 1.4 2008/08/19 19:11:14 veiming Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.plugins;
@@ -101,7 +102,7 @@ public interface PartnerAccountMapper {
      * @param sourceID source ID for the site from which the subject
      *        originated.
      * @return Map which contains NAME and ORG keys,
-     *         value of the NAME key is the user DN, value of the
+     *         value of the NAME key is the user DN, value of the
      *         ORG is the user organization  DN. Returns empty map
      *         if the mapped user could not be obtained from the subject.
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AttributeQuery.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AttributeQuery.java
index 3a3155c8a7..ea53fe8245 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AttributeQuery.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AttributeQuery.java
@@ -24,6 +24,7 @@
  *
  * $Id: AttributeQuery.java,v 1.2 2008/06/25 05:47:36 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -74,7 +75,7 @@ protected AttributeQuery() {
      * tree that was built from the XML string.
      *
      * @param element the DOM tree element which contains an Attribute Query.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public AttributeQuery(Element element) throws SAMLException {
 	// make sure the input is not null
@@ -143,7 +144,7 @@ public AttributeQuery(Element element) throws SAMLException {
      * @param designators List of AttributeDesignators of this
      *        query.
      * @param theResource the Resource attribute of this query in String format.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public AttributeQuery(Subject theSubject,
 			List designators,
@@ -160,7 +161,7 @@ public AttributeQuery(Subject theSubject,
      * @param theSubject Subject of this query.
      * @param designators List of AttributeDesignators of this
      *        query.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */       
     public  AttributeQuery(Subject theSubject,
 				List designators) throws SAMLException {
@@ -172,7 +173,7 @@ public  AttributeQuery(Subject theSubject,
      * AttributeDesignator, and no Resource attribute.
      *
      * @param theSubject Subject of this query.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public AttributeQuery(Subject theSubject) throws SAMLException {
 	buildAttributeQuery(theSubject, null, null);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AuthenticationQuery.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AuthenticationQuery.java
index 919e37ae26..7f8a416ae8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AuthenticationQuery.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/AuthenticationQuery.java
@@ -24,6 +24,7 @@
  *
  * $Id: AuthenticationQuery.java,v 1.2 2008/06/25 05:47:36 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -136,7 +137,7 @@ public AuthenticationQuery(Element element) throws SAMLException {
      * @param subject the Subject of the AuthenticationQuery.
      * @param authMethod the AuthenticationMethod in string
      *        format. It could be null.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public AuthenticationQuery(Subject subject,
 				String authMethod) 
@@ -154,7 +155,7 @@ public AuthenticationQuery(Subject subject,
      * Constructor.
      *
      * @param subject The Subject of the AuthenticationQuery.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public AuthenticationQuery(Subject subject) throws SAMLException {
 	if (subject == null) {
@@ -196,7 +197,7 @@ public String toString() {
     }
 
     /**
-     * Returns a String representation of the  
+     * Returns a String representation of the {@code }
      * element.
      *
      * @param includeNS Determines whether or not the namespace qualifier
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Request.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Request.java
index d1dde90ad5..57360b7ef7 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Request.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Request.java
@@ -25,6 +25,7 @@
  * $Id: Request.java,v 1.2 2008/06/25 05:47:37 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.protocol;
@@ -465,7 +466,7 @@ public static Request parseXML(String xml) throws SAMLException {
      * Constructor.
      *
      * @param root Request element
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public Request(Element root) throws SAMLException {
 	// Make sure this is a Request
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Status.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Status.java
index d01a1d0bab..73daf0292b 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Status.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/protocol/Status.java
@@ -24,6 +24,7 @@
  *
  * $Id: Status.java,v 1.2 2008/06/25 05:47:37 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -155,7 +156,7 @@ public Status(Element status) throws SAMLException {
      * @param detail A DOM tree element that is the StatusDetail
      *        of the response. It could be null when there is no 
      *        StatusDetail.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public Status(StatusCode code, String message, Element detail) 
 						throws SAMLException {
@@ -179,7 +180,7 @@ public Status(StatusCode code, String message, Element detail)
     /**
      * Constructs a Status object from a StatusCode.
      * @param code StatusCode.
-     * @throws SAMLException
+     * @throws SAMLException if a SAML error occurs
      */
     public Status(StatusCode code) throws SAMLException {
 	if (code == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLAwareServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLAwareServlet.java
index cd8e69845a..758c1ba2b2 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLAwareServlet.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLAwareServlet.java
@@ -25,7 +25,7 @@
  * $Id: SAMLAwareServlet.java,v 1.5 2009/06/12 22:21:39 mallas Exp $
  *
  * Portions Copyrighted 2013 ForgeRock AS
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.saml.servlet;
 
@@ -67,13 +67,14 @@ public class SAMLAwareServlet extends HttpServlet {
      * Overrides doGet method to support SAML web browser artifact
      * profile in two ways:
      * 
                  -     * - Initiates SAML single sign-on
-     * - Accepts SAML artifact to complete single sign-on
+     * - Initiates <code>SAML</code> single sign-on
+     * - Accepts <code>SAML</code> artifact to complete single sign-on
      * 
                  
      *
      * @param request HttpServletRequest instance.
      * @param response HttpServletResponse instance.
-     * @throws IOException,ServletException if there is an error.
+     * @throws IOException if there is an error.
+     * @throws ServletException if there is an error.
      */
     public void doGet(HttpServletRequest request,HttpServletResponse response) 
                       throws IOException, ServletException {
@@ -117,7 +118,8 @@ public void doGet(HttpServletRequest request,HttpServletResponse response)
      *
      * @param request HttpServletRequest instance.
      * @param response HttpServletResponse instance.
-     * @throws IOException,ServletException if there is an error.
+     * @throws IOException if there is an error.
+     * @throws ServletException if there is an error.
      */
     public void doPost(HttpServletRequest request,HttpServletResponse response)
                        throws IOException, ServletException {
@@ -170,7 +172,7 @@ private List createArtifact(Object sso,String target,
      * @param request the HttpServletRequest object.
      * @param response the HttpServletResponse object.
      * @param target String representing the target host.
-     * @throws IOException  if there is an error.
+     * @throws IOException if there is an error.
      * @throws SAMLException if there is an error. 
      */
     private void IntersiteTransfer(HttpServletRequest request,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLPOSTProfileServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLPOSTProfileServlet.java
index 17b1835c37..5be40298ee 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLPOSTProfileServlet.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLPOSTProfileServlet.java
@@ -25,7 +25,7 @@
  * $Id: SAMLPOSTProfileServlet.java,v 1.4 2009/06/12 22:21:39 mallas Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.saml.servlet;
 
@@ -331,8 +331,8 @@ private Object getSession(HttpServletRequest request) {
      *
      * @param request HttpServletRequest instance
      * @param response HttpServletResponse instance
-     * @throws  ServletException if there is an error.
-     * @throws  IOException if there is an error.
+     * @throws ServletException if there is an error.
+     * @throws IOException if there is an error.
      */
     public void doPost(HttpServletRequest request, HttpServletResponse response)
                        throws ServletException, IOException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLSOAPReceiver.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLSOAPReceiver.java
index afb1d46dbc..0e922abd9e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLSOAPReceiver.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/servlet/SAMLSOAPReceiver.java
@@ -24,6 +24,7 @@
  *
  * $Id: SAMLSOAPReceiver.java,v 1.3 2009/06/12 22:21:39 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /*
@@ -178,7 +179,7 @@ public void init(ServletConfig config) throws ServletException {
      * @param req HttpServletRequest object.
      * @param resp HttpServletResponse object.
      * @throws ServletException if there is an error.
-     * @throws IOException if there is an error.
+     * @throws java.io.IOException if there is an error.
      */
     public void doPost(HttpServletRequest req,
                        HttpServletResponse resp)
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/AMSignatureProvider.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/AMSignatureProvider.java
index 92d1c0b19d..61c2a709bb 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/AMSignatureProvider.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/AMSignatureProvider.java
@@ -25,6 +25,7 @@
  * $Id: AMSignatureProvider.java,v 1.11 2009/08/29 03:06:47 mallas Exp $
  *
  * Portions Copyrighted 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.xmlsig;
@@ -75,7 +76,6 @@
 /**
  * SignatureProvider is an interface
  * to be implemented to sign and verify xml signature
- * 
                  
  */
 
 public class AMSignatureProvider implements SignatureProvider {
@@ -1987,7 +1987,7 @@ public boolean verifyWSSSignature(org.w3c.dom.Document document,
      * @param document the document to be validated
      * @param key the secret key to be used for validating signature
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the object cannot be signed
      */
     public boolean verifyWSSSignature(org.w3c.dom.Document document,
             java.security.Key key)
@@ -2005,7 +2005,7 @@ public boolean verifyWSSSignature(org.w3c.dom.Document document,
      * @param encryptAlias the certificate alias that may be used to decrypt
      *        the symmetric key that may be part of KeyInfo
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the object cannot be signed
      */
     public boolean verifyWSSSignature(org.w3c.dom.Document document,
                          java.security.Key key,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/JKSKeyProvider.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/JKSKeyProvider.java
index 127922d581..769067894b 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/JKSKeyProvider.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/JKSKeyProvider.java
@@ -24,6 +24,7 @@
  *
  * $Id: JKSKeyProvider.java,v 1.4 2008/06/25 05:47:38 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /*
@@ -49,7 +50,6 @@
  * The class JKSKeyProvider is a class
  * that is implemented to retrieve X509Certificates and Private Keys from
  * user data store.  
- * 
                  
  */
 public class JKSKeyProvider implements KeyProvider {
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/OfflineResolver.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/OfflineResolver.java
index 4289fd02a9..e904e21970 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/OfflineResolver.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/OfflineResolver.java
@@ -25,6 +25,7 @@
  * $Id: OfflineResolver.java,v 1.2 2008/06/25 05:47:38 qcheng Exp $
  *
  * Portions Copyrighted 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.xmlsig;
@@ -63,9 +64,9 @@ public boolean engineCanResolveURI(ResourceResolverContext context) {
    /**
     * Method engineResolve
     *
-    * @param uri
-    * @param BaseURI
-    * @throws ResourceResolverException
+    * @param uri the URI attribute to resolve
+    * @param BaseURI the base URI against which the URI is resolved
+    * @throws ResourceResolverException if an error occurs
     */
    public XMLSignatureInput engineResolve(Attr uri, String BaseURI) throws ResourceResolverException {
 
@@ -99,8 +100,8 @@ public XMLSignatureInput engineResolve(Attr uri, String BaseURI) throws Resource
    /**
     * We resolve http URIs without fragment.
     *
-    * @param uri
-    * @param BaseURI
+    * @param uri the URI attribute to resolve
+    * @param BaseURI the base URI against which the URI is resolved
     */
    public boolean engineCanResolve(Attr uri, String BaseURI) {
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/SignatureProvider.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/SignatureProvider.java
index becce905ed..46dcc4c89a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/SignatureProvider.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/SignatureProvider.java
@@ -24,6 +24,7 @@
  *
  * $Id: SignatureProvider.java,v 1.10 2009/08/29 03:06:47 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /*
@@ -609,7 +610,7 @@ public boolean verifyWSSSignature(org.w3c.dom.Document document,
      * @param document the document to be validated
      * @param key the secret key to be used for validating signature
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the object cannot be signed
      */
     public boolean verifyWSSSignature(org.w3c.dom.Document document,
                          java.security.Key key)
@@ -624,7 +625,7 @@ public boolean verifyWSSSignature(org.w3c.dom.Document document,
      * @param encryptAlias the certificate alias that may be used to decrypt
      *        the symmetric key that may be part of KeyInfo
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the object cannot be signed
      */
     public boolean verifyWSSSignature(org.w3c.dom.Document document,
                          java.security.Key key,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/XMLSignatureManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/XMLSignatureManager.java
index f0ebfc5862..7b27a454d3 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/XMLSignatureManager.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml/xmlsig/XMLSignatureManager.java
@@ -25,6 +25,7 @@
  * $Id: XMLSignatureManager.java,v 1.11 2009/08/29 03:06:47 mallas Exp $
  *
  * Portions Copyrighted 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.xmlsig;
@@ -43,7 +44,6 @@
 /**
  * The class XMLSignatureManager provides methods 
  * to sign and verify XML signature.
- * 
                  
  */
 
 public class XMLSignatureManager {
@@ -763,7 +763,7 @@ public boolean verifyWSSSignature(org.w3c.dom.Document document,
      * @param document the document to be validated
      * @param key the secret key to be used for validating signature
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the object cannot be signed
      */
     public boolean verifyWSSSignature(org.w3c.dom.Document document,
             java.security.Key key)
@@ -781,7 +781,7 @@ public boolean verifyWSSSignature(org.w3c.dom.Document document,
      * @param encryptAlias the certificate alias that may be used to decrypt
      *        the symmetric key that may be part of KeyInfo
      * @return true if verification is successful.
-     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException
+     * @throws com.sun.identity.saml.xmlsig.XMLSignatureException if the object cannot be signed
      */
     public boolean verifyWSSSignature(org.w3c.dom.Document document,
             java.security.Key key,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Action.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Action.java
index e4395dd511..16f48ed857 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Action.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Action.java
@@ -24,6 +24,7 @@
  *
  * $Id: Action.java,v 1.2 2008/06/25 05:47:39 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion;
@@ -33,16 +34,15 @@
 /**
  * The Action element specifies an action on the specified
  * resource for which permission is sought. Its type is ActionType.
- * 
                  
  * 
                  - * <complexType name="ActionType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <complexType name="ActionType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
  *       <attribute name="Namespace" use="required"
- *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AssertionIDRef.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AssertionIDRef.java
index 75211195b5..14a9ff5843 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AssertionIDRef.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AssertionIDRef.java
@@ -24,6 +24,7 @@
  *
  * $Id: AssertionIDRef.java,v 1.2 2008/06/25 05:47:40 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion;
@@ -34,9 +35,8 @@
  * This class represents the AssertionIDRef element.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <element name="AssertionIDRef" type="NCName"/>
+ * <element name="AssertionIDRef" type="NCName"/>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Attribute.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Attribute.java
index ef7627f9ae..315278c242 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Attribute.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Attribute.java
@@ -25,6 +25,7 @@
  * $Id: Attribute.java,v 1.2 2008/06/25 05:47:40 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion;
@@ -41,24 +42,23 @@
  * The Attribute element identifies an attribute by name and
  * optionally includes its value(s). It has the AttributeType
  * complex type.
- * 
                  
  * 
                  - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
+ *         AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
  *       <attribute name="FriendlyName"
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="Name" use="required"
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="NameFormat"
- *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *  
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AttributeStatement.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AttributeStatement.java
index 950a308d35..edb063ad64 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AttributeStatement.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AttributeStatement.java
@@ -25,6 +25,7 @@
  * $Id: AttributeStatement.java,v 1.2 2008/06/25 05:47:40 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion;
@@ -40,20 +41,19 @@
  * The AttributeStatement element describes a statement by
  * the SAML authority asserting that the assertion subject is associated with
  * the specified attributes. It is of type AttributeStatementType.
- * 
                  
  * 
                  - * <complexType name="AttributeStatementType">
- *   <complexContent>
+ * <complexType name="AttributeStatementType">
+ *   <complexContent>
  *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}
- *     StatementAbstractType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
+ *     StatementAbstractType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         EncryptedAttribute"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ *         EncryptedAttribute"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnContext.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnContext.java
index 410171572a..096838089e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnContext.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnContext.java
@@ -25,6 +25,7 @@
  * $Id: AuthnContext.java,v 1.2 2008/06/25 05:47:40 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -41,36 +42,35 @@
  * authentication event. The element can contain an authentication context
  * class reference, an authentication declaration or declaration reference,
  * or both. Its type is AuthnContextType.
- * 
                  
  * 
                  - * <complexType name="AuthnContextType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <sequence>
+ * <complexType name="AuthnContextType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <sequence>
  *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *             AuthnContextClassRef"/>
- *             <choice minOccurs="0">
+ *             AuthnContextClassRef"/>
+ *             <choice minOccurs="0">
  *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *               AuthnContextDecl"/>
+ *               AuthnContextDecl"/>
  *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *               AuthnContextDeclRef"/>
- *             </choice>
- *           </sequence>
- *           <choice>
+ *               AuthnContextDeclRef"/>
+ *             </choice>
+ *           </sequence>
+ *           <choice>
  *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *             AuthnContextDecl"/>
+ *             AuthnContextDecl"/>
  *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *             AuthnContextDeclRef"/>
- *           </choice>
- *         </choice>
+ *             AuthnContextDeclRef"/>
+ *           </choice>
+ *         </choice>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *         AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnStatement.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnStatement.java
index c2b1d8d319..001638816e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnStatement.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthnStatement.java
@@ -25,6 +25,7 @@
  * $Id: AuthnStatement.java,v 1.2 2008/06/25 05:47:40 qcheng Exp $
  *
  * Portions Copyrighted 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion;
@@ -39,27 +40,26 @@
  * SAML authority asserting that the assertion subject was authenticated
  * by a particular means at a particular time. It is of type 
  * AuthnStatementType.
- * 
                  
  * 
                  - * <complexType name="AuthnStatementType">
- *   <complexContent>
+ * <complexType name="AuthnStatementType">
+ *   <complexContent>
  *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}
- *     StatementAbstractType">
- *       <sequence>
+ *     StatementAbstractType">
+ *       <sequence>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         SubjectLocality" minOccurs="0"/>
+ *         SubjectLocality" minOccurs="0"/>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AuthnContext"/>
- *       </sequence>
+ *         AuthnContext"/>
+ *       </sequence>
  *       <attribute name="AuthnInstant" use="required"
- *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
  *       <attribute name="SessionIndex"
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="SessionNotOnOrAfter"
- *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthzDecisionStatement.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthzDecisionStatement.java
index d2604349b0..bb646fe853 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthzDecisionStatement.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/AuthzDecisionStatement.java
@@ -24,6 +24,7 @@
  *
  * $Id: AuthzDecisionStatement.java,v 1.2 2008/06/25 05:47:40 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -39,25 +40,24 @@
  * subject tot he specified resource has resulted in the specified authorization
  * decision on the basis of some optionally specified evidence. Its type is
  * AuthzDecisionStatementType.
- * 
                  
  * 
                  - * <complexType name="AuthzDecisionStatementType">
- *   <complexContent>
+ * <complexType name="AuthzDecisionStatementType">
+ *   <complexContent>
  *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}
- *     StatementAbstractType">
- *       <sequence>
+ *     StatementAbstractType">
+ *       <sequence>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action"
- *         maxOccurs="unbounded"/>
+ *         maxOccurs="unbounded"/>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence"
- *         minOccurs="0"/>
- *       </sequence>
+ *         minOccurs="0"/>
+ *       </sequence>
  *       <attribute name="Decision" use="required"
- *       type="{urn:oasis:names:tc:SAML:2.0:assertion}DecisionType" />
+ *       type="{urn:oasis:names:tc:SAML:2.0:assertion}DecisionType" />
  *       <attribute name="Resource" use="required"
- *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/EncryptedAttribute.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/EncryptedAttribute.java
index ad3b029a81..58a0e59f89 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/EncryptedAttribute.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/EncryptedAttribute.java
@@ -25,6 +25,7 @@
  * $Id: EncryptedAttribute.java,v 1.2 2008/06/25 05:47:41 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.assertion;
 
@@ -36,10 +37,9 @@
 /**
  * The EncryptedAttribute element represents a SAML attribute
  * in encrypted fashion. It's of type EncryptedElementType.
- * 
                  
  * 
                    * <element name="EncryptedAttribute" 
- * type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ * type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Evidence.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Evidence.java
index fea9234f58..86c6b8b3f2 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Evidence.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Evidence.java
@@ -24,6 +24,7 @@
  *
  * $Id: Evidence.java,v 1.2 2008/06/25 05:47:41 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -38,23 +39,22 @@
  * The Evidence element contains one or more assertions or
  * assertion references that the SAML authority relied on in issuing the
  * authorization decision. It has the EvidenceType complex type.
- * 
                  
  * 
                  - * <complexType name="EvidenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
+ * <complexType name="EvidenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AssertionIDRef"/>
+ *         AssertionIDRef"/>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AssertionURIRef"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
+ *         AssertionURIRef"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         EncryptedAssertion"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *         EncryptedAssertion"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Statement.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Statement.java
index e7cfe07cb1..00efd7cbe7 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Statement.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/Statement.java
@@ -24,6 +24,7 @@
  *
  * $Id: Statement.java,v 1.2 2008/06/25 05:47:41 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -38,14 +39,13 @@
  * SAML itself derives its core statements from this extension point.
  * Its StatementAbstractType complex type is abstract and is
  * thus usable only as the base of a derived type.
- * 
                  
  * 
                  - * <complexType name="StatementAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatementAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/SubjectLocality.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/SubjectLocality.java
index 4052ac7a9f..4bba006e77 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/SubjectLocality.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/SubjectLocality.java
@@ -24,6 +24,7 @@
  *
  * $Id: SubjectLocality.java,v 1.2 2008/06/25 05:47:42 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -36,18 +37,17 @@
  * The SubjectLocality element specifies the DNS domain name
  * and IP address for the system entity that performed the authentication.
  * It exists as part of AuthenticationStatement element.
- * 
                  
  * 
                  - * <complexType name="SubjectLocalityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <complexType name="SubjectLocalityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <attribute name="Address" 
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="DNSName"
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/ActionImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/ActionImpl.java
index dad979bea0..46b452e648 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/ActionImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/ActionImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ActionImpl.java,v 1.2 2008/06/25 05:47:42 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion.impl;
@@ -44,16 +45,15 @@
  * This class is an implementation of interface Action.
  * The Action element specifies an action on the specified
  * resource for which permission is sought. Its type is ActionType.
- * 
                  
  * 
                  - * <complexType name="ActionType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <complexType name="ActionType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
  *       <attribute name="Namespace" use="required"
- *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AdviceImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AdviceImpl.java
index 71446336f6..8e2276ba4e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AdviceImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AdviceImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: AdviceImpl.java,v 1.4 2008/06/25 05:47:42 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -81,7 +82,7 @@ public AdviceImpl() {
      *
      * @param xml A java.lang.String representing
      *        a Advice object
-     * @exception SAMLException if it could not process the XML string
+     * @exception SAML2Exception if it could not process the XML string
      */
     public AdviceImpl(String xml) throws SAML2Exception {
         Document document = XMLUtils.toDOMDocument(xml, SAML2SDKUtils.debug);
@@ -103,7 +104,7 @@ public AdviceImpl(String xml) throws SAML2Exception {
      *
      * @param element A org.w3c.dom.Element representing
      *        DOM tree for Advice object
-     * @exception SAMLException if it could not process the Element
+     * @exception SAML2Exception if it could not process the Element
      */
     public AdviceImpl(Element element) throws SAML2Exception {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AssertionIDRefImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AssertionIDRefImpl.java
index e51954badc..25d480b2be 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AssertionIDRefImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AssertionIDRefImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: AssertionIDRefImpl.java,v 1.2 2008/06/25 05:47:42 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion.impl;
@@ -43,9 +44,8 @@
  * This class represents the AssertionIDRef element.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <element name="AssertionIDRef" type="NCName"/>
+ * <element name="AssertionIDRef" type="NCName"/>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeImpl.java
index beca8c7e7a..86fbc6645c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: AttributeImpl.java,v 1.4 2008/06/25 05:47:42 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -59,24 +60,23 @@
  * The Attribute element identifies an attribute by name and
  * optionally includes its value(s). It has the AttributeType
  * complex type.
- * 
                  
  * 
                  - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
- *        </sequence>
+ *         AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
+ *        </sequence>
  *        <attribute name="FriendlyName"
- *        type="{http://www.w3.org/2001/XMLSchema}string" />
+ *        type="{http://www.w3.org/2001/XMLSchema}string" />
  *        <attribute name="Name" use="required"
- *        type="{http://www.w3.org/2001/XMLSchema}string" />
+ *        type="{http://www.w3.org/2001/XMLSchema}string" />
  *        <attribute name="NameFormat"
- *        type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *        type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class AttributeImpl implements Attribute {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeStatementImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeStatementImpl.java
index 9c6d096c19..8cc786751a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeStatementImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AttributeStatementImpl.java
@@ -25,6 +25,7 @@
  * $Id: AttributeStatementImpl.java,v 1.2 2008/06/25 05:47:42 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.assertion.impl;
@@ -54,20 +55,19 @@
  * The AttributeStatement element describes a statement by
  * the SAML authority asserting that the assertion subject is associated with
  * the specified attributes. It is of type AttributeStatementType.
- * 
                  
  * 
                  - * <complexType name="AttributeStatementType">
- *   <complexContent>
+ * <complexType name="AttributeStatementType">
+ *   <complexContent>
  *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}
- *       StatementAbstractType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
+ *       StatementAbstractType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         EncryptedAttribute"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ *         EncryptedAttribute"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class AttributeStatementImpl implements AttributeStatement {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnContextImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnContextImpl.java
index 0fe7582368..f62a71a0b4 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnContextImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnContextImpl.java
@@ -25,6 +25,7 @@
  * $Id: AuthnContextImpl.java,v 1.3 2008/06/25 05:47:43 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.assertion.impl;
 
@@ -53,36 +54,35 @@
  * authentication event. The element can contain an authentication context
  * class reference, an authentication declaration or declaration reference,
  * or both. Its type is AuthnContextType.
- * 
                  
  * 
                  - * <complexType name="AuthnContextType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <sequence>
+ * <complexType name="AuthnContextType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <sequence>
  *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *             AuthnContextClassRef"/>
- *             <choice minOccurs="0">
+ *             AuthnContextClassRef"/>
+ *             <choice minOccurs="0">
  *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *               AuthnContextDecl"/>
+ *               AuthnContextDecl"/>
  *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *               AuthnContextDeclRef"/>
- *             </choice>
- *           </sequence>
- *           <choice>
+ *               AuthnContextDeclRef"/>
+ *             </choice>
+ *           </sequence>
+ *           <choice>
  *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *             AuthnContextDecl"/>
+ *             AuthnContextDecl"/>
  *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *             AuthnContextDeclRef"/>
- *           </choice>
- *         </choice>
+ *             AuthnContextDeclRef"/>
+ *           </choice>
+ *         </choice>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *         AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class AuthnContextImpl implements AuthnContext {
@@ -340,7 +340,7 @@ public java.lang.String getAuthnContextClassRef() {
      * Sets the value of the AuthnContextClassRef property.
      *
      * @param value new AuthenticationContextClassRef.
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *                if the object is immutable.
      */
     public void setAuthnContextClassRef(java.lang.String value)
@@ -368,7 +368,7 @@ public java.lang.String getAuthnContextDeclRef() {
      *
      * @param value A String representation of authentication context
      *                declaration reference.
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *                if the object is immutable.
      */
     public void setAuthnContextDeclRef(java.lang.String value)
@@ -395,7 +395,7 @@ public java.lang.String getAuthnContextDecl() {
      *
      * @param value An XML String representing authentication context
      *                declaration.
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *                if the object is immutable.
      */
     public void setAuthnContextDecl(java.lang.String value)
@@ -436,7 +436,7 @@ public List getAuthenticatingAuthority() {
      *
      * @return A string containing the valid XML for this element.
      *         By default name space name is prepended to the element name.
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *          if the object does not conform to the schema.
      */
     public java.lang.String toXMLString()
@@ -453,7 +453,7 @@ public java.lang.String toXMLString()
      * @param declareNS Determines whether or not the namespace is declared
      *                within the Element.
      * @return A string containing the valid XML for this element
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *          if the object does not conform to the schema.
      */
     public java.lang.String toXMLString(boolean includeNS, boolean declareNS)
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnStatementImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnStatementImpl.java
index 938928e9d3..1c30e41e01 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnStatementImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/AuthnStatementImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: AuthnStatementImpl.java,v 1.2 2008/06/25 05:47:43 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -56,27 +57,26 @@
  * SAML authority asserting that the assertion subject was authenticated
  * by a particular means at a particular time. It is of type 
  * AuthnStatementType.
- * 
                  
  * 
                  - * <complexType name="AuthnStatementType">
- *   <complexContent>
+ * <complexType name="AuthnStatementType">
+ *   <complexContent>
  *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}
- *     StatementAbstractType">
- *       <sequence>
+ *     StatementAbstractType">
+ *       <sequence>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         SubjectLocality" minOccurs="0"/>
+ *         SubjectLocality" minOccurs="0"/>
  *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}
- *         AuthnContext"/>
- *       </sequence>
+ *         AuthnContext"/>
+ *       </sequence>
  *       <attribute name="AuthnInstant" use="required" 
- *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
  *       <attribute name="SessionIndex"
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="SessionNotOnOrAfter"
- *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class AuthnStatementImpl implements AuthnStatement {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedAttributeImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedAttributeImpl.java
index 00a9924a8d..5778b58d66 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedAttributeImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedAttributeImpl.java
@@ -25,6 +25,7 @@
  * $Id: EncryptedAttributeImpl.java,v 1.2 2008/06/25 05:47:43 qcheng Exp $
  *
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.assertion.impl;
 
@@ -47,10 +48,9 @@
  *
  * The EncryptedAttribute element represents a SAML attribute
  * in encrypted fashion. It's of type EncryptedElementType.
- * 
                  
  * 
                    * <element name="EncryptedAttribute"
- * type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ * type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                  
  */
 public class EncryptedAttributeImpl implements EncryptedAttribute {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedElementImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedElementImpl.java
index 9e929730a1..9b9793ad62 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedElementImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedElementImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: EncryptedElementImpl.java,v 1.2 2008/06/25 05:47:43 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -37,19 +38,18 @@
  * Java content class for EncryptedElementType complex type.
  * 
                  The following schema fragment specifies the expected
  *         content contained within this java content object.
- * 
                  
  * 
                  - * <complexType name="EncryptedElementType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
+ * <complexType name="EncryptedElementType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
  *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey"
- *         maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *         maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedIDImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedIDImpl.java
index e23f438578..1d2cd3a624 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedIDImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/EncryptedIDImpl.java
@@ -25,6 +25,7 @@
  * $Id: EncryptedIDImpl.java,v 1.2 2008/06/25 05:47:43 qcheng Exp $
  *
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.assertion.impl;
 
@@ -46,10 +47,9 @@
  * Java content class for EncryptedID element declaration.
  * 
                  The following schema fragment specifies the expected         
  *    content contained within this java content object. 
- * 
                  
  * 
                    * <element name="EncryptedID" 
- * type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ * type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/KeyInfoConfirmationDataImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/KeyInfoConfirmationDataImpl.java
index 683ea61c6a..1fbb5853f7 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/KeyInfoConfirmationDataImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/KeyInfoConfirmationDataImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: KeyInfoConfirmationDataImpl.java,v 1.2 2008/06/25 05:47:44 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -47,7 +48,7 @@
 /**
  * The KeyInfoConfirmationData constrains a 
  * SubjectConfirmationData element to contain one or more
- *  elements that identify cryptographic keys that are used
+ * <ds:KeyInfo> elements that identify cryptographic keys that are used
  * in some way to authenticate an attesting entity. The particular 
  * confirmation method MUST define the exact mechanism by which the
  * confirmation data can be used. The optional attributes defined by
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/SubjectLocalityImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/SubjectLocalityImpl.java
index 5dc6b9ab83..9b23f11567 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/SubjectLocalityImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/impl/SubjectLocalityImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: SubjectLocalityImpl.java,v 1.2 2008/06/25 05:47:44 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -47,18 +48,17 @@
  * The SubjectLocality element specifies the DNS domain name
  * and IP address for the system entity that performed the authentication.
  * It exists as part of AuthenticationStatement element.
- * 
                  
  * 
                  - * <complexType name="SubjectLocalityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <complexType name="SubjectLocalityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <attribute name="Address" 
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="DNSName" 
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *       type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class SubjectLocalityImpl implements SubjectLocality {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/AccountUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/AccountUtils.java
index b611f4e9bd..cdc1a57ec9 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/AccountUtils.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/AccountUtils.java
@@ -25,6 +25,7 @@
  * $Id: AccountUtils.java,v 1.2 2008/06/25 05:47:45 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.common;
@@ -43,7 +44,7 @@
 
 /**
  * This class AccountUtils is a utility class for
- * setting and retrieving the SAML2 account federation information.
+ * setting and retrieving the SAML2 account federation information.
  */
 
 public class AccountUtils {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfo.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfo.java
index bb82e492f5..5d1fdb6d76 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfo.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfo.java
@@ -24,6 +24,7 @@
  *
  * $Id: NameIDInfo.java,v 1.3 2008/06/25 05:47:45 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,24 +41,26 @@
  * This multiple-valued attribute is used to store all information 
  * related to the name identifier, such as IDP, SP entity id, role, etc.
  * Value format for this attribute:
- *  ||||
- *  ||||
- * 
+ * 
                  + *  <hosted_entity_id>|<remote_entity_id>|<idp_nameid>|<idp_nameid_qualifier>|
+ *  <idp_nameid_format>|<sp_nameid>|<sp_nameid_qualifier>|<hosted_entity_role>|
+ * <is_affiliation>
  *       where:
- *           : entity id for this hosted entity
- *           : entity id for the remote entity
- *                 : name identifier for the IDP
- *       : nameid qualifier for the IDP
- *          : nameid format for the IDP
- *                  : name identifier for the SP/Affiliation
- *        : nameid qualifier for the SP/Affiliation
- *         : value of SPRole, IDPRole or DualRole.
- *             : true for affiliation, false otherwise 
+ *       <hosted_entity_id>    : entity id for this hosted entity
+ *       <remote_entity_id>    : entity id for the remote entity
+ *       <idp_nameid>          : name identifier for the IDP
+ *       <idp_nameid_qualifier>: nameid qualifier for the IDP
+ *       <idp_nameid_format>   : nameid format for the IDP
+ *       <sp_nameid>           : name identifier for the SP/Affiliation
+ *       <sp_nameid_qualifier> : nameid qualifier for the SP/Affiliation
+ *       <hosted_entity_role>  : value of SPRole, IDPRole or DualRole.
+ *       <is_affiliation>      : true for affiliation, false otherwise
  *       for example:
  *       http://www.sp.com|http://www.idp.com|
  *       vPQyHXLnSWLAVh2BoI3gdUrhanC1|http://www.idp.com|
  *       urn:oasis:names:tc:SAML:2.0:nameid-format:persistent|
  *       g6lD46kMqDGSsFPawoFrw4iNf86C|http://www.sp.com|SPRole|false
+ * 
                  
  */
 public class NameIDInfo {
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfoKey.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfoKey.java
index 5ef29ea034..591c2cafaa 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfoKey.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/NameIDInfoKey.java
@@ -24,6 +24,7 @@
  *
  * $Id: NameIDInfoKey.java,v 1.2 2008/06/25 05:47:45 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -38,14 +39,15 @@
  * of ldap datastore, an equality index need to be created for this 
  * attribute for better search performance.
  *       Value format for this attribute:
- *         ||
+ * 
                  + *         <hosted_entity_id>|<remote_entity_id>|<idp_nameid>
  *       where:
- *           : entity id for this hosted entity
- *           : entity id for the remote entity
- *                 : name identifier for the IDP
+ *       <hosted_entity_id>    : entity id for this hosted entity
+ *       <remote_entity_id>    : entity id for the remote entity
+ *       <idp_nameid>          : name identifier for the IDP
  *       for example:
  *         http://www.sp1.com|http://www.idp1.com|vPQyHXLnSWLAVh2BoI3gdUrhanC1
- * 
+ * 
                  
  */
 public class NameIDInfoKey {
 
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..b95e6cdf13 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;
 
@@ -1104,7 +1104,7 @@ public static boolean isFedInfoExists(String userName, String hostEntityID,
      * @param hostEntityID   hosted EntityID.
      * @param remoteEntityID remote EntityID.
      * @param hostEntityRole the role of hosted entity.
-     * @throws SAML2Exception if any failure.
+     * @throws SAML2Exception if any failure.
      */
     public static Map getNameIDKeyMap(final NameID nameID,
                                       final String hostEntityID,
@@ -2564,7 +2564,7 @@ public static SPAuthnContextMapper getSPAuthnContextMapper(
      * @param reqIssuer  Issuer of Request.
      * @param requestId  request ID
      * @return true if issuer is valid.
-     * @throws SAML2Exception
+     * @throws SAML2Exception if a SAML2 error occurs
      */
     public static boolean verifyRequestIssuer(String realm, String hostEntity,
                                               Issuer reqIssuer, String requestId)
@@ -2596,7 +2596,7 @@ public static boolean verifyRequestIssuer(String realm, String hostEntity,
      * @param resIssuer  Issuer of Response.
      * @param requestId  request ID for the response.
      * @return true if issuer is valid.
-     * @throws SAML2Exception
+     * @throws SAML2Exception if a SAML2 error occurs
      */
     public static boolean verifyResponseIssuer(String realm, String hostEntity,
                                                Issuer resIssuer, String requestId)
@@ -3532,7 +3532,7 @@ public static SPAttributeMapper getSPAttributeMapper(String realm, String spEnti
      * @return a map of local attributes configuration map.
      * This map will have a key as the SAML attribute name and the value
      * is the local attribute.
-     * @throws SAML2Exception if any failured.
+     * @throws SAML2Exception if any failured.
      */
     public static Map getConfigAttributeMap(String realm, String hostEntityID,
                                             String role) throws SAML2Exception {
@@ -4472,7 +4472,7 @@ private static void processCookies(Map headers,
     /**
      * Checks if the provided String is URLEncoded. Our logic is
      * simple. If the string has % or + character we treat as URL encoded
-     * 
                  
+     * 
                  
      * TODO : Copied from AuthClientUtils, refactor
      *
      * @param s the String we want to check
@@ -4492,7 +4492,7 @@ private static boolean isURLEncoded(String s) {
     /**
      * Creates a Cookie with the cookieName,
      * cookieValue for the cookie domains specified.
-     * 
                  
+     * 
                  
      * TODO: Copied from AuthClientUtils Refactor
      *
      * @param cookieName   is the name of the cookie
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SOAPCommunicator.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SOAPCommunicator.java
index 900c312e42..d5bc33efb5 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SOAPCommunicator.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/common/SOAPCommunicator.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package com.sun.identity.saml2.common;
@@ -78,7 +78,7 @@ public static SOAPCommunicator getInstance() {
      * Opens a SOAP Connection.
      *
      * @return a new SOAPConnection
-     * @throws if there was an exception creating the
+     * @throws SOAPException if there was an exception creating the
      *            SOAPConnection object.
      */
     public SOAPConnection openSOAPConnection() throws SOAPException {
@@ -267,7 +267,7 @@ public SOAPMessage createSOAPFault(final String faultCode,
      *
      * @param request HttpServletRequest includes SOAP Message.
      * @return SOAPMessage if request include any soap message in the header.
-     * @throws IOException   if error in creating input stream.
+     * @throws IOException if error in creating input stream.
      * @throws SOAPException if error in creating soap message.
      */
     public SOAPMessage getSOAPMessage(final HttpServletRequest request)
@@ -289,7 +289,7 @@ public SOAPMessage getSOAPMessage(final HttpServletRequest request)
      * @param isClientMessage true if the message is sent from SOAP client to
      *                        server.
      * @return SOAPMessage if the peer send back any reply.
-     * @throws SOAPException  if error in creating soap message.
+     * @throws SOAPException if error in creating soap message.
      * @throws SAML2Exception if error in creating soap message.
      */
     public SOAPMessage sendSOAPMessage(final String xmlMessage,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRelayStateImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRelayStateImpl.java
index c74950c40d..0ce9d64897 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRelayStateImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRelayStateImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ECPRelayStateImpl.java,v 1.2 2008/06/25 05:47:46 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.ecp.impl;
@@ -175,7 +176,7 @@ public java.lang.String toXMLString() throws SAML2Exception {
      *  @param declareNS determines whether or not the namespace is declared
      *      within the Element.
      *  @return a String representation of this Object.
-     *  @exception SAML2Exception ,if it could not create String object.
+     *  @exception SAML2Exception if it could not create String object.
      */
     public String toXMLString(boolean includeNSPrefix,boolean declareNS)
         throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRequestImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRequestImpl.java
index 9964596109..dfad55f7c4 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRequestImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPRequestImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ECPRequestImpl.java,v 1.2 2008/06/25 05:47:47 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.ecp.impl;
@@ -256,7 +257,7 @@ public String toXMLString() throws SAML2Exception {
      *  @param declareNS determines whether or not the namespace is declared
      *      within the Element.
      *  @return a String representation of this Object.
-     *  @exception SAML2Exception ,if it could not create String object.
+     *  @exception SAML2Exception if it could not create String object.
      */
     public String toXMLString(boolean includeNSPrefix,boolean declareNS)
         throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPResponseImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPResponseImpl.java
index de10c2f9ec..528b60ab71 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPResponseImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/ecp/impl/ECPResponseImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ECPResponseImpl.java,v 1.2 2008/06/25 05:47:47 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.ecp.impl;
@@ -177,7 +178,7 @@ public java.lang.String toXMLString() throws SAML2Exception {
      *  @param declareNS determines whether or not the namespace is declared
      *      within the Element.
      *  @return a String representation of this Object.
-     *  @exception SAML2Exception ,if it could not create String object.
+     *  @exception SAML2Exception if it could not create String object.
      */
     public String toXMLString(boolean includeNSPrefix,boolean declareNS)
         throws SAML2Exception {
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..c022570ac6 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;
@@ -1516,7 +1517,7 @@ public String getEntityByMetaAlias(String metaAlias)
      *
      * @param realm The given realm.
      * @return all the hosted entity metaAliases for a realm or an empty arrayList if not found.
-     * @throws SAML2MetaException  if unable to retrieve the entity ids.
+     * @throws SAML2MetaException if unable to retrieve the entity ids.
      */
     public List getAllHostedMetaAliasesByRealm(String realm) throws SAML2MetaException {
 
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..a84ed74e14 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;
@@ -142,19 +143,21 @@ private static void initializeKeyStore() {
     /**
      * Signs the entity descriptor root element by the following rules:
      * 
                    
-     *  
                  • Hosted Entity
                    • 
-     *  
                      
-     *   
                    • If there is a signature already on the EntityDescriptor, removes it, then signs the EntityDescriptor.
-     *   
                      • 
-     *   
                    • Simply signs the EntityDescriptor otherwise.
                      • 
-     *  
                    
-     *  
                  • Remote Entity
                    • 
-     *  
                      
-     *   
                    • If there is a signature already on the EntityDescriptor, then does not change it, but returns the
-     *       Document with the original signature.
-     *   
                      • 
-     *   
                    • Simply signs the EntityDescriptor otherwise
                      • 
-     *  
                    
+     *  
                  • Hosted Entity
+     *   
                      
+     *    
                    • If there is a signature already on the EntityDescriptor, removes it, then signs the EntityDescriptor.
+     *    
                      • 
+     *    
                    • Simply signs the EntityDescriptor otherwise.
                      • 
+     *   
                    
+     *  
                    • 
+     *  
                  • Remote Entity
+     *   
                      
+     *    
                    • If there is a signature already on the EntityDescriptor, then does not change it, but returns the
+     *        Document with the original signature.
+     *    
                      • 
+     *    
                    • Simply signs the EntityDescriptor otherwise
                      • 
+     *   
                    
+     *  
                    • 
      * 
                  
      * If there is no extended metadata for the entity, the entity is considered as remote.
      *
@@ -370,16 +373,18 @@ public static void verifySignature(Document doc)
     /** 
      * Restores Base64 encoded format.
      * JAXB will change
-     *      
-     *          
+     * 
                  +     *      <ds:X509Data>
+     *          <ds:X509Certificate>
      *  .........
      *  .........
-     *          
-     *      
+     *          </ds:X509Certificate>
+     *      </ds:X509Data>
      *  to
-     *      
-     *          ..................
-     *      
+     *      <ds:X509Data>
+     *          <ds:X509Certificate>..................</ds:X509Certificate>
+     *      </ds:X509Data>
+     * 
                  
      *
      *  This method will restore the format.
      *  @param xmlstr The xml string containing element 'X509Certificate'.
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..b233c45c56 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;
 
@@ -247,8 +248,8 @@ public static Map> getAttributes(BaseConfigType config) {
     /**
      * Returns the realm by parsing the metaAlias. MetaAlias format is
      * 
                  -     * <realm>/<any string without '/'> for non-root realm or
-     * /<any string without '/'> for root realm.
+     * <realm>/<any string without '/'> for non-root realm or
+     * /<any string without '/'> for root realm.
      * 
                  
      * @param metaAlias The metaAlias.
      * @return the realm associated with the metaAlias.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAttributeMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAttributeMapper.java
index 7e03a1fc29..2d08279698 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAttributeMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/DefaultAttributeMapper.java
@@ -24,6 +24,7 @@
  *
  * $Id: DefaultAttributeMapper.java,v 1.4 2008/06/25 05:47:50 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /**
@@ -77,7 +78,7 @@ public DefaultAttributeMapper() {}
      * @return a map of local attributes configuration map.
      *        This map will have a key as the SAML attribute name and the value
      *        is the local attribute. 
-     * @exception SAML2Exception if any failured.
+     * @exception SAML2Exception if any failured.
      */
     public Map getConfigAttributeMap(String realm, String hostEntityID,
         String role) throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAccountMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAccountMapper.java
index 9f06fd9076..26d0367250 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAccountMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAccountMapper.java
@@ -25,6 +25,7 @@
  * $Id: IDPAccountMapper.java,v 1.5 2008/06/25 05:47:51 qcheng Exp $
  *
  * Portions Copyrighted 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.plugins;
 
@@ -35,7 +36,7 @@
 /**
  * The interface IDPAccountMapper is used to map the local identities to the SAML protocol
  * objects and also the vice versa for some of the protocols for e.g. ManageNameIDRequest.
- * 
                  
+ * 
                  
  * This mapper interface is used to map the identities only at the SAML Identity Provider. The
  * implementation of this interface will be used by the SAML framework to retrieve the user's account
  * federation information for constructing SAML protocol objects such as Assertion and also to find out
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAuthnContextMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAuthnContextMapper.java
index a91b61fa2f..195c717b5b 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAuthnContextMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/IDPAuthnContextMapper.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPAuthnContextMapper.java,v 1.6 2008/06/25 05:47:51 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -37,7 +38,7 @@
 
 /** 
  * The interface IDPAuthnContextMapper creates an
- * IDPAuthnContextInfo based on the RequestAuthnContext from
+ * IDPAuthnContextInfo based on the RequestAuthnContext from
  * the AuthnRequest sent by a Service Provider and the AuthnContext
  * configuration at the IDP entity config.
  * The implementation of this class will be used by the IDP to find out
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..f18d473bef 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;
 
@@ -141,7 +141,7 @@ public static Response sendAssertionIDRequest(
      * returns Assertion coming from the Assertion ID Request
      * Service.
      *
-     * @param assertionID the asssertionID object
+     * @param assertionID the asssertionID object
      * @param samlAuthorityEntityID entity ID of SAML authority
      * @param role SAML authority role, for example,
      * SAML2Constants.ATTR_AUTH_ROLE, 
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..27f870e8f7 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;
 
@@ -131,7 +132,7 @@ public DiscoveryBootstrap(Object session, Subject sub,
     /**
      * Gets the discovery bootstrap resource offering for the user.
      * @return Discovery Resource Offering String
-     * @exception  SAML2Exception if there's any failure.
+     * @exception SAML2Exception if there's any failure.
      */
     private String getResourceOffering(String authnContextClassRef,
         Subject subject, String wscID, String realm) throws SAML2Exception {
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..43fa3bb1cd 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
@@ -2913,7 +2913,7 @@ public static long getValidTimeofResponse(
      * @param realm       the realm name.
      * @param idpEntityID the identity provider entity identifier
      * @param response    the SAMLv2 Response
-     * @throws SAML2Exception if there is an
+     * @throws SAML2Exception if there is an
      *                                     error signing the response.
      */
     private static void signResponse(String realm, String idpEntityID,
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..da2ecadf3d 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;
 
@@ -1487,7 +1488,8 @@ private static void removeTransientNameIDFromCache(NameID nameID) {
      *
      * @return true if the request was misrouted and it was forwarded to
      * the original server
-     * @throws SAML2Exception, SessionException
+     * @throws SAML2Exception if a SAML2 error occurs
+     * @throws SessionException if a session error occurs
      */
     private static boolean isMisroutedRequest(HttpServletRequest request,
             HttpServletResponse response, PrintWriter out, Object session)
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..c4e136424e 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;
 
@@ -434,7 +434,6 @@ static private void setNameIDForNIMRequest(NameIDMappingRequest nimRequest,
      * @return ManageNameIDServiceElement for the entity or null
      * @throws SAML2MetaException if unable to retrieve the first identity
      *     provider's SSO configuration.
-     * @throws SessionException invalid or expired single-sign-on session
      */
     static public NameIDMappingServiceElement getNameIDMappingService(
         String realm, String entityId, String binding)
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..01c30e1eda 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;
 
@@ -151,7 +151,8 @@ private SPACSUtils() {}
      * @param hostEntityId Entity ID of the hosted service provider
      * @param metaManager SAML2MetaManager instance.
      * @return ResponseInfo instance.
-     * @throws SAML2Exception,IOException if it fails in the process.
+     * @throws SAML2Exception if it fails in the process.
+     * @throws IOException if it fails in the process.
      */
     public static ResponseInfo getResponse(
                                 HttpServletRequest request,
@@ -1602,7 +1603,7 @@ public static void saveInfoInMemory(SessionProvider sessionProvider,
      *  @param sessionProvider Session provider
      *  @param attrMap the Attribute Map
      *  @param session the valid session object
-     *  @throws com.sun.identity.plugin.session.SessionException 
+     *  @throws com.sun.identity.plugin.session.SessionException if a session error occurs
      */
     public static void setAttrMapInSession(
         SessionProvider sessionProvider,
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..588960f065 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;
 
@@ -403,7 +403,7 @@ public static SPSSODescriptorElement getSPSSOForAuthnReq(String realm, String sp
      * @param realm the realm the sp is configured in
      * @param spEntityID the entity id of the sp to get the attributes map for
      * @return a map of SAML2 Attributes with String keys mapped to a collection of values
-     * @throws SAML2MetaException
+     * @throws SAML2MetaException if a SAML2 metadata error occurs
      */
     public static Map> getAttrsMapForAuthnReq(String realm, String spEntityID)
             throws SAML2MetaException {
@@ -434,12 +434,12 @@ public static IDPSSODescriptorElement getIDPSSOForAuthnReq(String realm, String
     /**
      * Gets the Post Binding message
      *
-     * @param idpsso
-     * @param spsso
-     * @param spConfigAttrsMap
-     * @param authnRequest
-     * @return
-     * @throws SAML2Exception
+     * @param idpsso the standard metadata of the identity provider
+     * @param spsso the standard metadata of the service provider
+     * @param spConfigAttrsMap the extended configuration attributes of the service provider
+     * @param authnRequest the authentication request to be sent
+     * @return the post binding message as an HTML form string
+     * @throws SAML2Exception if a SAML2 error occurs
      */
     public static String getPostBindingMsg(IDPSSODescriptorElement idpsso, SPSSODescriptorElement spsso,
                                             Map spConfigAttrsMap, AuthnRequest authnRequest)
@@ -795,7 +795,7 @@ private static Issuer createIssuer(String spEntityID)
      * @param ssourl the url for the single sign on request
      * @param isForECP boolean to indicatge if the request originated from an ECP
      * @return a new AuthnRequest object
-     * @throws SAML2Exception
+     * @throws SAML2Exception if a SAML2 error occurs
      */
     public static AuthnRequest createAuthnRequest(final HttpServletRequest request, 
                                                   final HttpServletResponse response, 
@@ -1260,7 +1260,7 @@ private static RequestedAuthnContext createReqAuthnContext(String realmName,
      * @param queryString the query string
      * @param certAlias the certificate alias
      * @return the signed query string
-     * @throws SAML2Exception
+     * @throws SAML2Exception if a SAML2 error occurs
      */
     public static String signQueryString(final String queryString, final String certAlias)
         throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Artifact.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Artifact.java
index 9ced0601e7..eb4410bb31 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Artifact.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Artifact.java
@@ -25,6 +25,7 @@
  * $Id: Artifact.java,v 1.2 2008/06/25 05:47:55 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -38,9 +39,8 @@
 /**
  * This class represents the Artifact element in
  * SAMLv2 protocol schema.
- * 
                  
  * 
                  - * <element name="Artifact" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="Artifact" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResolve.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResolve.java
index 905fcacbcf..7c3fbf6e4a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResolve.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResolve.java
@@ -25,6 +25,7 @@
  * $Id: ArtifactResolve.java,v 1.2 2008/06/25 05:47:56 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,17 +41,16 @@
  * protocol message be returned in an ArtifactResponse message
  * by specifying an artifact that represents the SAML protocol message.
  * It has the complex type ArtifactResolveType.
- * 
                  
  * 
                  - * <complexType name="ArtifactResolveType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Artifact"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ArtifactResolveType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Artifact"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResponse.java
index 02cb490dc2..330d27abf7 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ArtifactResponse.java
@@ -25,6 +25,7 @@
  * $Id: ArtifactResponse.java,v 1.2 2008/06/25 05:47:56 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -38,17 +39,16 @@
 /**
  * The ArtifactResopnse message has the complex type
  * ArtifactResponseType.
- * 
                  
  * 
                  - * <complexType name="ArtifactResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ArtifactResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AssertionIDRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AssertionIDRequest.java
index d31724cd20..e4434c35c0 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AssertionIDRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AssertionIDRequest.java
@@ -26,6 +26,7 @@
  *
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,17 +41,16 @@
  * This class represents the AssertionIDRequestType complex type.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <complexType name="AssertionIDRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AssertionIDRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AttributeQuery.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AttributeQuery.java
index 0df9a43c23..6755cd6ed4 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AttributeQuery.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AttributeQuery.java
@@ -25,6 +25,7 @@
  * $Id: AttributeQuery.java,v 1.2 2008/06/25 05:47:56 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,17 +41,16 @@
  * This class represents the AttributeQueryType complex type.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <complexType name="AttributeQueryType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" minOccurs="0" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeQueryType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" minOccurs="0" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnQuery.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnQuery.java
index 33f790640e..91d04e0859 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnQuery.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnQuery.java
@@ -25,6 +25,7 @@
  * $Id: AuthnQuery.java,v 1.2 2008/06/25 05:47:56 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -39,18 +40,17 @@
  * This class represents the AuthnQueryType complex type.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <complexType name="AuthnQueryType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="SessionIndex" type="string" use="optional"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnQueryType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="SessionIndex" type="string" use="optional"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnRequest.java
index 237c1accc1..0a1f6e9fc0 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/AuthnRequest.java
@@ -25,6 +25,7 @@
  * $Id: AuthnRequest.java,v 1.2 2008/06/25 05:47:56 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -213,7 +214,7 @@ public void setProtocolBinding(String protocolBinding)
      * Returns the value of the AssertionConsumerServiceIndex 
      * attribute.
      *
-     * @return value of the AssertionConsumerServiceIndex 
+     * @return value of the AssertionConsumerServiceIndex 
      *         attribute.
      * @see #setAssertionConsumerServiceIndex(Integer)
      */
@@ -236,7 +237,7 @@ public void setAssertionConsumerServiceIndex(Integer index)
      * Returns the value of the AttributeConsumingServiceIndex
      * attribute.
      *
-     * @return value of the AttributeConsumingServiceIndex 
+     * @return value of the AttributeConsumingServiceIndex 
      *         attribute.
      * @see #setAttributeConsumingServiceIndex(Integer)
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutRequest.java
index 71a70a4ed0..3a7fb41643 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutRequest.java
@@ -25,6 +25,7 @@
  * $Id: LogoutRequest.java,v 1.2 2008/06/25 05:47:56 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -43,26 +44,26 @@
  * message to indicate that a session has been terminated.
  *
  * 
                  - * <element name="LogoutRequest" type="{urn:oasis:names:tc:SAML:2.0:protocol}LogoutRequestType"/>
+ * <element name="LogoutRequest" type="{urn:oasis:names:tc:SAML:2.0:protocol}LogoutRequestType"/>
  * 
                  
  *
  * 
                  - * <complexType name="LogoutRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         </choice>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}SessionIndex" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="Reason" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="LogoutRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
+ *         </choice>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}SessionIndex" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="Reason" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutResponse.java
index d07bda446d..538ce48849 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/LogoutResponse.java
@@ -25,6 +25,7 @@
  * $Id: LogoutResponse.java,v 1.2 2008/06/25 05:47:56 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -42,7 +43,7 @@
  *
  * 
                    * <element name="LogoutResponse" 
- * type="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"/>
+ * type="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"/>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDRequest.java
index a594d370ba..acca681d66 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDRequest.java
@@ -25,6 +25,7 @@
  * $Id: ManageNameIDRequest.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,25 +41,24 @@
  * This class represents the ManageNameIDRequestType complex type.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <complexType name="ManageNameIDRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         </choice>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewEncryptedID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Terminate"/>
- *         </choice>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManageNameIDRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
+ *         </choice>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewEncryptedID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Terminate"/>
+ *         </choice>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDResponse.java
index 26db65f744..a4118581fc 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ManageNameIDResponse.java
@@ -25,6 +25,7 @@
  * $Id: ManageNameIDResponse.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -37,9 +38,8 @@
  * This class represents the ManageNameIDResponse element declaration.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 
- * 
                  
  * 
                  - * <element name="ManageNameIDResponse" type="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"/>
+ * <element name="ManageNameIDResponse" type="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"/>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingRequest.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingRequest.java
index a123c0b368..993c538139 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingRequest.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingRequest.java
@@ -25,6 +25,7 @@
  * $Id: NameIDMappingRequest.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.protocol;
@@ -39,25 +40,24 @@
  * This class represents the ManageNameIDRequestType complex type.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <complexType name="ManageNameIDRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         </choice>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewEncryptedID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Terminate"/>
- *         </choice>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManageNameIDRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
+ *         </choice>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewEncryptedID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Terminate"/>
+ *         </choice>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingResponse.java
index fd24e7f9f3..c3622380b8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NameIDMappingResponse.java
@@ -25,6 +25,7 @@
  * $Id: NameIDMappingResponse.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,18 +41,17 @@
  * This class represents the NameIDMappingResponseType complex type.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <complexType name="NameIDMappingResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       <choice>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NameIDMappingResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
+ *       <choice>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NewEncryptedID.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NewEncryptedID.java
index 553d97a4ba..4e83de49f8 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NewEncryptedID.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/NewEncryptedID.java
@@ -25,6 +25,7 @@
  * $Id: NewEncryptedID.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.protocol;
 
@@ -39,9 +40,8 @@
  * Java content class for NewEncryptedID element declaration.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <element name="NewEncryptedID" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ * <element name="NewEncryptedID" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ProtocolFactory.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ProtocolFactory.java
index 47a5dec0e0..72dc68fc83 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ProtocolFactory.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/ProtocolFactory.java
@@ -24,6 +24,7 @@
  *
  * $Id: ProtocolFactory.java,v 1.5 2008/06/25 05:47:57 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.protocol;
@@ -341,7 +342,7 @@ public Extensions createExtensions(Element value) throws SAML2Exception {
      *
      * @param  value XML String Representation of Extensions
      *	    object.
-     * @return instance of Extensions object.
+     * @return instance of Extensions object.
      * @throws SAML2Exception if Extensions cannot be created.
      */
     public Extensions createExtensions(String value) throws SAML2Exception {
@@ -409,8 +410,8 @@ public GetComplete createGetComplete(String value) throws SAML2Exception {
     /**
      * Returns the IDPEntry Object.
      *
-     * @return instance of IDPEntry object.
-     * @throws SAML2Exception if IDPEntry cannot be created.
+     * @return instance of IDPEntry object.
+     * @throws SAML2Exception if IDPEntry cannot be created.
      */
     public IDPEntry createIDPEntry() throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -425,9 +426,9 @@ public IDPEntry createIDPEntry() throws SAML2Exception {
     /**
      * Returns the IDPEntry Object.
      *
-     * @param value Document Element of IDPEntry object.
-     * @return instance of IDPEntry object.
-     * @throws SAML2Exception if IDPEntry cannot be created.
+     * @param value Document Element of IDPEntry object.
+     * @return instance of IDPEntry object.
+     * @throws SAML2Exception if IDPEntry cannot be created.
      */
     public IDPEntry createIDPEntry(Element value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -442,9 +443,9 @@ public IDPEntry createIDPEntry(Element value) throws SAML2Exception {
     /**
      * Returns the IDPEntry Object.
      *
-     * @param value XML Representation of the IDPEntry object.
-     * @return instance of IDPEntry Object.
-     * @throws SAML2Exception if IDPEntry cannot be created.
+     * @param value XML Representation of the IDPEntry object.
+     * @return instance of IDPEntry Object.
+     * @throws SAML2Exception if IDPEntry cannot be created.
      */
     public IDPEntry createIDPEntry(String value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -459,8 +460,8 @@ public IDPEntry createIDPEntry(String value) throws SAML2Exception {
     /**
      * Returns the IDPList Object.
      *
-     * @return instance of IDPList Object.
-     * @throws SAML2Exception if IDPList cannot be created.
+     * @return instance of IDPList Object.
+     * @throws SAML2Exception if IDPList cannot be created.
      */
     public IDPList createIDPList() throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -476,8 +477,8 @@ public IDPList createIDPList() throws SAML2Exception {
      * Returns the IDPList Object.
      *
      * @param value Document Element of IDPList Object.
-     * @return instance of IDPList Object.
-     * @throws SAML2Exception if IDPList cannot be created.
+     * @return instance of IDPList Object.
+     * @throws SAML2Exception if IDPList cannot be created.
      */
     public IDPList createIDPList(Element value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -494,7 +495,7 @@ public IDPList createIDPList(Element value) throws SAML2Exception {
      *
      * @param value XML String Representation of IDPList Object.
      * @return instance of IDPList Object.
-     * @throws SAML2Exception if IDPList cannot be created.
+     * @throws SAML2Exception if IDPList cannot be created.
      */
     public IDPList createIDPList(String value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -510,7 +511,7 @@ public IDPList createIDPList(String value) throws SAML2Exception {
      * Returns the NameIDPolicy Object.
      *
      * @return instance of NameIDPolicy Object.
-     * @throws SAML2Exception if NameIDPolicy cannot be created.
+     * @throws SAML2Exception if NameIDPolicy cannot be created.
      */
     public NameIDPolicy createNameIDPolicy() throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -527,7 +528,7 @@ public NameIDPolicy createNameIDPolicy() throws SAML2Exception {
      *
      * @param value Document Element of NameIDPolicy Object.
      * @return instance of NameIDPolicy Object.
-     * @throws SAML2Exception if NameIDPolicy cannot be created.
+     * @throws SAML2Exception if NameIDPolicy cannot be created.
      */
     public NameIDPolicy createNameIDPolicy(Element value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -545,7 +546,7 @@ public NameIDPolicy createNameIDPolicy(Element value) throws SAML2Exception {
      * @param value XML String Representation of NameIDPolicy
      *	    object.
      * @return instance of NameIDPolicy object.
-     * @throws SAML2Exception if NameIDPolicy cannot be created.
+     * @throws SAML2Exception if NameIDPolicy cannot be created.
      */
     public NameIDPolicy createNameIDPolicy(String value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -561,7 +562,7 @@ public NameIDPolicy createNameIDPolicy(String value) throws SAML2Exception {
      * Returns the RequesterID Object.
      *
      * @return instance of RequesterID Object.
-     * @throws SAML2Exception if RequesterID cannot be created.
+     * @throws SAML2Exception if RequesterID cannot be created.
      */
     public RequesterID createRequesterID() throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -578,7 +579,7 @@ public RequesterID createRequesterID() throws SAML2Exception {
      *
      * @param value Document Element of RequesterID Object.
      * @return instance of RequesterID Object.
-     * @throws SAML2Exception if RequesterID cannot be created.
+     * @throws SAML2Exception if RequesterID cannot be created.
      */
     public RequesterID createRequesterID(Element value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -596,7 +597,7 @@ public RequesterID createRequesterID(Element value) throws SAML2Exception {
      * @param value XML String Representation of RequesterID
      *	    object.
      * @return instance of RequesterID Object.
-     * @throws SAML2Exception if RequesterID cannot be created.
+     * @throws SAML2Exception if RequesterID cannot be created.
      */
     public RequesterID createRequesterID(String value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -612,7 +613,7 @@ public RequesterID createRequesterID(String value) throws SAML2Exception {
      * Returns the Scoping Object.
      *
      * @return instance of Scoping Object.
-     * @throws SAML2Exception if Scoping cannot be created.
+     * @throws SAML2Exception if Scoping cannot be created.
      */
     public Scoping createScoping() throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -629,7 +630,7 @@ public Scoping createScoping() throws SAML2Exception {
      *
      * @param value Document Element of Scoping Object.
      * @return instance of Scoping Object.
-     * @throws SAML2Exception if Scoping cannot be created.
+     * @throws SAML2Exception if Scoping cannot be created.
      */
     public Scoping createScoping(Element value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -646,7 +647,7 @@ public Scoping createScoping(Element value) throws SAML2Exception {
      *
      * @param value XML String Representation of Scoping Object.
      * @return instance of Scoping Object.
-     * @throws SAML2Exception if Scoping cannot be created.
+     * @throws SAML2Exception if Scoping cannot be created.
      */
     public Scoping createScoping(String value) throws SAML2Exception {
 	Object obj = SAML2SDKUtils.getObjectInstance(
@@ -841,7 +842,7 @@ public NewID createNewID(Element value)
     /**
      * Returns an new identifier object.
      *
-     * @param value of the NewID.
+     * @param value of the NewID.
      * @throws SAML2Exception if it failed to instantiate the object.
      * @return an immutable requested authentication context object.
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequestedAuthnContext.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequestedAuthnContext.java
index ba3b5b8b7b..6972a68920 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequestedAuthnContext.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequestedAuthnContext.java
@@ -25,6 +25,7 @@
  * $Id: RequestedAuthnContext.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -39,9 +40,8 @@
  * Java content class for RequestedAuthnContext element declaration.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <element name="RequestedAuthnContext" type="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContextType"/>
+ * <element name="RequestedAuthnContext" type="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContextType"/>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequesterID.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequesterID.java
index 4e0846ffcd..be94bde829 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequesterID.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/RequesterID.java
@@ -25,6 +25,7 @@
  * $Id: RequesterID.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -57,7 +58,7 @@ public interface RequesterID {
     /** 
      * Sets the value of the RequesterID URI.
      *
-     * @param value of the RequesterID URI.
+     * @param value of the RequesterID URI.
      * @throws SAML2Exception if the object is immutable.
      * @see #getValue
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Response.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Response.java
index 01d93cb7ba..323ccdd120 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Response.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Response.java
@@ -25,6 +25,7 @@
  * $Id: Response.java,v 1.2 2008/06/25 05:47:57 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -40,18 +41,17 @@
  * The Response message element is used when a response consists
  * of a list of zero or more assertions that satisfy the request. It has the
  * complex type ResponseType.
- * 
                  
  * 
                  - * <complexType name="ResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SessionIndex.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SessionIndex.java
index f946c7a195..bb9d9f422f 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SessionIndex.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SessionIndex.java
@@ -25,6 +25,7 @@
  * $Id: SessionIndex.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -41,7 +42,7 @@
  * of a authenticated principal.
  *
  * 
                  - * <element name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Status.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Status.java
index e74fd8038b..7e081ed766 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Status.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/Status.java
@@ -25,6 +25,7 @@
  * $Id: Status.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -39,17 +40,17 @@
  * SAML protocol schema.
  *
  * 
                  - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusMessage" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusDetail" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusMessage" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusDetail" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusCode.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusCode.java
index 3d6d5093df..3703245e04 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusCode.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusCode.java
@@ -25,6 +25,7 @@
  * $Id: StatusCode.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -41,16 +42,16 @@
  * representing the status of the corresponding request.
  *
  * 
                  - * <complexType name="StatusCodeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusCodeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusDetail.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusDetail.java
index ec5cab4bae..51a743d9d4 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusDetail.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusDetail.java
@@ -25,6 +25,7 @@
  * $Id: StatusDetail.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -41,15 +42,15 @@
  * information concerning the status of the request.
  *
  * 
                  - * <complexType name="StatusDetailType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusDetailType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusMessage.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusMessage.java
index 713e24605f..42a15549c8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusMessage.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusMessage.java
@@ -25,6 +25,7 @@
  * $Id: StatusMessage.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -41,7 +42,7 @@
  * returned to an operator.
  *
  * 
                  - * <element name="StatusMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="StatusMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusResponse.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusResponse.java
index 5abb2ba2ae..f04ff48293 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusResponse.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/StatusResponse.java
@@ -25,6 +25,7 @@
  * $Id: StatusResponse.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.protocol;
 
@@ -44,24 +45,24 @@
  * attributes and elements that are associated with all SAML responses.
  *
  * 
                  - * <complexType name="StatusResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Status"/>
- *       </sequence>
- *       <attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Status"/>
+ *       </sequence>
+ *       <attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  *
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SubjectQueryAbstract.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SubjectQueryAbstract.java
index 7a80646999..2add77e77c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SubjectQueryAbstract.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/SubjectQueryAbstract.java
@@ -24,6 +24,7 @@
  *
  * $Id: SubjectQueryAbstract.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -37,17 +38,16 @@
  * This class represents the SubjectQueryAbstractType complex type.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <complexType name="SubjectQueryAbstractType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectQueryAbstractType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  * 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactImpl.java
index 7eca5bab08..0ec3c2358a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ArtifactImpl.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -43,7 +44,6 @@
 /**
  * This class implements interface Artifact. It models 
  * type urn:oasis:names:tc:SAML:2.0:artifact-04 Artifact.
- * 
                  
  * 
                    * SAML_artifact := B64(TypeCode EndpointIndex RemainingArtifact)
  * TypeCode      := Byte1Byte2
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResolveImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResolveImpl.java
index 7bb9ab84a7..db7bf3d6de 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResolveImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResolveImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ArtifactResolveImpl.java,v 1.2 2008/06/25 05:47:58 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -64,17 +65,16 @@
  * protocol message be returned in an ArtifactResponse message
  * by specifying an artifact that represents the SAML protocol message.
  * It has the complex type ArtifactResolveType.
- * 
                  
  * 
                  - * <complexType name="ArtifactResolveType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Artifact"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ArtifactResolveType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Artifact"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class ArtifactResolveImpl extends RequestAbstractImpl
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResponseImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResponseImpl.java
index fc2c9ed3f7..67e8bacfa6 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResponseImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ArtifactResponseImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ArtifactResponseImpl.java,v 1.2 2008/06/25 05:47:59 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -57,17 +58,16 @@
 /**
  * The ArtifactResopnse message has the complex type
  * ArtifactResponseType.
- * 
                  
  * 
                  - * <complexType name="ArtifactResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ArtifactResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class ArtifactResponseImpl extends StatusResponseImpl
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AssertionIDRequestImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AssertionIDRequestImpl.java
index caad0d6fb6..93385cab86 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AssertionIDRequestImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AssertionIDRequestImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: AssertionIDRequestImpl.java,v 1.2 2008/06/25 05:47:59 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -50,9 +51,8 @@
  * schema.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                  - * <element name="AssertionIDRequest" type="{urn:oasis:names:tc:SAML:2.0:protocol}AssertionIDRequestType"/>
+ * <element name="AssertionIDRequest" type="{urn:oasis:names:tc:SAML:2.0:protocol}AssertionIDRequestType"/>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AuthnRequestImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AuthnRequestImpl.java
index f7df997220..faa0fcf45c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AuthnRequestImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/AuthnRequestImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: AuthnRequestImpl.java,v 1.8 2009/06/09 20:28:32 exu Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -52,8 +53,8 @@
 
 
 /** 
- * The AuthnRequestImpl implements the 
- *                   AuthnRequest                   interface , defines methods for 
+ * The AuthnRequestImpl implements the
+ * AuthnRequest interface , defines methods for
  * properties required by a saml request.
  */
 
@@ -351,7 +352,7 @@ public void setAssertionConsumerServiceURL(String url)
      * Returns the value of the AssertionConsumerServiceIndex 
      * attribute.
      *
-     * @return value of the AssertionConsumerServiceIndex 
+     * @return value of the AssertionConsumerServiceIndex 
      *         attribute.
      * @see #setAssertionConsumerServiceIndex(Integer)
      */
@@ -382,7 +383,7 @@ public void setAssertionConsumerServiceIndex(Integer index)
      * Returns the value of the AttributeConsumingServiceIndex
      * attribute.
      *
-     * @return value of the AttributeConsumingServiceIndex
+     * @return value of the AttributeConsumingServiceIndex
      *		attribute.
      * @see #setAttributeConsumingServiceIndex(Integer)
      */
@@ -449,7 +450,7 @@ public java.lang.String toXMLString() throws SAML2Exception {
      *		qualifier is prepended to the Element when converted
      *	@param declareNS determines whether or not the namespace is declared
      *		within the Element.
-     *	@exception SAML2Exception ,if it could not create String object.
+     *	@exception SAML2Exception if it could not create String object.
      *	@return a String representation of this Object.
      **/
     
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/GetCompleteImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/GetCompleteImpl.java
index 760cd22aca..d4c8db9f5e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/GetCompleteImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/GetCompleteImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: GetCompleteImpl.java,v 1.2 2008/06/25 05:47:59 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -94,9 +95,9 @@ public String getValue() {
     }
     
     /** 
-     * Sets the value of the GetComplete URI.
+     * Sets the value of the GetComplete URI.
      *
-     * @param value new value of the GetComplete URI.
+     * @param value new value of the GetComplete URI.
      * @throws SAML2Exception if the object is immutable.
      * @see #getValue
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPEntryImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPEntryImpl.java
index 920e269650..b30a5af6ae 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPEntryImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPEntryImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPEntryImpl.java,v 1.2 2008/06/25 05:47:59 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -62,8 +63,8 @@ public IDPEntryImpl() {
     /**
      * Constructor to create IDPEntry Object. 
      *
-     * @param element Document Element of IDPEntry object.
-     * @throws SAML2Exception if IDPEntry cannot be created.
+     * @param element Document Element of IDPEntry object.
+     * @throws SAML2Exception if IDPEntry cannot be created.
      */
     public IDPEntryImpl(Element element) throws SAML2Exception {
         parseElement(element);
@@ -73,8 +74,8 @@ public IDPEntryImpl(Element element) throws SAML2Exception {
     /**
      * Constructor to create IDPEntry Object. 
      *
-     * @param xmlString XML Representation of the IDPEntry object.
-     * @throws SAML2Exception if IDPEntry cannot be created.
+     * @param xmlString XML Representation of the IDPEntry object.
+     * @throws SAML2Exception if IDPEntry cannot be created.
      */
 
     public IDPEntryImpl(String xmlString) throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPListImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPListImpl.java
index bb02bbfd5f..41c1e1a06b 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPListImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/IDPListImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPListImpl.java,v 1.2 2008/06/25 05:47:59 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -70,7 +71,7 @@ public IDPListImpl() {
      * Constructor to create the IDPList Object.
      *
      * @param element Document Element of IDPList Object.
-     * @throws SAML2Exception if IDPList cannot be created.
+     * @throws SAML2Exception if IDPList cannot be created.
      */
     
     public IDPListImpl(Element element) throws SAML2Exception {
@@ -82,7 +83,7 @@ public IDPListImpl(Element element) throws SAML2Exception {
      *
      * @param xmlString the XML String Representation of 
      *        IDPList Object.
-     * @throws SAML2Exception if IDPList cannot be created.
+     * @throws SAML2Exception if IDPList cannot be created.
      */
     
     public IDPListImpl(String xmlString) throws SAML2Exception {
@@ -132,7 +133,7 @@ public GetComplete getGetComplete() {
     }
     
     /**
-     * Sets the GetComplete Object.
+     * Sets the GetComplete Object.
      *
      * @param getComplete the new GetComplete object.
      * @throws SAML2Exception if the object is immutable.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDRequestImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDRequestImpl.java
index 21f5fc6c88..dd5d34a5a7 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDRequestImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDRequestImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ManageNameIDRequestImpl.java,v 1.3 2008/06/25 05:47:59 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -69,9 +70,9 @@ public ManageNameIDRequestImpl() {
      * Constructor to create ManageNameIDRequest Object. 
      *
      * @param element Document Element of 
-     *         ManageNameIDRequest object.
-     * @throws SAML2Exception 
-     *         if ManageNameIDRequest cannot be created.
+     *         ManageNameIDRequest object.
+     * @throws SAML2Exception if a SAML2 error occurs
+     *         if ManageNameIDRequest cannot be created.
      */
     public ManageNameIDRequestImpl(Element element) throws SAML2Exception {
     	parseElement(element);
@@ -85,9 +86,9 @@ public ManageNameIDRequestImpl(Element element) throws SAML2Exception {
      * Constructor to create ManageNameIDRequest Object. 
      *
      * @param xmlString XML Representation of 
-     *        the ManageNameIDRequest object.
-     * @throws SAML2Exception 
-     *        if ManageNameIDRequest cannot be created.
+     *        the ManageNameIDRequest object.
+     * @throws SAML2Exception if a SAML2 error occurs
+     *        if ManageNameIDRequest cannot be created.
      */
     public ManageNameIDRequestImpl(String xmlString) throws SAML2Exception {
     	Document doc = XMLUtils.toDOMDocument(xmlString, SAML2SDKUtils.debug);
@@ -328,7 +329,7 @@ public void setTerminate(boolean value)
 
     /** Returns a String representation of this Object.
     *
-    *  @exception SAML2Exception , if it could not create String object
+    *  @exception SAML2Exception if it could not create String object
     *  @return a  String representation of this Object.
     */
     public String toXMLString()
@@ -343,7 +344,7 @@ public String toXMLString()
     *          qualifier is prepended to the Element when converted
     *  @param declareNS determines whether or not the namespace is declared
     *          within the Element.
-    *  @exception SAML2Exception ,if it could not create String object.
+    *  @exception SAML2Exception if it could not create String object.
     *  @return a String , String representation of this Object.
     **/
    
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDResponseImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDResponseImpl.java
index ede83efc19..e4c286e901 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDResponseImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ManageNameIDResponseImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ManageNameIDResponseImpl.java,v 1.2 2008/06/25 05:48:00 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -48,10 +49,9 @@
  * Java content class for ManageNameIDResponse element declaration.
  * 
                  The following schema fragment specifies the expected
  * 	content contained within this java content object.
- * 
                  
  * 
                    * <element name="ManageNameIDResponse" 
- *   type="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"/>
+ *   type="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"/>
  * 
                  
  */
 public class ManageNameIDResponseImpl 
@@ -69,9 +69,9 @@ public ManageNameIDResponseImpl() {
      * Constructor to create ManageNameIDResponse Object. 
      *
      * @param element Document Element of 
-     *         ManageNameIDRequest object.
-     * @throws SAML2Exception 
-     *         if ManageNameIDRequest cannot be created.
+     *         ManageNameIDRequest object.
+     * @throws SAML2Exception if a SAML2 error occurs
+     *         if ManageNameIDRequest cannot be created.
      */
     public ManageNameIDResponseImpl(Element element) throws SAML2Exception {
     	parseElement(element);
@@ -85,9 +85,9 @@ public ManageNameIDResponseImpl(Element element) throws SAML2Exception {
      * Constructor to create ManageNameIDResponse Object. 
      *
      * @param xmlString XML Representation of 
-     *        the ManageNameIDRequest object.
-     * @throws SAML2Exception 
-     *        if ManageNameIDRequest cannot be created.
+     *        the ManageNameIDRequest object.
+     * @throws SAML2Exception if a SAML2 error occurs
+     *        if ManageNameIDRequest cannot be created.
      */
     public ManageNameIDResponseImpl(String xmlString) throws SAML2Exception {
     	Document doc = XMLUtils.toDOMDocument(xmlString, SAMLUtils.debug);
@@ -168,7 +168,7 @@ private void parseElement(Element element) throws SAML2Exception {
      * document String format based on the ManageNameIDResponse 
      * schema described above.
      * @return An XML String representing the ManageNameIDResponse.
-     * @throws SAML2Exception ,if it could not create String object.
+     * @throws SAML2Exception if it could not create String object.
      */
     public String toXMLString() throws SAML2Exception {
         return toXMLString(true, false);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingRequestImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingRequestImpl.java
index 185a8775db..589b764a0f 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingRequestImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingRequestImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: NameIDMappingRequestImpl.java,v 1.3 2008/11/10 22:57:03 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.protocol.impl;
@@ -71,9 +72,9 @@ public NameIDMappingRequestImpl() {
     /**
      * Constructor to create ManageNameIDRequest Object. 
      *
-     * @param element Document Element of ManageNameIDRequest
+     * @param element Document Element of ManageNameIDRequest
      *     object.
-     * @throws SAML2Exception if ManageNameIDRequest cannot be
+     * @throws SAML2Exception if ManageNameIDRequest cannot be
      *     created.
      */
     public NameIDMappingRequestImpl(Element element) throws SAML2Exception {
@@ -89,8 +90,8 @@ public NameIDMappingRequestImpl(Element element) throws SAML2Exception {
      * Constructor to create ManageNameIDRequest Object. 
      *
      * @param xmlString XML Representation of the
-     *     ManageNameIDRequest object.
-     * @throws SAML2Exception if ManageNameIDRequest cannot be
+     *     ManageNameIDRequest object.
+     * @throws SAML2Exception if ManageNameIDRequest cannot be
      *     created.
      */
     public NameIDMappingRequestImpl(String xmlString) throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingResponseImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingResponseImpl.java
index 8dfa74b8d9..772f0d93e7 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingResponseImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDMappingResponseImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: NameIDMappingResponseImpl.java,v 1.2 2008/06/25 05:48:00 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.protocol.impl;
@@ -63,9 +64,9 @@ public NameIDMappingResponseImpl() {
     /**
      * Constructor to create ManageNameIDResponse Object. 
      *
-     * @param element Document Element of ManageNameIDRequest
+     * @param element Document Element of ManageNameIDRequest
      *     object.
-     * @throws SAML2Exception if ManageNameIDRequest cannot be
+     * @throws SAML2Exception if ManageNameIDRequest cannot be
      *     created.
      */
     public NameIDMappingResponseImpl(Element element) throws SAML2Exception {
@@ -80,8 +81,8 @@ public NameIDMappingResponseImpl(Element element) throws SAML2Exception {
      * Constructor to create ManageNameIDResponse Object. 
      *
      * @param xmlString XML representation of the
-     *     ManageNameIDRequest object.
-     * @throws SAML2Exception if ManageNameIDRequest cannot be
+     *     ManageNameIDRequest object.
+     * @throws SAML2Exception if ManageNameIDRequest cannot be
      *     created.
      */
     public NameIDMappingResponseImpl(String xmlString) throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDPolicyImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDPolicyImpl.java
index 8632f3a3ec..8aa868c399 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDPolicyImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NameIDPolicyImpl.java
@@ -25,6 +25,7 @@
  * $Id: NameIDPolicyImpl.java,v 1.5 2008/08/31 05:49:48 bina Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -66,7 +67,7 @@ public NameIDPolicyImpl() {
      * Constructor creates NameIDPolicy object.
      *
      * @param element Document Element of NameIDPolicy Object.
-     * @throws SAML2Exception if NameIDPolicy cannot be created.
+     * @throws SAML2Exception if NameIDPolicy cannot be created.
      */
     public NameIDPolicyImpl(Element element) throws SAML2Exception {
 	parseElement(element);
@@ -77,7 +78,7 @@ public NameIDPolicyImpl(Element element) throws SAML2Exception {
      *
      * @param xmlString XML String Representation of NameIDPolicy
      *	      object.
-     * @throws SAML2Exception if NameIDPolicy cannot be created.
+     * @throws SAML2Exception if NameIDPolicy cannot be created.
      */
 
     public NameIDPolicyImpl(String xmlString) throws SAML2Exception {
@@ -117,7 +118,7 @@ public void setFormat(String uri) throws SAML2Exception {
     }
     
     /** 
-     * Returns the value of the SPNameQualifier attribute.
+     * Returns the value of the SPNameQualifier attribute.
      *
      * @return the value of SPNameQualifier attribute.
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewEncryptedIDImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewEncryptedIDImpl.java
index c6ac2b460c..a580615adb 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewEncryptedIDImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewEncryptedIDImpl.java
@@ -25,6 +25,7 @@
  * $Id: NewEncryptedIDImpl.java,v 1.2 2008/06/25 05:48:00 qcheng Exp $
  *
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.protocol.impl;
 
@@ -47,10 +48,9 @@
  * Java content class for NewEncryptedID element declaration.
  * 
                  The following schema fragment specifies the expected 	
  * content contained within this java content object. 	
- * 
                  
  * 
                    * <element name="NewEncryptedID" 
- *     type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ *     type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                  
  */
 
@@ -88,9 +88,9 @@ private void parseElement(Element element)
      * Constructor to create NewEncryptedID Object. 
      *
      * @param element Document Element of 
-     *         NewEncryptedID object.
-     * @throws SAML2Exception 
-     *         if NewEncryptedID cannot be created.
+     *         NewEncryptedID object.
+     * @throws SAML2Exception if a SAML2 error occurs
+     *         if NewEncryptedID cannot be created.
      */
     public NewEncryptedIDImpl(Element element) 
     throws SAML2Exception {
@@ -102,9 +102,9 @@ public NewEncryptedIDImpl(Element element)
      * Constructor to create NewEncryptedID Object. 
      *
      * @param xmlString XML Representation of 
-     *        the NewEncryptedID object.
-     * @throws SAML2Exception 
-     *        if NewEncryptedID cannot be created.
+     *        the NewEncryptedID object.
+     * @throws SAML2Exception if a SAML2 error occurs
+     *        if NewEncryptedID cannot be created.
      */
     public NewEncryptedIDImpl(String xmlString)
     throws SAML2Exception {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewIDImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewIDImpl.java
index 6ad79cbc25..3ce2876ddf 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewIDImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/NewIDImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: NewIDImpl.java,v 1.2 2008/06/25 05:48:00 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -56,7 +57,7 @@ public class NewIDImpl implements NewID {
      * Constructor to create the NewID Object.
      *
      * @param element Document Element of NewID Object.
-     * @throws SAML2Exception if NewID cannot be created.
+     * @throws SAML2Exception if NewID cannot be created.
      */
 
     public NewIDImpl(Element element) throws SAML2Exception {
@@ -66,8 +67,8 @@ public NewIDImpl(Element element) throws SAML2Exception {
     /**
      * Constructor to create the NewID Object.
      *
-     * @param value of the NewID.
-     * @throws SAML2Exception if NewID cannot be created.
+     * @param value of the NewID.
+     * @throws SAML2Exception if NewID cannot be created.
      */
     public NewIDImpl(String value) throws SAML2Exception {
         newID = value;	
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestAbstractImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestAbstractImpl.java
index 4b34ae47a1..a3dbec12d6 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestAbstractImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestAbstractImpl.java
@@ -25,6 +25,7 @@
  * $Id: RequestAbstractImpl.java,v 1.5 2008/06/25 05:48:00 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.saml2.protocol.impl;
 
@@ -290,7 +291,6 @@ public void setConsent(String consent) throws SAML2Exception {
      * Sets the value of the Consent attribute.
      *
      * @return the value of Consent attribute.
-     * @throws SAML2Exception if the object is immutable.
      * @see #setConsent(String)
      */
     public String getConsent() {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestedAuthnContextImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestedAuthnContextImpl.java
index 990de5af15..21a37ca9d3 100755
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestedAuthnContextImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequestedAuthnContextImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequestedAuthnContextImpl.java,v 1.2 2008/06/25 05:48:00 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -50,19 +51,18 @@
  * Java content class for RequestedAuthnContextType complex type.
  * 
                  The following schema fragment specifies the expected 
  *	content contained within this java content object. 
- * 
                  
  * 
                  - * <complexType name="RequestedAuthnContextType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef" maxOccurs="unbounded"/>
- *       </choice>
- *       <attribute name="Comparison" type="{urn:oasis:names:tc:SAML:2.0:protocol}AuthnContextComparisonType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestedAuthnContextType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef" maxOccurs="unbounded"/>
+ *       </choice>
+ *       <attribute name="Comparison" type="{urn:oasis:names:tc:SAML:2.0:protocol}AuthnContextComparisonType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class RequestedAuthnContextImpl implements RequestedAuthnContext {
@@ -189,7 +189,7 @@ public List getAuthnContextClassRef() {
      * 
      * @param value List of String representing authentication context
      *          class referance.
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *          if the object is immutable.
      * @see #getAuthnContextClassRef
      */
@@ -233,7 +233,7 @@ public List getAuthnContextDeclRef() {
      *
      * @param value List of String representing authentication context
      *          declaration referance.
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *          if the object is immutable.
      * @see #getAuthnContextDeclRef
      */
@@ -269,7 +269,7 @@ public String getComparison() {
      * Sets the value of the comparison property.
      * 
      * @param value An String representing comparison method.
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *          if the object is immutable.
      * @see #getComparison
      */
@@ -287,7 +287,7 @@ public void setComparison(String value) throws SAML2Exception {
      * Returns an XML Representation of this object.
      *
      * @return A string containing the valid XML for this element
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *          if unable to get the XML string. 
      */
     public String toXMLString() throws SAML2Exception {
@@ -302,7 +302,7 @@ public String toXMLString() throws SAML2Exception {
      * @param declareNS Determines whether or not the namespace is declared
      *          within the Element.
      * @return A string containing the valid XML for this element
-     * @throws com.sun.identity.saml2.common.SAML2Exception
+     * @throws com.sun.identity.saml2.common.SAML2Exception if a SAML2 error occurs
      *          if unable to get the XML string. 
      */
     public String toXMLString(boolean includeNSPrefix, boolean declareNS) 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequesterIDImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequesterIDImpl.java
index 582e870d41..0a5c3f8e23 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequesterIDImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/RequesterIDImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequesterIDImpl.java,v 1.2 2008/06/25 05:48:00 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -61,7 +62,7 @@ public RequesterIDImpl() {
      * Constructor to create the RequesterID Object.
      *
      * @param element Document Element of RequesterID Object.
-     * @throws SAML2Exception if RequesterID cannot be created.
+     * @throws SAML2Exception if RequesterID cannot be created.
      */
 
     public RequesterIDImpl(Element element) throws SAML2Exception {
@@ -73,7 +74,7 @@ public RequesterIDImpl(Element element) throws SAML2Exception {
      *
      * @param xmlString XML String Representation of RequesterID
      *	      object.
-     * @throws SAML2Exception if RequesterID cannot be created.
+     * @throws SAML2Exception if RequesterID cannot be created.
      */
     public RequesterIDImpl(String xmlString) throws SAML2Exception {
 	Document xmlDocument =
@@ -98,7 +99,7 @@ public String getValue() {
     /** 
      * Sets the value of the RequesterID URI.
      *
-     * @param value of the RequesterID URI.
+     * @param value of the RequesterID URI.
      * @throws SAML2Exception if the object is immutable.
      * @see #getValue
      */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ResponseImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ResponseImpl.java
index d963951e28..2ebcf3541a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ResponseImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ResponseImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ResponseImpl.java,v 1.4 2009/12/16 05:26:39 ericow Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -67,18 +68,17 @@
  * The Response message element is used when a response consists
  * of a list of zero or more assertions that satisfy the request. It has the
  * complex type ResponseType.
- * 
                  
  * 
                  - * <complexType name="ResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  */
 public class ResponseImpl extends StatusResponseImpl implements Response {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ScopingImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ScopingImpl.java
index e3050808a5..fc99ae54a3 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ScopingImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/protocol/impl/ScopingImpl.java
@@ -25,6 +25,7 @@
  * $Id: ScopingImpl.java,v 1.5 2009/03/12 20:32:41 huacui Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.protocol.impl;
@@ -71,7 +72,7 @@ public ScopingImpl() {
      * Constructor to create the Scoping Object.
      *
      * @param element Document Element of Scoping Object.
-     * @throws SAML2Exception if Scoping cannot be created.
+     * @throws SAML2Exception if Scoping cannot be created.
      */
 
     public ScopingImpl(Element  element) throws SAML2Exception {
@@ -83,7 +84,7 @@ public ScopingImpl(Element  element) throws SAML2Exception {
      *
      * @param xmlString XML String Representation of Scoping
      *        Object.
-     * @throws SAML2Exception if Scoping cannot be created.
+     * @throws SAML2Exception if Scoping cannot be created.
      */
 
     public ScopingImpl(String xmlString) throws SAML2Exception {
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..d74fee7ddc 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;
 
@@ -271,7 +271,7 @@ public static Response processXACMLQuery(RequestAbstract request,
      *
      * @param entityID entity identifier.
      * @return the Issuer object.
-     * @exception SAML2Exception if there is an error creating
+     * @exception SAML2Exception if there is an error creating
      *            the issuer.
      */
     private static Issuer createIssuer(String entityID)
@@ -287,9 +287,9 @@ private static Issuer createIssuer(String entityID)
      *
      * @param xmlString the String representation of the object.
      * @return the Response object.
-     * @exception IOException if there is an error processing the
+     * @exception IOException if there is an error processing the
      *            response.
-     * @exception SAML2Exception if there is an error processing
+     * @exception SAML2Exception if there is an error processing
      *            the response.
      */
     private static Response getSAMLResponse(String xmlString)
@@ -460,7 +460,7 @@ private static String getPDPEndPoint(String pdpEntityID)
      * @param realm the realm of the entity.
      * @param pepEntityId identifier of the PEP.
      * @return the XACMLAuthzDecisionQueryConfigElement object.
-     * @exception SAML2Exception if there is an error retreiving
+     * @exception SAML2Exception if there is an error retreiving
      *            the extended configuration.
      */
     private static XACMLAuthzDecisionQueryConfigElement getPEPConfig(
@@ -493,7 +493,7 @@ private static XACMLAuthzDecisionQueryConfigElement getPEPConfig(
      * @param realm the realm of the entity.
      * @param pdpEntityId identifier of the PDP.
      * @return the XACMLPDPConfigElement object.
-     * @exception SAML2Exception if there is an error retreiving
+     * @exception SAML2Exception if there is an error retreiving
      *            the extended configuration.
      */
     private static XACMLPDPConfigElement getPDPConfig(
@@ -529,7 +529,7 @@ private static XACMLPDPConfigElement getPDPConfig(
      * @param realm the realm of the entity.
      * @param pepEntityID entity identifier of the PEP.
      * @param samlResponse the Response.
-     * @exception SAML2Exception if there is an error.
+     * @exception SAML2Exception if there is an error.
      */
     private static Response verifyResponse(String realm,String pepEntityID,
             Response samlResponse) throws SAML2Exception {
@@ -701,7 +701,7 @@ private static Response verifyResponse(String realm,String pepEntityID,
      *
      * @param samlResponse the Response object.
      * @return Response object.
-     * @exception SAML2Exception if there is an error creating
+     * @exception SAML2Exception if there is an error creating
      *            the response.
      */
     private static Response createResponse(Response samlResponse,
@@ -728,7 +728,7 @@ private static Response createResponse(Response samlResponse,
      * @param pepConfig the PEP extended configuration object.
      * @param attrName the attribute name whose value is to be retreived.
      * @return value of the attribute.
-     * @exception SAML2MetaException if there is an error
+     * @exception SAML2MetaException if there is an error
      *             retreiving the value.
      */
     private static String getAttributeValueFromPEPConfig(
@@ -761,7 +761,7 @@ private static String getAttributeValueFromPEPConfig(
      * @param pdpConfig the PDP extended configuration object.
      * @param attrName the attribute name whose value is to be retreived.
      * @return value of the attribute.
-     * @exception SAML2MetaException if there is an error
+     * @exception SAML2MetaException if there is an error
      *             retreiving the value.
      */
     private static String getAttributeValueFromPDPConfig(
@@ -797,7 +797,7 @@ private static String getAttributeValueFromPDPConfig(
      * @param realm the entity's realm.
      * @param pepEntityID entity identifier of the PEP.
      * @return true if the value of the attribute is true.
-     * @exception SAML2MetaException if there is an error
+     * @exception SAML2MetaException if there is an error
      * retreiving the configuration.
      */
     private static boolean wantAssertionSigned(String realm,String pepEntityID)
@@ -818,7 +818,7 @@ private static boolean wantAssertionSigned(String realm,String pepEntityID)
      * @param realm the entity's realm.
      * @param pepEntityID entity identifier of PEP.
      * @param pdpEntityID entity identifier of PDP.
-     * @throws SAML2Exception if error in verifying
+     * @throws SAML2Exception if error in verifying
      *         the signature.
      */
     private static void signAttributeQuery(XACMLAuthzDecisionQuery xacmlQuery,
@@ -856,7 +856,7 @@ private static void signAttributeQuery(XACMLAuthzDecisionQuery xacmlQuery,
      * @param pdpEntityID entity identifier of PDP.
      * @param response Response to be verified
      * @return true if signature is valid.
-     * @throws SAML2Exception if error in verifying
+     * @throws SAML2Exception if error in verifying
      *         the signature.
      */
     public static boolean verifySignedResponse(String pepEntityID,
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..5bb2e088c6 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;
 
@@ -223,7 +223,7 @@ public SOAPMessage onMessage(
      * @param realm the realm name of the Policy Decision Point (PDP).
      * @param pdpEntityID the entity id of the policy decision provider.
      * @param assertion the Assertion to be signed.
-     * @exception SAML2Exception it there is an error signing
+     * @exception SAML2Exception it there is an error signing
      *            the assertion.
      */
     static void signAssertion(String realm,String pdpEntityID,
@@ -262,7 +262,7 @@ static void signAssertion(String realm,String pdpEntityID,
      * @param request the HttpServletRequest object.
      * @param soapMsg the SOAPMessage object
      * @return the Response object.
-     * @exception SAML2Exception if there is an error processing
+     * @exception SAML2Exception if there is an error processing
      *            the request.
      */
     Response processSAMLRequest(String realm,String pdpEntityID,Element reqAbs,
@@ -329,7 +329,7 @@ Response processSAMLRequest(String realm,String pdpEntityID,Element reqAbs,
      * @param samlRequest the RequestAbstract object.
      * @param request the HttpServletRequest object.
      * @param soapMsg the SOAPMessage object.
-     * @exception SAML2Exception if there is an error processing
+     * @exception SAML2Exception if there is an error processing
      *            the request and returning a  response.
      */
     Response processXACMLResponse(String realm,String pdpEntityID,
@@ -470,11 +470,11 @@ Response processXACMLResponse(String realm,String pdpEntityID,
     /**
      * Signs the Response.
      *
-     * @param response the Response object.
+     * @param response the Response object.
      * @param realm the realm of the entity.
      * @param pepEntityID Policy Enforcement Point Entity Identitifer.
      * @param pdpEntityID Policy Decision Point Entity Identifier.
-     * @exception SAML2Exception if there is an exception.
+     * @exception SAML2Exception if there is an exception.
      */
     static void signResponse(Response response,
                                String realm, String pepEntityID,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/client/WSFederationClient.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/client/WSFederationClient.java
index 2835503712..245618d1f5 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/client/WSFederationClient.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/client/WSFederationClient.java
@@ -24,7 +24,7 @@
  *
  * $Id: WSFederationClient.java,v 1.1 2009/12/14 23:42:47 mallas Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.wsfederation.client;
 
@@ -54,7 +54,7 @@ public class WSFederationClient {
      * @param entityRole the entity role of the federation profile.
      *        Possible values are "RP" or "IP".
      * @return the user's SAML assertion xml string.
-     * @throws com.sun.identity.wsfederation.common.WSFederationException
+     * @throws com.sun.identity.wsfederation.common.WSFederationException if a WS-Federation error occurs
      */
     public static String getUserSAMLAssertion(String tokenID,
             String entityID, String entityRole) throws WSFederationException {
@@ -81,7 +81,7 @@ public static String getUserSAMLAssertion(String tokenID,
      * @param entityRole the entity role of the federation profile.
      *        Possible values are "RP" or "IP".
      * @return the user's SAML assertion xml string.
-     * @throws com.sun.identity.wsfederation.common.WSFederationException
+     * @throws com.sun.identity.wsfederation.common.WSFederationException if a WS-Federation error occurs
      */
     public static String getUserSAMLAssertion(String tokenID, String url,
             String entityID, String entityRole) throws WSFederationException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/AccountUtils.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/AccountUtils.java
index e6e073c5c7..6f6b677456 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/AccountUtils.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/common/AccountUtils.java
@@ -24,6 +24,7 @@
  *
  * $Id: AccountUtils.java,v 1.2 2008/06/25 05:48:04 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.wsfederation.common;
@@ -43,7 +44,7 @@
 
 /**
  * AccountUtils is a utility class for setting and retrieving 
- * the WS-Federation account federation information.
+ * the WS-Federation account federation information.
  */
 
 public class AccountUtils {
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..47cbe39aac 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,7 @@
  * $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
  */
 
 
@@ -818,7 +819,7 @@ public void validateMetaAliasForNewEntity(String realm, List newMetaAlia
      *
      * @param realm The given realm.
      * @return all the hosted entity metaAliases for a realm or an empty arrayList if not found.
-     * @throws WSFederationMetaException  if unable to retrieve the entity ids.
+     * @throws WSFederationMetaException if unable to retrieve the entity ids.
      */
     public List getAllHostedMetaAliasesByRealm(String realm) throws WSFederationMetaException {
 
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..554b45dad5 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;
 
@@ -365,16 +366,18 @@ public static void verifySignature(Document doc)
     /** 
      * Restores Base64 encoded format.
      * JAXB will change
-     *      
-     *          
+     * 
                  +     *      <ds:X509Data>
+     *          <ds:X509Certificate>
      *  .........
      *  .........
-     *          
-     *      
+     *          </ds:X509Certificate>
+     *      </ds:X509Data>
      *  to
-     *      
-     *          ..................
-     *      
+     *      <ds:X509Data>
+     *          <ds:X509Certificate>..................</ds:X509Certificate>
+     *      </ds:X509Data>
+     * 
                  
      *
      *  This method will restore the format.
      *  @param xmlstr The xml string containing element 'X509Certificate'.
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..eca9354fa7 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
@@ -24,6 +24,7 @@
  *
  * $Id: DefaultAccountMapper.java,v 1.5 2009/10/28 23:58:59 exu Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -93,7 +94,7 @@ public DefaultAccountMapper() {
      * @param nameID NameID object.
      * @param hostEntityID hosted EntityID.
      * @param remoteEntityID remote EntityID.
-     * @exception WSFederationException if any failure.
+     * @exception WSFederationException if any failure.
      */
     protected Map getSearchParameters(NameIdentifier nameID, 
          String realm, String hostEntityID, String remoteEntityID) 
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..cd56217357 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
@@ -24,6 +24,7 @@
  *
  * $Id: DefaultAttributeMapper.java,v 1.4 2009/10/28 23:58:59 exu Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -76,7 +77,7 @@ public DefaultAttributeMapper() {}
      * @return a map of local attributes configuration map.
      *        This map will have a key as the SAML attribute name and the value
      *        is the local attribute. 
-     * @exception WSFederationException if any failured.
+     * @exception WSFederationException if any failured.
      */
     public Map getConfigAttributeMap(
          String realm, String hostEntityID) throws WSFederationException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/IDPAuthenticationMethodMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/IDPAuthenticationMethodMapper.java
index 4a5bd824d3..6fd3f290a6 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/IDPAuthenticationMethodMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/plugins/IDPAuthenticationMethodMapper.java
@@ -24,6 +24,7 @@
  *
  * $Id: IDPAuthenticationMethodMapper.java,v 1.3 2008/06/25 05:48:07 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -34,7 +35,7 @@
 /**
  * 
  * The interface IDPAuthenticationMethodMapper creates an
- * IDPAuthenticationTypeInfo based on the RequestAuthnContext from
+ * IDPAuthenticationTypeInfo based on the RequestAuthnContext from
  * the AuthnRequest sent by a Service Provider and the AuthnContext
  * configuration at the IDP entity config.
  * The implementation of this class will be used by the IDP to find out
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..26e9d40faa 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;
@@ -321,7 +321,7 @@ private SPAttributeMapper getSPAttributeMapper(Map attributes)
      *  @param sessionProvider Session provider
      *  @param attrMap the Attribute Map
      *  @param session the valid session object
-     *  @throws com.sun.identity.plugin.session.SessionException 
+     *  @throws com.sun.identity.plugin.session.SessionException if a session error occurs
      */
     public static void setAttrMapInSession(
         SessionProvider sessionProvider,
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationService.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationService.java
index 4947eb4111..2f25099b81 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationService.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationService.java
@@ -24,7 +24,7 @@
  *
  * $Id: WSFederationService.java,v 1.1 2009/12/14 23:42:49 mallas Exp $
  *
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.wsfederation.servlet;
 
@@ -65,8 +65,7 @@ public class WSFederationService {
      * @param token the user's session.
      * @param entityID the entityID
      * @param entityRole the entity role for e.g. RP or IP
-     * @return the SAML Assertion xml string
-     * @return null if there is a failure.
+     * @return the SAML Assertion xml string, or null if there is a failure.
      */
     @GET
     @Produces("application/xml")
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationServlet.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationServlet.java
index d260bb725f..f43c6078df 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationServlet.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/wsfederation/servlet/WSFederationServlet.java
@@ -24,6 +24,7 @@
  *
  * $Id: WSFederationServlet.java,v 1.6 2008/08/19 19:11:17 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 /*
@@ -49,8 +50,8 @@ public class WSFederationServlet extends HttpServlet {
     /** Handles the HTTP GET method.
      * @param request servlet request
      * @param response servlet response
-     * @throws jakarta.servlet.ServletException 
-     * @throws java.io.IOException 
+     * @throws jakarta.servlet.ServletException if a servlet error occurs
+     * @throws java.io.IOException if an I/O error occurs
      */
     protected void doGet(HttpServletRequest request, 
         HttpServletResponse response)
@@ -83,8 +84,8 @@ protected void doGet(HttpServletRequest request,
     /** Handles the HTTP POST method.
      * @param request servlet request
      * @param response servlet response
-     * @throws jakarta.servlet.ServletException 
-     * @throws java.io.IOException 
+     * @throws jakarta.servlet.ServletException if a servlet error occurs
+     * @throws java.io.IOException if an I/O error occurs
      */
     protected void doPost(HttpServletRequest request, 
         HttpServletResponse response)
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/client/XACMLRequestProcessor.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/client/XACMLRequestProcessor.java
index eca3c86379..d533c581a2 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/client/XACMLRequestProcessor.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/client/XACMLRequestProcessor.java
@@ -25,6 +25,7 @@
  * $Id: XACMLRequestProcessor.java,v 1.4 2009/09/22 23:00:34 madan_ranganath Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.client;
@@ -71,7 +72,7 @@ private XACMLRequestProcessor() {
     
     /**
      * Returns an instance of XACMLRequestProcessor
-     * @exception if can not return an instance of 
+     * @exception XACMLException if can not return an instance of
      *             XACMLRequestProcessor
      */
     public static XACMLRequestProcessor getInstance() throws XACMLException {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Action.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Action.java
index 0216a3efe0..9ad4cc6166 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Action.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Action.java
@@ -24,6 +24,7 @@
  *
  * $Id: Action.java,v 1.2 2008/06/25 05:48:10 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -37,15 +38,14 @@
  * action requested in the Request context by listing a 
  * sequence of Attribute elements associated with the
  * action.
- * 
                  
  * 
                  - * <xs:element name="Action" type="xacml-context:ActionType"/>
- * <xs:complexType name="ActionType">
- *    <xs:sequence>
+ * <xs:element name="Action" type="xacml-context:ActionType"/>
+ * <xs:complexType name="ActionType">
+ *    <xs:sequence>
  *       <xs:element ref="xacml-context:Attribute" minOccurs="0"
- *       maxOccurs="unbounded"/>
- *    <xs:sequence>
- * <xs:complexType>
+ *       maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Attribute.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Attribute.java
index 5183c4c812..dd93a5482d 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Attribute.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Attribute.java
@@ -24,6 +24,7 @@
  *
  * $Id: Attribute.java,v 1.5 2008/06/25 05:48:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -37,18 +38,17 @@
  * action/subject/resource requested in the Request context by 
  * listing a sequence of Attribute elements associated with 
  * the action.
- * 
                  
  * 
                  - * <xs:element name="Attribute" type="xacml-context:AttributeType"/>
- * <xs:complexType name="AttributeType">
- *    <xs:sequence>
+ * <xs:element name="Attribute" type="xacml-context:AttributeType"/>
+ * <xs:complexType name="AttributeType">
+ *    <xs:sequence>
  *       <xs:element ref="xacml-context:AttributeValue" 
- *        maxOccurs="unbounded"/>
- *    <xs:sequence>
- *    <xs:attribute name="AttributeId" type="xs:anyURI" use="required"/>
- *    <xs:attribute name="DataType" type="xs:anyURI" use="required"/>
- *    <xs:attribute name="Issuer" type="xs:string" use="optional"/>
- * <xs:complexType>
+ *        maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ *    <xs:attribute name="AttributeId" type="xs:anyURI" use="required"/>
+ *    <xs:attribute name="DataType" type="xs:anyURI" use="required"/>
+ *    <xs:attribute name="Issuer" type="xs:string" use="optional"/>
+ * <xs:complexType>
  * 
                  
  *
  */
@@ -91,7 +91,7 @@ public interface Attribute {
      * Returns the datatype of the contents of the AttributeValue
      * elements. This will be either a primitive datatype defined by XACML 2.0 
      * specification or a type ( primitive or structured) defined in a  
-     * namespace declared in the  element.
+     * namespace declared in the <xacml-context> element.
      * @return the URI representing the data type.
      */
     public URI getDataType();
@@ -130,7 +130,7 @@ public interface Attribute {
     /**
      * Sets the attribute values for this object
      *
-     * @param attrValues List containing String values
+     * @param attrValues List containing String values
      * of this object.
      *
      * @exception XACMLException if the object is immutable
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Decision.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Decision.java
index f011e11998..2410482e8c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Decision.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Decision.java
@@ -24,6 +24,7 @@
  *
  * $Id: Decision.java,v 1.2 2008/06/25 05:48:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -34,17 +35,17 @@
  * The Decision element is a container of 
  * one or more Decisions issued by policy decision point
  * 
- * 
                  
+ * 
                  
  * Schema:
  * 
                  - * 
- *     
- *         
- *         
- *         
- *         
- *     
- * 
+ * <xs:simpleType name="DecisionType">
+ *     <xs:restriction base="xs:string">
+ *         <xs:enumeration value="Permit"/>
+ *         <xs:enumeration value="Deny"/>
+ *         <xs:enumeration value="Indeterminate"/>
+ *         <xs:enumeration value="NotApplicable"/>
+ *     </xs:restriction>
+ * </xs:simpleType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Environment.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Environment.java
index 23e5a6f0d4..3a99e84973 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Environment.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Environment.java
@@ -24,6 +24,7 @@
  *
  * $Id: Environment.java,v 1.2 2008/06/25 05:48:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -39,15 +40,14 @@
  * environment. These are the environment attributes which are NOT 
  * associated with any of Subject, Resource
  * or Action of the request.
- * 
                  
  * 
                  - * <xs:element name="Environment" type="xacml-context:EnvironmentType"/>
- * <xs:complexType name="EnvironmentType">
- *    <xs:sequence>
+ * <xs:element name="Environment" type="xacml-context:EnvironmentType"/>
+ * <xs:complexType name="EnvironmentType">
+ *    <xs:sequence>
  *       <xs:element ref="xacml-context:Attribute" minOccurs="0"
- *       maxOccurs="unbounded"/>
- *    <xs:sequence>
- * <xs:complexType>
+ *       maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Request.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Request.java
index e8de2b83ac..4bae9a0ecb 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Request.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Request.java
@@ -24,6 +24,7 @@
  *
  * $Id: Request.java,v 1.2 2008/06/25 05:48:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -36,17 +37,16 @@
  * The Request element is the top-level element in the XACML
  * context scehema. Its an abstraction layer used by the policy language.
  * It contains Subject, Resource, Action
- *  and Environment elements.
- * 
                  
+ *  and Environment elements.
  * 
                  - * <xs:complexType name="RequestType">
- *   <xs:sequence>
- *     <xs:element ref="xacml-context:Subject" maxOccurs="unbounded"/>
- *     <xs:element ref="xacml-context:Resource" maxOccurs="unbounded"/>
- *     <xs:element ref="xacml-context:Action"/>
- *     <xs:element ref="xacml-context:Environment"/>
- *   <xs:sequence>
- * <xs:complexType>
+ * <xs:complexType name="RequestType">
+ *   <xs:sequence>
+ *     <xs:element ref="xacml-context:Subject" maxOccurs="unbounded"/>
+ *     <xs:element ref="xacml-context:Resource" maxOccurs="unbounded"/>
+ *     <xs:element ref="xacml-context:Action"/>
+ *     <xs:element ref="xacml-context:Environment"/>
+ *   <xs:sequence>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Resource.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Resource.java
index 1d432c3d0a..84efb22d9e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Resource.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Resource.java
@@ -24,6 +24,7 @@
  *
  * $Id: Resource.java,v 1.3 2008/06/25 05:48:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -38,16 +39,15 @@
  * resource to which access is requested by listing a 
  * sequence of Attribute elements associated with the
  * resource. it may include ResourceContent
- * 
                  
  * 
                  - * <xs:element name="Resource" type="xacml-context:ResourceType"/>
- *   <xs:complexType name="ResourceType">
- *     <xs:sequence>
- *       <xs:element ref="xacml-context:ResourceContent" minOccurs="0"/>
+ * <xs:element name="Resource" type="xacml-context:ResourceType"/>
+ *   <xs:complexType name="ResourceType">
+ *     <xs:sequence>
+ *       <xs:element ref="xacml-context:ResourceContent" minOccurs="0"/>
  *       <xs:element ref="xacml-context:Attribute" minOccurs="0" 
- *          maxOccurs="unbounded"/>
- *    <xs:sequence>
- *  <xs:complexType>
+ *          maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ *  <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/ResourceContent.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/ResourceContent.java
index ad429f4e71..c54764aeee 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/ResourceContent.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/ResourceContent.java
@@ -24,6 +24,7 @@
  *
  * $Id: ResourceContent.java,v 1.2 2008/06/25 05:48:11 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -37,15 +38,14 @@
  * resource to which access is requested by listing a 
  * sequence of Attribute elements associated with the
  * resource. it may include ResourceContent
- * 
                  
  * 
                  - * <xs:complexType name="ResourceContentType" mixed="true">
- *   <xs:sequence>
+ * <xs:complexType name="ResourceContentType" mixed="true">
+ *   <xs:sequence>
  *      <xs:any namespace="##any" processContents="lax" minOccurs="0" 
- *         maxOccurs="unbounded"/>
- *   <xs:sequence>
- *   <xs:anyAttribute namespace="##any" processContents="lax"/>
- * <xs:complexType>
+ *         maxOccurs="unbounded"/>
+ *   <xs:sequence>
+ *   <xs:anyAttribute namespace="##any" processContents="lax"/>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Response.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Response.java
index f8597f2be2..90261499e8 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Response.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Response.java
@@ -24,6 +24,7 @@
  *
  * $Id: Response.java,v 1.2 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -36,14 +37,13 @@
  * The Response element is a container of 
  * one or more Results issued by policy decision point
  * 
- * 
                  
  * 
                    * schema:
- *      <xs:complexType name="ResponseType">
- *          <xs:sequence>
- *              <xs:element ref="xacml-context:Result" maxOccurs="unbounded"/>
- *          <xs:sequence>
- *      <xs:complexType>
+ *      <xs:complexType name="ResponseType">
+ *          <xs:sequence>
+ *              <xs:element ref="xacml-context:Result" maxOccurs="unbounded"/>
+ *          <xs:sequence>
+ *      <xs:complexType>
  * 
                  
  */
 public interface Response {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Result.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Result.java
index 36289f5b6b..d883f68ebe 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Result.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Result.java
@@ -24,6 +24,7 @@
  *
  * $Id: Result.java,v 1.3 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -36,17 +37,16 @@
  * The Result element is a container of 
  * one or more Results issuded by authorization authority.
  * 
- * 
                  
  * 
                    * schema:
- *      <xs:complexType name="ResultType">
- *          <xs:sequence>
- *              <xs:element ref="xacml-context:Decision"/>
- *              <xs:element ref="xacml-context:Status" minOccurs="0"/>
- *              <xs:element ref="xacml:Obligations" minOccurs="0"/>
- *          <xs:sequence>
- *          <xs:attribute name="ResourceId" type="xs:string" use="optional"/>
- *      <xs:complexType>
+ *      <xs:complexType name="ResultType">
+ *          <xs:sequence>
+ *              <xs:element ref="xacml-context:Decision"/>
+ *              <xs:element ref="xacml-context:Status" minOccurs="0"/>
+ *              <xs:element ref="xacml:Obligations" minOccurs="0"/>
+ *          <xs:sequence>
+ *          <xs:attribute name="ResourceId" type="xs:string" use="optional"/>
+ *      <xs:complexType>
  * 
                  
  */
 public interface Result {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Status.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Status.java
index 3f00c472fe..f5774f91c6 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Status.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Status.java
@@ -24,6 +24,7 @@
  *
  * $Id: Status.java,v 1.2 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -36,17 +37,17 @@
  * The Status element is a container of 
  * one or more Statuss issuded by authorization authority.
  * 
- * 
                  
  * 
                    *
  * Schema:
- * <xs:complexType name="StatusType">
- *     <xs:sequence>
- *         <xs:element ref="xacml-context:StatusCode"/>
- *         <xs:element ref="xacml-context:StatusMessage" minOccurs="0"/>
- *         <xs:element ref="xacml-context:StatusDetail" minOccurs="0"/>
- *     <xs:sequence>
- * <xs:complexType>
+ * <xs:complexType name="StatusType">
+ *     <xs:sequence>
+ *         <xs:element ref="xacml-context:StatusCode"/>
+ *         <xs:element ref="xacml-context:StatusMessage" minOccurs="0"/>
+ *         <xs:element ref="xacml-context:StatusDetail" minOccurs="0"/>
+ *     <xs:sequence>
+ * <xs:complexType>
+ * 
                  
  */
 public interface Status {
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusCode.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusCode.java
index a3c99fd4e3..6772b68578 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusCode.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusCode.java
@@ -24,6 +24,7 @@
  *
  * $Id: StatusCode.java,v 1.2 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -35,17 +36,16 @@
  * The StatusCode element is a container of 
  * one or more StatusCodes issuded by authorization authority.
  * 
- * 
                  
  * 
                    *
  * Schema:
- *  <xs:element name="StatusCode" type="xacml-context:StatusCodeType"/>
- *  <xs:complexType name="StatusCodeType">
- *      <xs:sequence>
- *          <xs:element ref="xacml-context:StatusCode" minOccurs="0"/>
- *      <xs:sequence>
- *      <xs:attribute name="Value" type="xs:anyURI" use="required"/>
- *  <xs:complexType>
+ *  <xs:element name="StatusCode" type="xacml-context:StatusCodeType"/>
+ *  <xs:complexType name="StatusCodeType">
+ *      <xs:sequence>
+ *          <xs:element ref="xacml-context:StatusCode" minOccurs="0"/>
+ *      <xs:sequence>
+ *      <xs:attribute name="Value" type="xs:anyURI" use="required"/>
+ *  <xs:complexType>
  * 
                  
  */
 public interface StatusCode {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusDetail.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusDetail.java
index dfc70ca3bd..434c09b926 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusDetail.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusDetail.java
@@ -24,6 +24,7 @@
  *
  * $Id: StatusDetail.java,v 1.2 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -36,17 +37,17 @@
  * The StatusCode element is a container of 
  * one or more Statuss issuded by authorization authority.
  * 
- * 
                  
+ * 
                  
  *  Schema:
  * 
                  - *  <xs:element name="StatusDetail" type="xacml-context:StatusDetailType"/>
- *  <xs:complexType name="StatusDetailType">
- *      <xs:sequence>
+ *  <xs:element name="StatusDetail" type="xacml-context:StatusDetailType"/>
+ *  <xs:complexType name="StatusDetailType">
+ *      <xs:sequence>
  *      <xs:any namespace="##any" processContents="lax" 
- *          minOccurs="0" maxOccurs="unbounded"/>
- *      <xs:sequence>
- *  <xs:complexType>
- * >/pre>
+ *          minOccurs="0" maxOccurs="unbounded"/>
+ *      <xs:sequence>
+ *  <xs:complexType>
+ * 
                  
  */
 public interface StatusDetail {
 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusMessage.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusMessage.java
index 6362f96f0b..4fd3c83811 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusMessage.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/StatusMessage.java
@@ -24,6 +24,7 @@
  *
  * $Id: StatusMessage.java,v 1.2 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -36,11 +37,10 @@
  * The StatusMessage element is a container of 
  * one or more StatusMessages issuded by authorization authority.
  * 
- * 
                  
  * 
                    *
  * Schema:
- *  <xs:element name="StatusMessage" type="xs:string"/>
+ *  <xs:element name="StatusMessage" type="xs:string"/>
  * 
                  
  */
 public interface StatusMessage {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Subject.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Subject.java
index 5fc918f832..fbcb0eb4e4 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Subject.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/Subject.java
@@ -24,6 +24,7 @@
  *
  * $Id: Subject.java,v 1.2 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context;
@@ -38,16 +39,15 @@
  * subject of the Request context by listing a 
  * sequence of Attribute elements associated with the
  * subject. A subject is an entity associated with the access request.
- * 
                  
  * 
                  - * <xs:complexType name="SubjectType">
- *  <xs:sequence>
+ * <xs:complexType name="SubjectType">
+ *  <xs:sequence>
  *   <xs:element ref="xacml-context:Attribute" minOccurs="0"
- *      maxOccurs="unbounded"/>
- * <xs:sequence>
+ *      maxOccurs="unbounded"/>
+ * <xs:sequence>
  * <xs:attribute name="SubjectCategory" type="xs:anyURI" 
- *  default="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"/>
- * <xs:complexType>
+ *  default="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"/>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ActionImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ActionImpl.java
index 563d90565b..3d48119a1c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ActionImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ActionImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ActionImpl.java,v 1.3 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -49,15 +50,14 @@
  * action requested in the Request context by listing a
  * sequence of Attribute elements associated with the
  * action.
- * 
                  
  * 
                  - * <xs:element name="Action" type="xacml-context:ActionType"/>
- * <xs:complexType name="ActionType">
- *    <xs:sequence>
+ * <xs:element name="Action" type="xacml-context:ActionType"/>
+ * <xs:complexType name="ActionType">
+ *    <xs:sequence>
  *       <xs:element ref="xacml-context:Attribute" minOccurs="0"
- *       maxOccurs="unbounded"/>
- *    <xs:sequence>
- * <xs:complexType>
+ *       maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/AttributeImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/AttributeImpl.java
index de4ef8b299..e072771864 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/AttributeImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/AttributeImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: AttributeImpl.java,v 1.4 2008/11/10 22:57:05 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -48,18 +49,17 @@
  * action/subject/resource requested in the Request context by 
  * listing a sequence of Attribute elements associated with 
  * the action.
- * 
                  
  * 
                  - * <xs:element name="Attribute" type="xacml-context:AttributeType"/>
- * <xs:complexType name="AttributeType">
- *    <xs:sequence>
+ * <xs:element name="Attribute" type="xacml-context:AttributeType"/>
+ * <xs:complexType name="AttributeType">
+ *    <xs:sequence>
  *       <xs:element ref="xacml-context:AttributeValue" 
- *        maxOccurs="unbounded"/>
- *    <xs:sequence>
- *    <xs:attribute name="AttributeId" type="xs:anyURI" use="required"/>
- *    <xs:attribute name="DataType" type="xs:anyURI" use="required"/>
- *    <xs:attribute name="Issuer" type="xs:string" use="optional"/>
- * <xs:complexType>
+ *        maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ *    <xs:attribute name="AttributeId" type="xs:anyURI" use="required"/>
+ *    <xs:attribute name="DataType" type="xs:anyURI" use="required"/>
+ *    <xs:attribute name="Issuer" type="xs:string" use="optional"/>
+ * <xs:complexType>
  * 
                  
  *
  */
@@ -107,7 +107,7 @@ public AttributeImpl(String xml) throws XACMLException {
      *
      * @param element A org.w3c.dom.Element representing
      *        DOM tree for Request object
-     * @exception XACML2Exception if it could not process the Element
+     * @exception XACMLException if it could not process the Element
      */
     public AttributeImpl(Element element) throws XACMLException {
         processElement(element);
@@ -232,7 +232,7 @@ public URI getAttributeId() {
     }
 
     /**
-     * Sets the attribiteId of the >Attribute
+     * Sets the attribiteId of the Attribute
      * @param attributeId URI representing the attribite id.
      * @exception XACMLException if the object is immutable
      */
@@ -254,7 +254,7 @@ public void setAttributeId(URI attributeId) throws XACMLException {
      * Returns the datatype of the contents of the AttributeValue
      * elements. This will be either a primitive datatype defined by XACML 2.0 
      * specification or a type ( primitive or structured) defined in a  
-     * namespace declared in the  element.
+     * namespace declared in the <xacml-context> element.
      * @return the URI representing the data type.
      */
     public URI getDataType() {
@@ -338,7 +338,7 @@ public void setAttributeValues(List values) throws XACMLException {
      * Sets the attribute values for this object
      *
      * @param stringValues a List containing
-     *        String values of this object.
+     *        String values of this object.
      * @throws XACMLException if the object is immutable
      *         An object is considered immutable if 
      *         makeImmutable() has been invoked on it. It can
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/DecisionImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/DecisionImpl.java
index ed36822fe8..291d2b9e44 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/DecisionImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/DecisionImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: DecisionImpl.java,v 1.3 2008/06/25 05:48:12 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -43,17 +44,17 @@
  * The Decision element is a container of 
  * one or more Decisions issued by policy decision point
  * 
- * 
                  
+ * 
                  
  * Schema:
  * 
                  - * 
- *     
- *         
- *         
- *         
- *         
- *     
- * 
+ * <xs:simpleType name="DecisionType">
+ *     <xs:restriction base="xs:string">
+ *         <xs:enumeration value="Permit"/>
+ *         <xs:enumeration value="Deny"/>
+ *         <xs:enumeration value="Indeterminate"/>
+ *         <xs:enumeration value="NotApplicable"/>
+ *     </xs:restriction>
+ * </xs:simpleType>
  * 
                  
  * 
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/EnvironmentImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/EnvironmentImpl.java
index dd22da4437..0d1fa6364a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/EnvironmentImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/EnvironmentImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: EnvironmentImpl.java,v 1.3 2008/06/25 05:48:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -50,15 +51,14 @@
  * environment requested in the Request context by listing a 
  * sequence of Attribute elements associated with the
  * environment.
- * 
                  
  * 
                  - * <xs:element name="Environment" type="xacml-context:EnvironmentType"/>
- * <xs:complexType name="EnvironmentType">
- *    <xs:sequence>
+ * <xs:element name="Environment" type="xacml-context:EnvironmentType"/>
+ * <xs:complexType name="EnvironmentType">
+ *    <xs:sequence>
  *       <xs:element ref="xacml-context:Attribute" minOccurs="0"
- *       maxOccurs="unbounded"/>
- *    <xs:sequence>
- * <xs:complexType>
+ *       maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/RequestImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/RequestImpl.java
index 0cc0a219ea..0a8e7238ba 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/RequestImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/RequestImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: RequestImpl.java,v 1.4 2008/11/10 22:57:05 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -55,17 +56,16 @@
  * The Request element is the top-level element in the XACML
  * context schema. Its an abstraction layer used by the policy language.
  * It contains Subject, Resource, Action
- *  and Environment elements.
- * 
                  
+ *  and Environment elements.
  * 
                  - * <xs:complexType name="RequestType">
- *   <xs:sequence>
- *     <xs:element ref="xacml-context:Subject" maxOccurs="unbounded"/>
- *     <xs:element ref="xacml-context:Resource" maxOccurs="unbounded"/>
- *     <xs:element ref="xacml-context:Action"/>
- *     <xs:element ref="xacml-context:Environment"/>
- *   <xs:sequence>
- * <xs:complexType>
+ * <xs:complexType name="RequestType">
+ *   <xs:sequence>
+ *     <xs:element ref="xacml-context:Subject" maxOccurs="unbounded"/>
+ *     <xs:element ref="xacml-context:Resource" maxOccurs="unbounded"/>
+ *     <xs:element ref="xacml-context:Action"/>
+ *     <xs:element ref="xacml-context:Environment"/>
+ *   <xs:sequence>
+ * <xs:complexType>
  * 
                  
  *
  */
@@ -118,7 +118,7 @@ public RequestImpl(String xml) throws XACMLException {
      *
      * @param element A org.w3c.dom.Element representing
      *        DOM tree for Request object
-     * @exception XACML2Exception if it could not process the Element
+     * @exception XACMLException if it could not process the Element
      */
     public  RequestImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResourceImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResourceImpl.java
index f4d1d762be..80dcc8a295 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResourceImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResourceImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ResourceImpl.java,v 1.3 2008/06/25 05:48:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -50,16 +51,15 @@
  * resource to which access is requested by listing a 
  * sequence of Attribute elements associated with the
  * resource. it may include ResourceContent
- * 
                  
  * 
                  - * <xs:element name="Resource" type="xacml-context:ResourceType"/>
- *   <xs:complexType name="ResourceType">
- *     <xs:sequence>
- *       <xs:element ref="xacml-context:ResourceContent" minOccurs="0"/>
+ * <xs:element name="Resource" type="xacml-context:ResourceType"/>
+ *   <xs:complexType name="ResourceType">
+ *     <xs:sequence>
+ *       <xs:element ref="xacml-context:ResourceContent" minOccurs="0"/>
  *       <xs:element ref="xacml-context:Attribute" minOccurs="0" 
- *          maxOccurs="unbounded"/>
- *    <xs:sequence>
- *  <xs:complexType>
+ *          maxOccurs="unbounded"/>
+ *    <xs:sequence>
+ *  <xs:complexType>
  * 
                  
  *
  */
@@ -103,7 +103,7 @@ public ResourceImpl(String xml) throws XACMLException {
      *
      * @param element A org.w3c.dom.Element representing
      *        DOM tree for Resource object
-     * @exception XACML2Exception if it could not process the Element
+     * @exception XACMLException if it could not process the Element
      */
     public ResourceImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResponseImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResponseImpl.java
index 9ac9efd8ff..9318fd022c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResponseImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResponseImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ResponseImpl.java,v 1.4 2008/11/10 22:57:05 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -52,15 +53,15 @@
  * one or more Results issuded by authorization authority.
  *
  *
- * 
                  
+ * 
                  
  * schema:
  * 
                  - *      <xs:complexType name="ResponseType">
- *          <xs:sequence>
+ *      <xs:complexType name="ResponseType">
+ *          <xs:sequence>
  *              <xs:element ref="xacml-context:Result" 
- *                      maxOccurs="unbounded"/>
- *          <xs:sequence>
- *      <xs:complexType>
+ *                      maxOccurs="unbounded"/>
+ *          <xs:sequence>
+ *      <xs:complexType>
  * 
                  
  */
 public class ResponseImpl implements Response {
@@ -79,7 +80,7 @@ public ResponseImpl() {
      * Constructs a Response object from an XML string
      *
      * @param xml string representing a Response object
-     * @throws SAMLException if the XML string could not be processed
+     * @throws XACMLException if the XML string could not be processed
      */
     public ResponseImpl(String xml) throws XACMLException {
         Document document = XMLUtils.toDOMDocument(xml, XACMLSDKUtils.debug);
@@ -102,7 +103,7 @@ public ResponseImpl(String xml) throws XACMLException {
      * @param element XML DOM element representing a Response 
      * object
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     public ResponseImpl(Element element) throws XACMLException {
         processElement(element);
@@ -241,7 +242,7 @@ public void makeImmutable() {
      * @param element XML DOM element representing a Response 
      * object
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     private void processElement(Element element) throws XACMLException {
         if (element == null) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResultImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResultImpl.java
index 3d9528d25b..559a20f289 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResultImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/ResultImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ResultImpl.java,v 1.4 2008/11/10 22:57:05 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -53,17 +54,17 @@
  * The Result element contains decision, status and obligations
  * per resource id
  *
- * 
                  
+ * 
                  
  * schema
  * 
                  - *  <xs:complexType name="ResultType">
- *      <xs:sequence>
- *          <xs:element ref="xacml-context:Decision"/>
- *          <xs:element ref="xacml-context:Status" minOccurs="0"/>
- *          <xs:element ref="xacml:Obligations" minOccurs="0"/>
- *      <xs:sequence>
- *      <xs:attribute name="ResourceId" type="xs:string" use="optional"/>
- *  <xs:complexType>
+ *  <xs:complexType name="ResultType">
+ *      <xs:sequence>
+ *          <xs:element ref="xacml-context:Decision"/>
+ *          <xs:element ref="xacml-context:Status" minOccurs="0"/>
+ *          <xs:element ref="xacml:Obligations" minOccurs="0"/>
+ *      <xs:sequence>
+ *      <xs:attribute name="ResourceId" type="xs:string" use="optional"/>
+ *  <xs:complexType>
  *
  * 
                  
  */
@@ -86,7 +87,7 @@ public ResultImpl() throws XACMLException {
      * Constructs a Result object from an XML string
      *
      * @param xml string representing a Result object
-     * @throws SAMLException if the XML string could not be processed
+     * @throws XACMLException if the XML string could not be processed
      */
     public ResultImpl(String xml) throws XACMLException {
         Document document = XMLUtils.toDOMDocument(xml, XACMLSDKUtils.debug);
@@ -109,7 +110,7 @@ public ResultImpl(String xml) throws XACMLException {
      * @param element XML DOM element representing a Result 
      * object
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     public ResultImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusCodeImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusCodeImpl.java
index b8451eeb32..afb6a12318 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusCodeImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusCodeImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: StatusCodeImpl.java,v 1.3 2008/06/25 05:48:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -47,17 +48,16 @@
  * The StatusCode element is a container of 
  * one or more StatusCodes issuded by authorization authority.
  * 
- * 
                  
  * 
                    *
  * Schema:
- *  <xs:element name="StatusCode" type="xacml-context:StatusCodeType"/>
- *  <xs:complexType name="StatusCodeType">
- *      <xs:sequence>
- *          <xs:element ref="xacml-context:StatusCode" minOccurs="0"/>
- *      <xs:sequence>
- *      <xs:attribute name="Value" type="xs:anyURI" use="required"/>
- *  <xs:complexType>
+ *  <xs:element name="StatusCode" type="xacml-context:StatusCodeType"/>
+ *  <xs:complexType name="StatusCodeType">
+ *      <xs:sequence>
+ *          <xs:element ref="xacml-context:StatusCode" minOccurs="0"/>
+ *      <xs:sequence>
+ *      <xs:attribute name="Value" type="xs:anyURI" use="required"/>
+ *  <xs:complexType>
  * 
                  
  */
 public class StatusCodeImpl implements StatusCode {
@@ -77,7 +77,7 @@ public StatusCodeImpl() throws XACMLException {
      * Constructs a StatusCode object from an XML string
      *
      * @param xml string representing a StatusCode object
-     * @throws SAMLException if the XML string could not be processed
+     * @throws XACMLException if the XML string could not be processed
      */
     public StatusCodeImpl(String xml) throws XACMLException {
         Document document = XMLUtils.toDOMDocument(xml, XACMLSDKUtils.debug);
@@ -100,7 +100,7 @@ public StatusCodeImpl(String xml) throws XACMLException {
      * @param element XML DOM element representing a StatusCode 
      * object
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     public StatusCodeImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusDetailImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusDetailImpl.java
index 63488397c0..5f8cdea239 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusDetailImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusDetailImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: StatusDetailImpl.java,v 1.3 2008/06/25 05:48:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -44,17 +45,17 @@
  * The StatusCode element is a container of 
  * one or more Statuss issuded by authorization authority.
  * 
- * 
                  
+ * 
                  
  *  Schema:
  * 
                  - *  <xs:element name="StatusDetail" type="xacml-context:StatusDetailType"/>
- *  <xs:complexType name="StatusDetailType">
- *      <xs:sequence>
+ *  <xs:element name="StatusDetail" type="xacml-context:StatusDetailType"/>
+ *  <xs:complexType name="StatusDetailType">
+ *      <xs:sequence>
  *      <xs:any namespace="##any" processContents="lax" 
- *          minOccurs="0" maxOccurs="unbounded"/>
- *      <xs:sequence>
- *  <xs:complexType>
- * >/pre>
+ *          minOccurs="0" maxOccurs="unbounded"/>
+ *      <xs:sequence>
+ *  <xs:complexType>
+ * 
                  
  */
 public class StatusDetailImpl implements StatusDetail {
 
@@ -75,7 +76,7 @@ public StatusDetailImpl() throws XACMLException {
      * Constructs a StatusDetail object from an XML string
      *
      * @param xml string representing a StatusDetail object
-     * @throws SAMLException if the XML string could not be processed
+     * @throws XACMLException if the XML string could not be processed
      */
     public StatusDetailImpl(String xml) throws XACMLException {
         Document document = XMLUtils.toDOMDocument(xml, XACMLSDKUtils.debug);
@@ -98,7 +99,7 @@ public StatusDetailImpl(String xml) throws XACMLException {
      * @param element XML DOM element representing a StatusDetail 
      * object
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     public StatusDetailImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusImpl.java
index 8f9b63b37c..5c1eae09c2 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: StatusImpl.java,v 1.3 2008/06/25 05:48:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -52,17 +53,17 @@
  * The Status element is a container of 
  * one or more Statuss issuded by authorization authority.
  * 
- * 
                  
  * 
                    *
  * Schema:
- * <xs:complexType name="StatusType">
- *     <xs:sequence>
- *         <xs:element ref="xacml-context:StatusCode"/>
- *         <xs:element ref="xacml-context:StatusMessage" minOccurs="0"/>
- *         <xs:element ref="xacml-context:StatusDetail" minOccurs="0"/>
- *     <xs:sequence>
- * <xs:complexType>
+ * <xs:complexType name="StatusType">
+ *     <xs:sequence>
+ *         <xs:element ref="xacml-context:StatusCode"/>
+ *         <xs:element ref="xacml-context:StatusMessage" minOccurs="0"/>
+ *         <xs:element ref="xacml-context:StatusDetail" minOccurs="0"/>
+ *     <xs:sequence>
+ * <xs:complexType>
+ * 
                  
  */
 public class StatusImpl implements Status {
 
@@ -81,7 +82,7 @@ public StatusImpl() throws XACMLException {
      * Constructs a Status object from an XML string
      *
      * @param xml string representing a Status object
-     * @throws SAMLException if the XML string could not be processed
+     * @throws XACMLException if the XML string could not be processed
      */
     public StatusImpl(String xml) throws XACMLException {
         Document document = XMLUtils.toDOMDocument(xml, XACMLSDKUtils.debug);
@@ -104,7 +105,7 @@ public StatusImpl(String xml) throws XACMLException {
      * @param element XML DOM element representing a Status 
      * object
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     public StatusImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusMessageImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusMessageImpl.java
index 3e5bc1e4d8..4b6d7491e0 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusMessageImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/StatusMessageImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: StatusMessageImpl.java,v 1.3 2008/06/25 05:48:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -43,11 +44,10 @@
  * The StatusMessage element is a container of 
  * one or more StatusMessages issuded by authorization authority.
  * 
- * 
                  
  * 
                    *
  * Schema:
- *  <xs:element name="StatusMessage" type="xs:string"/>
+ *  <xs:element name="StatusMessage" type="xs:string"/>
  * 
                  
  */
 public class StatusMessageImpl implements StatusMessage {
@@ -65,7 +65,7 @@ public StatusMessageImpl() throws XACMLException {
      * Constructs a StatusMessage object from an XML string
      *
      * @param xml string representing a StatusMessage object
-     * @throws SAMLException if the XML string could not be processed
+     * @throws XACMLException if the XML string could not be processed
      */
     public StatusMessageImpl(String xml) throws XACMLException {
         Document document = XMLUtils.toDOMDocument(xml, XACMLSDKUtils.debug);
@@ -87,7 +87,7 @@ public StatusMessageImpl(String xml) throws XACMLException {
      * @param element XML DOM element representing a StatusMessage 
      * object
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     public StatusMessageImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/SubjectImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/SubjectImpl.java
index 2a0d0392cb..af0ac1fc81 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/SubjectImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/context/impl/SubjectImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: SubjectImpl.java,v 1.3 2008/06/25 05:48:13 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.context.impl;
@@ -49,16 +50,15 @@
  * subject of the Request context by listing a 
  * sequence of Attribute elements associated with the
  * subject. A subject is an entity associated with the access request.
- * 
                  
  * 
                  - * <xs:complexType name="SubjectType">
- *  <xs:sequence>
+ * <xs:complexType name="SubjectType">
+ *  <xs:sequence>
  *   <xs:element ref="xacml-context:Attribute" minOccurs="0"
- *      maxOccurs="unbounded"/>
- * <xs:sequence>
+ *      maxOccurs="unbounded"/>
+ * <xs:sequence>
  * <xs:attribute name="SubjectCategory" type="xs:anyURI" 
- *  default="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"/>
- * <xs:complexType>
+ *  default="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"/>
+ * <xs:complexType>
  * 
                  
  *
  */
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationImpl.java
index 988f907424..7f5c41804c 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ObligationImpl.java,v 1.3 2008/11/10 22:57:06 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.policy.impl;
@@ -51,21 +52,20 @@
  * authorization authority.
  * 
  *
- * 
                  
  * 
                    *
- *   <xs:element name="Obligation" type="xacml:ObligationType"/>
- *      <xs:complexType name="ObligationType">
- *          <xs:sequence>
+ *   <xs:element name="Obligation" type="xacml:ObligationType"/>
+ *      <xs:complexType name="ObligationType">
+ *          <xs:sequence>
  *              <xs:element ref="xacml:AttributeAssignment" minOccurs="0" 
- *                  maxOccurs="unbounded"/>
- *              </xs:sequence>
+ *                  maxOccurs="unbounded"/>
+ *              </xs:sequence>
  *              <xs:attribute name="ObligationId" type="xs:anyURI" 
- *                  use="required"/>
+ *                  use="required"/>
  *              <xs:attribute name="FulfillOn" type="xacml:EffectType" 
- *                  use="required"/>
- *          </xs:complexType>
- *   </xs:element>
+ *                  use="required"/>
+ *          </xs:complexType>
+ *   </xs:element>
  * 
                  
  */
 public class ObligationImpl implements Obligation {
@@ -110,7 +110,7 @@ public ObligationImpl(String xml) throws XACMLException {
      * from a  block of existing XML that has already been built into a DOM.
      *
      * @param element  DOM tree for Request object
-     * @exception XACML2Exception if it could not process the Element
+     * @exception XACMLException if it could not process the Element
      */
     public ObligationImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationsImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationsImpl.java
index 2beb682f89..d02f714919 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationsImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/policy/impl/ObligationsImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: ObligationsImpl.java,v 1.3 2008/11/10 22:57:06 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.policy.impl;
@@ -99,7 +100,7 @@ public ObligationsImpl(String xml) throws XACMLException {
      * @param element XML DOM element representing a
      *        ObligationsImpl  object.
      *
-     * @throws SAMLException if the DOM element could not be processed
+     * @throws XACMLException if the DOM element could not be processed
      */
     public ObligationsImpl(Element element) throws XACMLException {
         processElement(element);
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionQuery.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionQuery.java
index 99ead88c50..6fe164674a 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionQuery.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionQuery.java
@@ -24,6 +24,7 @@
  *
  * $Id: XACMLAuthzDecisionQuery.java,v 1.3 2008/06/25 05:48:14 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.saml2;
@@ -38,46 +39,46 @@
  * extends SAML Protocol schema type RequestAbstractType.
  * It allows an XACML PEP to submit an XACML Request Context in a  SAML
  * Query along with other information. This element is an alternative to 
- * SAML defined  that allows an 
+ * SAML defined <samlp:AuthzDecisionQuery> that allows an
  * XACML PEP  to communicate with an XACML PDP using SAML2 protocol.
  * 
                  
  * Schema:
  * 
                    *<xs:element name="XACMLAuthzDecisionQuery"
- *         type="XACMLAuthzDecisionQueryType"/>
- *<xs:complexType name="XACMLAuthzDecisionQueryType">
- *  <xs:complexContent>
- *    <xs:extension base="samlp:RequestAbstractType">
- *      <xs:sequence>
- *        <xs:element ref="xacml-context:Request"/>
- *      <xs:sequence>
+ *         type="XACMLAuthzDecisionQueryType"/>
+ *<xs:complexType name="XACMLAuthzDecisionQueryType">
+ *  <xs:complexContent>
+ *    <xs:extension base="samlp:RequestAbstractType">
+ *      <xs:sequence>
+ *        <xs:element ref="xacml-context:Request"/>
+ *      <xs:sequence>
  *      <xs:attribute name="InputContextOnly"
  *                    type="boolean"
  *                    use="optional"
- *                    default="false"/>
+ *                    default="false"/>
  *      <xs:attribute name="ReturnContext"
  *                    type="boolean"
  *                    use="optional"
- *                    default="false"/>
- *    <xs:extension>
- *  <xs:complexContent>
- *<xs:complexType>
+ *                    default="false"/>
+ *    <xs:extension>
+ *  <xs:complexContent>
+ *<xs:complexType>
  * 
                  
  *
  * Schema for base:
  * 
                  - *  <complexType name="RequestAbstractType" abstract="true">
- *      <sequence>
- *          <element ref="saml:Issuer" minOccurs="0"/>
- *          <element ref="ds:Signature" minOccurs="0"/>
- *          <element ref="samlp:Extensions" minOccurs="0"/>
- *      <sequence>
- *      <attribute name="ID" type="ID" use="required"/>
- *      <attribute name="Version" type="string" use="required"/>
- *      <attribute name="IssueInstant" type="dateTime" use="required"/>
- *      <attribute name="Destination" type="anyURI" use="optional"/>
- *  	<attribute name="Consent" type="anyURI" use="optional"/>
- *  <complexType>
+ *  <complexType name="RequestAbstractType" abstract="true">
+ *      <sequence>
+ *          <element ref="saml:Issuer" minOccurs="0"/>
+ *          <element ref="ds:Signature" minOccurs="0"/>
+ *          <element ref="samlp:Extensions" minOccurs="0"/>
+ *      <sequence>
+ *      <attribute name="ID" type="ID" use="required"/>
+ *      <attribute name="Version" type="string" use="required"/>
+ *      <attribute name="IssueInstant" type="dateTime" use="required"/>
+ *      <attribute name="Destination" type="anyURI" use="optional"/>
+ *  	<attribute name="Consent" type="anyURI" use="optional"/>
+ *  <complexType>
  * 
                  
  *
  *
@@ -122,10 +123,10 @@ public void setInputContextOnly(boolean inputContextOnly) throws
 
     /**
      * Returns the XML attribute boolean value which provides means
-     * to PEP to request that an xacml-context>Request
+     * to PEP to request that an xacml-context:Request
      * element be included in the XACMlAuthzdecisionStatement
      * resulting from the request. It also governs the contents of that
-     *  element. If this attribite is "true" then the
+     * Request element. If this attribite is "true" then the
      * PDP SHALL include the xacml-context:Request element in the
      * XACMLAuthzDecisionStatement element in the 
      * XACMLResponse.  The xacml-context:Request SHALL
@@ -135,7 +136,7 @@ public void setInputContextOnly(boolean inputContextOnly) throws
      * by the PDP may be included.
      * If this attribute is "false" then the PDP SHALL NOT include the 
      * xacml-context:Request element in the
-     * XACMLAuthzDecisionStatement.
+     * XACMLAuthzDecisionStatement.
      * 
      * @return boolean indicating the value
      * of this attribute.
@@ -149,7 +150,7 @@ public void setInputContextOnly(boolean inputContextOnly) throws
      * @param returnContext boolean indicating the value
      * of this attribute.
      *
-     * @exception XACMLExceptioXACMLException if the object is immutable
+     * @exception XACMLException if the object is immutable
      * An object is considered immutable if 
      * makeImmutable() has been invoked on it. It can
      * be determined by calling isMutable on the object.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionStatement.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionStatement.java
index 6f2432c376..3b2775616b 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionStatement.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/XACMLAuthzDecisionStatement.java
@@ -24,6 +24,7 @@
  *
  * $Id: XACMLAuthzDecisionStatement.java,v 1.4 2008/06/25 05:48:15 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.saml2;
@@ -34,40 +35,38 @@
 import com.sun.identity.saml2.assertion.Statement;
 
 /**
- * XACMLAuthzDecisionStatement is an extension of
+ * XACMLAuthzDecisionStatement is an extension of
  * samlp:StatementAbstractType that is carried in a 
  * SAML Assertion to convey xacml-context:Response
  *
  * Schema:
- * 
                  
  * 
                    * <xs:element name="XACMLAuthzDecisionStatement"
- *          type="xacml-saml:XACMLAuthzDecisionStatementType"/>
- * <xs:complexType name="XACMLAuthzDecisionStatementType">
- *   <xs:complexContent>
- *     <xs:extension base="saml:StatementAbstractType">
- *      <xs:sequence>
- *        <xs:element ref="xacml-context:Response"/>
- *        <xs:element ref="xacml-context:Request"  minOccurs="0"/>
- *      <xs:sequence>
- *    <xs:extension>
- *  <xs:complexContent>
- * <xs:complexType>
- * 
                  - * 
                  
+ *          type="xacml-saml:XACMLAuthzDecisionStatementType"/>
+ * <xs:complexType name="XACMLAuthzDecisionStatementType">
+ *   <xs:complexContent>
+ *     <xs:extension base="saml:StatementAbstractType">
+ *      <xs:sequence>
+ *        <xs:element ref="xacml-context:Response"/>
+ *        <xs:element ref="xacml-context:Request"  minOccurs="0"/>
+ *      <xs:sequence>
+ *    <xs:extension>
+ *  <xs:complexContent>
+ * <xs:complexType>
+ * <pre>
+ * </p>
  *
  * Schema for Base:
  * Schema for the base type is
- * 
                  
- * 
                  - * <complexType name="StatementAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <p>
+ * <pre>
+ * <complexType name="StatementAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
- * 
                  
  *
  *
  *
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionQueryImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionQueryImpl.java
index f5770acfb3..14c2eb9f54 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionQueryImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionQueryImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: XACMLAuthzDecisionQueryImpl.java,v 1.4 2008/06/25 05:48:15 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.saml2.impl;
@@ -56,45 +57,44 @@
  * extends SAML Protocol schema type RequestAbstractType.
  * It allows an XACML PEP to submit an XACML Request Context in a  SAML
  * Query along with other information. This element is an alternative to 
- * SAML defined  that allows an 
+ * SAML defined <samlp:AuthzDecisionQuery> that allows an
  * XACML PEP  to communicate with an XACML PDP using SAML2 protocol.
- * 
                  
  * 
                    *<xs:element name="XACMLAuthzDecisionQuery"
- *         type="XACMLAuthzDecisionQueryType"/>
- *<xs:complexType name="XACMLAuthzDecisionQueryType">
- *  <xs:complexContent>
- *    <xs:extension base="samlp:RequestAbstractType">
- *      <xs:sequence>
- *        <xs:element ref="xacml-context:Request"/>
- *      <xs:sequence>
+ *         type="XACMLAuthzDecisionQueryType"/>
+ *<xs:complexType name="XACMLAuthzDecisionQueryType">
+ *  <xs:complexContent>
+ *    <xs:extension base="samlp:RequestAbstractType">
+ *      <xs:sequence>
+ *        <xs:element ref="xacml-context:Request"/>
+ *      <xs:sequence>
  *      <xs:attribute name="InputContextOnly"
  *                    type="boolean"
  *                    use="optional"
- *                    default="false"/>
+ *                    default="false"/>
  *      <xs:attribute name="ReturnContext"
  *                    type="boolean"
  *                    use="optional"
- *                    default="false"/>
- *    <xs:extension>
- *  <xs:complexContent>
- *<xs:complexType>
+ *                    default="false"/>
+ *    <xs:extension>
+ *  <xs:complexContent>
+ *<xs:complexType>
  * 
                  
  *
  * Schema for Base:
  * 
                  - *  <complexType name="RequestAbstractType" abstract="true">
- *      <sequence>
- *          <element ref="saml:Issuer" minOccurs="0"/>
- *          <element ref="ds:Signature" minOccurs="0"/>
- *          <element ref="samlp:Extensions" minOccurs="0"/>
- *      <sequence>
- *      <attribute name="ID" type="ID" use="required"/>
- *      <attribute name="Version" type="string" use="required"/>
- *      <attribute name="IssueInstant" type="dateTime" use="required"/>
- *      <attribute name="Destination" type="anyURI" use="optional"/>
- *  	<attribute name="Consent" type="anyURI" use="optional"/>
- *  <complexType>
+ *  <complexType name="RequestAbstractType" abstract="true">
+ *      <sequence>
+ *          <element ref="saml:Issuer" minOccurs="0"/>
+ *          <element ref="ds:Signature" minOccurs="0"/>
+ *          <element ref="samlp:Extensions" minOccurs="0"/>
+ *      <sequence>
+ *      <attribute name="ID" type="ID" use="required"/>
+ *      <attribute name="Version" type="string" use="required"/>
+ *      <attribute name="IssueInstant" type="dateTime" use="required"/>
+ *      <attribute name="Destination" type="anyURI" use="optional"/>
+ *  	<attribute name="Consent" type="anyURI" use="optional"/>
+ *  <complexType>
  * 
                  
  *
  */
@@ -204,10 +204,10 @@ public void setInputContextOnly(boolean inputContextOnly) throws
     
     /**
      * Returns the XML attribute boolean value which provides means
-     * to PEP to request that an xacml-context>Request
+     * to PEP to request that an xacml-context:Request
      * element be included in the XACMlAuthzdecisionStatement
      * resulting from the request. It also governs the contents of that
-     *  element. If this attribite is "true" then the
+     * Request element. If this attribite is "true" then the
      * PDP SHALL include the xacml-context:Request element in the
      * XACMLAuthzDecisionStatement element in the 
      * XACMLResponse.
@@ -217,7 +217,7 @@ public void setInputContextOnly(boolean inputContextOnly) throws
      * have been used by the PDP may be included.
      * If this attribute is "false" then the PDP SHALL NOT include the
      * xacml-context:Request element in the 
-     * XACMLAuthzDecisionStatement.
+     * XACMLAuthzDecisionStatement.
      *
      * @return boolean indicating the value
      * of this attribute.
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionStatementImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionStatementImpl.java
index dcad5ef633..9f1011bda3 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionStatementImpl.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/saml2/impl/XACMLAuthzDecisionStatementImpl.java
@@ -24,6 +24,7 @@
  *
  * $Id: XACMLAuthzDecisionStatementImpl.java,v 1.4 2008/11/10 22:57:06 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -51,34 +52,30 @@
 /**
  * This is the default implementation of interface XACMLAuthzDecisionStatement.
  *
- * 
                  
  * 
                    * <xs:element name="XACMLAuthzDecisionStatement"
- *          type="xacml-saml:XACMLAuthzDecisionStatementType"/>
- * <xs:complexType name="XACMLAuthzDecisionStatementType">
- *   <xs:complexContent>
- *     <xs:extension base="saml:StatementAbstractType">
- *      <xs:sequence>
- *        <xs:element ref="xacml-context:Response"/>
- *        <xs:element ref="xacml-context:Request"  minOccurs="0"/>
- *      <xs:sequence>
- *    <xs:extension>
- *  <xs:complexContent>
- *<xs:complexType>
+ *          type="xacml-saml:XACMLAuthzDecisionStatementType"/>
+ * <xs:complexType name="XACMLAuthzDecisionStatementType">
+ *   <xs:complexContent>
+ *     <xs:extension base="saml:StatementAbstractType">
+ *      <xs:sequence>
+ *        <xs:element ref="xacml-context:Response"/>
+ *        <xs:element ref="xacml-context:Request"  minOccurs="0"/>
+ *      <xs:sequence>
+ *    <xs:extension>
+ *  <xs:complexContent>
+ *<xs:complexType>
  * 
                  
- * 
                  
  *
  * Schema for the base type is
- * 
                  
  * 
                  - * <complexType name="StatementAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatementAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
- * 
                  
  *
  */
 public class XACMLAuthzDecisionStatementImpl 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/spi/SubjectMapper.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/spi/SubjectMapper.java
index 9260929335..d4fc985e76 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/spi/SubjectMapper.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xacml/spi/SubjectMapper.java
@@ -25,6 +25,7 @@
  * $Id: SubjectMapper.java,v 1.2 2008/06/25 05:48:16 qcheng Exp $
  *
  * Portions Copyrighted 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.xacml.spi;
@@ -72,7 +73,7 @@ public void initialize(String pdpEntityId, String pepEntityId,
      * @param xacmlContextSubjects xacml-context:Subjects from the
      * xacml-context:Request object.
      * @return OpenAM SSOToken representing the mapped native subject.
-     * If the mapping fails, null would be returned
+     * If the mapping fails, null would be returned
      * @exception XACMLException if an error conditions occurs.
      */
     public Object mapToNativeSubject(List xacmlContextSubjects) 
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/EncryptionException.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/EncryptionException.java
index 330ace76b8..4912154543 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/EncryptionException.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/EncryptionException.java
@@ -24,6 +24,7 @@
  *
  * $Id: EncryptionException.java,v 1.3 2008/06/25 05:48:16 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -142,7 +143,7 @@
  *       }
  *
  * 3. Throwing an Exception using the ResourceSetManager
- * 
+ * <TBD : write some eg & format for properties file>
  * 
  * - Logging/Dealing with an Exception, inclunding all nested exceptions
  *       try {
@@ -151,7 +152,7 @@
  *       } catch (EncryptionException fse) {
  *
  *               if (fse.getRootCause() instanceof UMSException) {
- *                       PrintWriter pw = new PrintWriter();
+ *                       PrintWriter pw = new PrintWriter(<some file stream>);
  *                       fse.log(pw);
  *               } else {
  *                      System.out.println(fse.getMessage());
@@ -286,9 +287,9 @@ public String toString() {
     }
     
     /**
-     * Prints this exception's stack trace to System.err.
+     * Prints this exception's stack trace to System.err.
      * If this exception has a root exception; the stack trace of the
-     * root exception is printed to System.err instead.
+     * root exception is printed to System.err instead.
      */
     public void printStackTrace() {
         printStackTrace( System.err );
@@ -340,7 +341,7 @@ public void printStackTrace(java.io.PrintWriter pw) {
      *   java.lang.Throwable
      *   java.lang.Exception
      *   EncryptionException
-     *   
+     *   <name of exception being thrown>
      * 
                  
      */
     static private String getStackTrace(Throwable xcpt) {
diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/XMLEncryptionManager.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/XMLEncryptionManager.java
index 1bcdb6c352..fd89b6e66e 100644
--- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/XMLEncryptionManager.java
+++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/xmlenc/XMLEncryptionManager.java
@@ -24,6 +24,7 @@
  *
  * $Id: XMLEncryptionManager.java,v 1.5 2009/08/29 07:30:38 mallas Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -298,7 +299,7 @@ public org.w3c.dom.Document encryptAndReplaceWSSElements(
      * @param kekAlias Key Encryption Key Cert Alias.
      *
      * @return org.w3.dom.Document Decrypted XML Document.
-     * @exception XMLEncryptionException
+     * @exception EncryptionException if the document could not be decrypted
      */
     public org.w3c.dom.Document decryptAndReplace(
         org.w3c.dom.Document encryptedDoc,
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..36ad20fe49 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.
  */
 
 
@@ -1249,8 +1249,8 @@ public static boolean isTerminationCancelled(HttpServletRequest request) {
     /**
      * Returns the realm by parsing the metaAlias. MetaAlias format is
      * 
                  -     * <realm>/<any string without '/'> for non-root realm or
-     * /<any string without '/'> for root realm.
+     * <realm>/<any string without '/'> for non-root realm or
+     * /<any string without '/'> for root realm.
      * 
                  
      * @param metaAlias The metaAlias.
      * @return the realm associated with the metaAlias.
diff --git a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.java b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.java
index 2cee2f1739..dbf6ba3b26 100644
--- a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.java
+++ b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.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;
 
@@ -52,7 +52,7 @@ public class UtilProxyIDPRequestValidator implements IDPRequestValidator {
      * @param reqBinding the request binding for the new UtilProxyIDPRequestValidator
      * @param isFromECP whether the validator will be validating a request from an ecp
      * @param debug the debuger to use for debug logging
-     * @param saml2MetaManager
+     * @param saml2MetaManager the SAML2 metadata manager used to look up entity configuration
      */
     public UtilProxyIDPRequestValidator(String reqBinding, boolean isFromECP, Debug debug,
                                         SAML2MetaManager saml2MetaManager) {
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..f48f832256 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;
 
@@ -431,7 +431,7 @@ public void authenticate() throws FederatedSSOException, IOException {
      * Iterates through the RequestedAuthnContext from the Service Provider and
      * check if user has already authenticated with a sufficient authentication
      * level.
-     * 
                  
+     * 
                  
      * If RequestAuthnContext is not found in the authenticated AuthnContext
      * then session upgrade will be done .
      *
diff --git a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/audit/SAML2EventLogger.java b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/audit/SAML2EventLogger.java
index 6639a9d408..bd86c29676 100644
--- a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/audit/SAML2EventLogger.java
+++ b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/audit/SAML2EventLogger.java
@@ -12,6 +12,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2015 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC
 */
 package org.forgerock.openam.saml2.audit;
 
@@ -25,14 +26,12 @@ public interface SAML2EventLogger {
 
     /**
      * Publishes an audit event with details of the attempted SAML2 operation, if the 'access' topic is audited.
-     *
-     * @throws AuditException If an exception occurred that prevented the audit event from being published.
      */
     void auditAccessAttempt();
 
     /**
      * Publishes an event with details of the successfully completed SAML2 operation, if the 'access' topic is audited.
-     * 
                  
+     * 
                  
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      */
@@ -40,7 +39,7 @@ public interface SAML2EventLogger {
 
     /**
      * Publishes an event with details of the failed CREST operation, if the 'access' topic is audited.
-     * 
                  
+     * 
                  
      * Any exception that occurs while trying to publish the audit event will be
      * captured in the debug logs but otherwise ignored.
      *
diff --git a/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/CookieUtils.java b/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/CookieUtils.java
index 55cfadf0a3..147a83ed78 100644
--- a/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/CookieUtils.java
+++ b/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/CookieUtils.java
@@ -28,7 +28,7 @@
 
 /**
  * Portions Copyrighted 2013 ForgeRock, Inc.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.saml2.idpdiscovery;
 
@@ -49,8 +49,7 @@
 
 /**
  * Implements utility methods for handling Cookie.
- * 
                  
- */ 
+ */
 
 public class CookieUtils {
     static boolean secureCookie =
@@ -405,9 +404,9 @@ public static void sendError(HttpServletRequest request,
 
     /**
      * Add cookie to HttpServletResponse as custom header
-     * 
-     * @param response
-     * @param cookie
+     *
+     * @param response the HTTP servlet response to add the cookie to
+     * @param cookie the cookie to add to the response
      */
     public static void addCookieToResponse(HttpServletResponse response,
             Cookie cookie) {
diff --git a/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/Debug.java b/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/Debug.java
index 6f5685aea1..dff78a86d3 100644
--- a/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/Debug.java
+++ b/openam-federation/openam-idpdiscovery/src/main/java/com/sun/identity/saml2/idpdiscovery/Debug.java
@@ -25,6 +25,7 @@
  * $Id: Debug.java,v 1.5 2008/06/25 05:47:47 qcheng Exp $
  *
  * Portions Copyrighted 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml2.idpdiscovery;
@@ -258,8 +259,8 @@ public static synchronized Debug getInstance(String debugName) {
     /** Checks if message debugging is enabled.
      *
      * 
                  NOTE: It is recommended that messageEnabled()
-     * be used instead of debugEnabled() as the former is more 
-     * intuitive.
+     * be used instead of debugEnabled() as the former is more
+     * intuitive.
                  
      *
      * @return true if message debugging is enabled
      *        false if message debugging is disabled
@@ -311,7 +312,7 @@ public boolean warningEnabled() {
      * 
                • Debug.ERROR
      * 
                • Debug.WARNING
      * 
                • Debug.MESSAGE
-     * Debug.ON
+     * 
                • Debug.ON
      * 
      *
      * @return debug state.
@@ -464,7 +465,7 @@ public void error(String msg) {
     /** Prints error messages only if debug state is greater than
      * Debug.OFF. If the debug file is not accessible and debugging is enabled, 
      * the message along with a time stamp and thread info will be printed on
-     * System.out.
                  
+     * System.out.
      *
      * 
                  This method creates the debug file if does not exist; otherwise it
      * starts appending to the existing debug file. When invoked for the first
@@ -580,7 +581,7 @@ private synchronized void write(String msg) {
      * 
                • Debug.WARNING
      * 
                • Debug.MESSAGE
      * 
                • Debug.ON
-     * 
                    
+     * 
                  
      */
     public void setDebug(int debugType) {
         switch (debugType) {
@@ -602,7 +603,7 @@ public void setDebug(int debugType) {
      * Enables or disables debugging based on the value of debug attribute,
      * com.iplanet.services.debug.level, in the
      * DebugConfig.properties file.
-     * DebugConfig.properties
+     * DebugConfig.properties
      * file should be accessible from CLASSPATH.
      * If the property is not defined, debug level is set to error.
      *
diff --git a/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequest.java b/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequest.java
index 451d153ef8..20ef5474d7 100644
--- a/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequest.java
+++ b/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequest.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.http.client.request;
 
@@ -19,7 +20,7 @@
 import java.util.Set;
 
 /**
- * Models the request that a script can send over a {@link org.forgerock.http.client.HttpClient}. Is designed to be a basic HTTP/1.1
+ * Models the request that a script can send over a {@code org.forgerock.http.client.HttpClient}. Is designed to be a basic HTTP/1.1
  * request. See http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5
  *
  * NB: 'HttpClientRequest' used rather than 'Request' to avoid clashes with {@link org.restlet.Request}.
@@ -69,7 +70,7 @@ public interface HttpClientRequest {
     /**
      * Set the message entity.
      *
-     * @param entity
+     * @param entity the message entity/body to set on the request.
      */
     public void setEntity(String entity);
 
diff --git a/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequestFactory.java b/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequestFactory.java
index 18549ba318..debc3012da 100644
--- a/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequestFactory.java
+++ b/openam-http-client/src/main/java/org/forgerock/http/client/request/HttpClientRequestFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.http.client.request;
 
@@ -24,7 +25,7 @@
 public class HttpClientRequestFactory {
 
     /**
-     * Create a new empty {@link HttpClientRequest} that can be sent over a {@link org.forgerock.http.client.HttpClient}.
+     * Create a new empty {@link HttpClientRequest} that can be sent over a {@code org.forgerock.http.client.HttpClient}.
      *
      * @return An empty {@link HttpClientRequest}.
      */
diff --git a/openam-http-client/src/main/java/org/forgerock/http/client/request/SimpleHttpClientRequest.java b/openam-http-client/src/main/java/org/forgerock/http/client/request/SimpleHttpClientRequest.java
index a146c0b56c..b7a6ba69c9 100644
--- a/openam-http-client/src/main/java/org/forgerock/http/client/request/SimpleHttpClientRequest.java
+++ b/openam-http-client/src/main/java/org/forgerock/http/client/request/SimpleHttpClientRequest.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.http.client.request;
 
@@ -21,7 +22,7 @@
 import java.util.Set;
 
 /**
- * A basic implementation of {@link HttpClientRequest} that a script can send over a {@link org.forgerock.http.client.HttpClient}.
+ * A basic implementation of {@link HttpClientRequest} that a script can send over a {@code org.forgerock.http.client.HttpClient}.
  *
  * @since 12.0.0
  */
diff --git a/openam-http-client/src/main/java/org/forgerock/http/client/response/HttpClientResponse.java b/openam-http-client/src/main/java/org/forgerock/http/client/response/HttpClientResponse.java
index e19011c1b6..ea1b34ee7c 100644
--- a/openam-http-client/src/main/java/org/forgerock/http/client/response/HttpClientResponse.java
+++ b/openam-http-client/src/main/java/org/forgerock/http/client/response/HttpClientResponse.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.http.client.response;
 
@@ -19,7 +20,7 @@
 
 /**
  * Models the response that a script can receive from sending a
- * {@link org.forgerock.http.client.request.HttpClientRequest} over a {@link org.forgerock.http.client.HttpClient}.
+ * {@link org.forgerock.http.client.request.HttpClientRequest} over a {@code org.forgerock.http.client.HttpClient}.
  * Is designed to be a basic HTTP/1.1 response. See http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html#sec6
  *
  * NB: 'HttpClientResponse' used rather than 'Response' to avoid clashes with {@link org.restlet.Response}.
diff --git a/openam-http-client/src/main/java/org/forgerock/http/client/response/SimpleHttpClientResponse.java b/openam-http-client/src/main/java/org/forgerock/http/client/response/SimpleHttpClientResponse.java
index bfa785763e..1bbc15099d 100644
--- a/openam-http-client/src/main/java/org/forgerock/http/client/response/SimpleHttpClientResponse.java
+++ b/openam-http-client/src/main/java/org/forgerock/http/client/response/SimpleHttpClientResponse.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.http.client.response;
 
@@ -19,7 +20,7 @@
 
 /**
  * A basic implementation of {@link HttpClientResponse} that a script can receive from sending a
- * {@link org.forgerock.http.client.request.HttpClientRequest} over a {@link org.forgerock.http.client.HttpClient}.
+ * {@link org.forgerock.http.client.request.HttpClientRequest} over a {@code org.forgerock.http.client.HttpClient}.
  *
  * @since 12.0.0
  */
diff --git a/openam-mcp-server/pom.xml b/openam-mcp-server/pom.xml
index f7031a96e9..bbc5e89b1e 100644
--- a/openam-mcp-server/pom.xml
+++ b/openam-mcp-server/pom.xml
@@ -129,6 +129,11 @@
 				
 			
 			
+				
 				org.apache.maven.plugins
 				maven-javadoc-plugin
 				
diff --git a/openam-notifications-websocket/src/main/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocket.java b/openam-notifications-websocket/src/main/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocket.java
index f07b7cabc3..bd91537366 100644
--- a/openam-notifications-websocket/src/main/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocket.java
+++ b/openam-notifications-websocket/src/main/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocket.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 org.forgerock.openam.notifications.websocket;
@@ -62,7 +62,7 @@
  *     }
  * 
                  • 
  * 
                  
- * When the id is present in the request, it shall be echoed back with any response messages.
+ * When the id is present in the request, it shall be echoed back with any response messages.
  *
  * @since 14.0.0
  */
diff --git a/openam-notifications/src/main/java/org/forgerock/openam/notifications/NotificationBroker.java b/openam-notifications/src/main/java/org/forgerock/openam/notifications/NotificationBroker.java
index 6ee642414e..f306d64e81 100644
--- a/openam-notifications/src/main/java/org/forgerock/openam/notifications/NotificationBroker.java
+++ b/openam-notifications/src/main/java/org/forgerock/openam/notifications/NotificationBroker.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.notifications;
@@ -21,7 +22,7 @@
 /**
  * Delivers notifications to subscribers of topics.
  * 
                  
- * A NotificationBroker can be shut down, which will cause
+ * A NotificationBroker can be shut down, which will cause
  * it to reject new notifications.
  *
  * @since 14.0.0
diff --git a/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/OAuth2Saml2GrantSPAdapter.java b/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/OAuth2Saml2GrantSPAdapter.java
index 5763ef23ea..3de5e61296 100644
--- a/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/OAuth2Saml2GrantSPAdapter.java
+++ b/openam-oauth2-saml2/src/main/java/org/forgerock/openam/oauth2/saml2/core/OAuth2Saml2GrantSPAdapter.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.oauth2.saml2.core;
@@ -44,14 +44,14 @@
 public class OAuth2Saml2GrantSPAdapter extends SAML2ServiceProviderAdapter {
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public void initialize(Map initParams){
         return;
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public void preSingleSignOnRequest(
             String hostedEntityID,
@@ -66,7 +66,7 @@ public void preSingleSignOnRequest(
 
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public void preSingleSignOnProcess(
             String hostedEntityID,
@@ -81,7 +81,7 @@ public void preSingleSignOnProcess(
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public boolean postSingleSignOnSuccess(
             String hostedEntityID,
@@ -128,7 +128,7 @@ public boolean postSingleSignOnSuccess(
 
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public boolean postSingleSignOnFailure(
             String hostedEntityID,
@@ -144,7 +144,7 @@ public boolean postSingleSignOnFailure(
 
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public void postNewNameIDSuccess(
             String hostedEntityID,
@@ -159,7 +159,7 @@ public void postNewNameIDSuccess(
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public void postTerminateNameIDSuccess(
             String hostedEntityID,
@@ -174,7 +174,7 @@ public void postTerminateNameIDSuccess(
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public void preSingleLogoutProcess(
             String hostedEntityID,
@@ -190,7 +190,7 @@ public void preSingleLogoutProcess(
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public void postSingleLogoutSuccess(
             String hostedEntityID,
diff --git a/openam-oauth2/pom.xml b/openam-oauth2/pom.xml
index 3c79d55db5..f4dbe27b05 100644
--- a/openam-oauth2/pom.xml
+++ b/openam-oauth2/pom.xml
@@ -197,23 +197,4 @@
             test
         
     
-    
-        
-            jdk-17-oauth2
-            
-                [17,)
-            
-            
-                
-                    
-                        org.apache.maven.plugins
-                        maven-javadoc-plugin
-                        
-                            true
-                        
-                    
-                
-            
-        
-    
 
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeRequestValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeRequestValidator.java
index 025a079468..b223b802fb 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeRequestValidator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeRequestValidator.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -23,7 +24,7 @@
 
 /**
  * Request validator for the OAuth2 authorization code grant.
- * 
                  
+ * 
                  
  * Request validators validate that the specified OAuth2 request is valid be checking that the request contains all of
  * the required parameters.
  *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationService.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationService.java
index 950c534640..7281155968 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationService.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationService.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.oauth2.core;
@@ -101,12 +101,12 @@ public AuthorizationService(List requestValidators,
      * Handles an initial authorization request from a OAuth2 client, validates the request is valid and contains
      * the required parameters, checks the resource owner has authenticated and given their consent for the client to
      * be authorized before issuing an AuthorizationToken.
-     * 
                  
+     * 
                  
      * If the resource owner is not authenticated, then the user-agent is redirected to a login page for the
      * resource owner to authenticate. And if the resource owner has not given their consent (or have not requested
      * it to be saved from a previous authorization request) the user-agent is redirected to the user consent page.
      * The user-agent is then redirected back to the OAuth2 authorize endpoint.
-     * 
                  
+     * 
                  
      * An AuthorizationToken is only ever issued by this method if the resource owner has previously given their
      * consent. In the case where the user-agent is redirected to the user consent page, when the user-agent is
      * redirected back to OAuth2 authorize endpoint the #authorize(OAuth2Request, boolean, boolean) method on this class
@@ -248,7 +248,7 @@ private Map getScopeDescriptions(Set scopes, Map
+     * 
                  
      * If the resource owner is not authenticated, then the user-agent is redirected to a login page for the
      * resource owner to authenticate.
      *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizeRequestValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizeRequestValidator.java
index ffff774746..11497fb9ff 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizeRequestValidator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizeRequestValidator.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -20,7 +21,7 @@
 
 /**
  * Request validator for the OAuth2 authorize endpoint.
- * 
                  
+ * 
                  
  * Request validators validate that the specified OAuth2 request is valid be checking that the request contains all of
  * the required parameters.
  *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientAuthenticator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientAuthenticator.java
index ad6a95b722..c50bf6e9df 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientAuthenticator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientAuthenticator.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.oauth2.core;
@@ -70,7 +70,7 @@ public class ClientAuthenticator {
      * @param auditLogger An instance of the OAuth2AuditLogger.
      * @param realmNormaliser An instance of the RealmNormaliser.
      * @param clientCredentialsReader An instance of the ClientCredentialsReader.
-     * @param failureFactory
+     * @param failureFactory An instance of the ClientAuthenticationFailureFactory.
      */
     @Inject
     public ClientAuthenticator(ClientRegistrationStore clientRegistrationStore, OAuth2AuditLogger auditLogger,
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientCredentialsRequestValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientCredentialsRequestValidator.java
index c18e5b8a4e..011324cfb3 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientCredentialsRequestValidator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientCredentialsRequestValidator.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -23,7 +24,7 @@
 
 /**
  * Request validator for the OAuth2 client credentials grant.
- * 
                  
+ * 
                  
  * Request validators validate that the specified OAuth2 request is valid be checking that the request contains all of
  * the required parameters.
  *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettings.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettings.java
index f7b03a9a83..a75cdfd45b 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettings.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettings.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.oauth2.core;
 
@@ -186,7 +187,7 @@ Map additionalDataToReturnFromAuthorizeEndpoint(Map
+     * 
                  
      * Any additional data to be returned should be added to the access token by invoking,
      * AccessToken#addExtraData(String, String).
      *
@@ -454,7 +455,7 @@ void additionalDataToReturnFromTokenEndpoint(AccessToken accessToken, OAuth2Requ
      * Whether or not to enforce the Code Verifier Parameter.
      *
      * @return Whether the Code Verifier option has been configured.
-     * @see 
+     * @see OAuth 2.0 PKCE (draft-ietf-oauth-spop-12)
      */
     boolean isCodeVerifierRequired() throws ServerException;
 
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactory.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactory.java
index 7249f34c7c..2c030aa07a 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactory.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactory.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.oauth2.core;
@@ -44,7 +44,7 @@
 
 /**
  * A factory for creating/retrieving OAuth2ProviderSettings instances.
- * 
                  
+ * 
                  
  * It is up to the implementation to provide caching of OAuth2ProviderSettings instance if it wants to supported
  * multiple OAuth2 providers.
  *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2Request.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2Request.java
index 2333361302..8636485014 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2Request.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2Request.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2014-2016 ForgeRock AS.
  * Portions Copyrighted 2018 Open Source Solution Technology Corporation
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -82,7 +82,7 @@ public Request getRequest() {
 
     /**
      * Gets the specified parameter from the request.
-     * 
                  
+     * 
                  
      * It is up to the implementation to determine how and where it gets the parameter from on the request, i.e.
      * query parameters, request attributes, etc.
      *
@@ -176,10 +176,10 @@ private String getQueryParameter(Request request, String name) {
 
     /**
      * Gets the body of the request.
-     * 
                  
+     * 
                  
      * Note: reading of the body maybe a one time only operation, so the implementation needs to cache the content
      * of the body so multiple calls to this method do not behave differently.
-     * 
                  
+     * 
                  
      * This method should only ever be called for access and refresh token request and requests to the userinfo and
      * tokeninfo endpoints.
      *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/PasswordCredentialsRequestValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/PasswordCredentialsRequestValidator.java
index a09a77bb1c..fa078a2fc9 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/PasswordCredentialsRequestValidator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/PasswordCredentialsRequestValidator.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -23,7 +24,7 @@
 
 /**
  * Request validator for the OAuth2 password credentials grant.
- * 
                  
+ * 
                  
  * Request validators validate that the specified OAuth2 request is valid be checking that the request contains all of
  * the required parameters.
  *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/RealmOAuth2ProviderSettings.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/RealmOAuth2ProviderSettings.java
index b80b89415a..6b0866652d 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/RealmOAuth2ProviderSettings.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/RealmOAuth2ProviderSettings.java
@@ -14,7 +14,7 @@
  * Copyright 2014-2016 ForgeRock AS.
  * Portions Copyrighted 2015 Nomura Research Institute, Ltd.
  * Portions copyright 2019 Open Source Solution Technology Corporation
- * Portions Copyrighted 2024 3A Systems LLC.
+ * Portions Copyrighted 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -84,7 +84,7 @@
 
 /**
  * Models all of the possible settings the OAuth2 provider can have and that can be configured.
- * 
                  
+ * 
                  
  * The actual implementation is responsible for providing the method in which these settings are configured. This
  * interface only describes the API for other code to get the OAuth2 provider settings.
  *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerConsentVerifier.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerConsentVerifier.java
index 36980e2105..17ef50a6db 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerConsentVerifier.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerConsentVerifier.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -28,7 +29,7 @@ public interface ResourceOwnerConsentVerifier {
 
     /**
      * Determines whether if the resource owner has previously saved consent and whether it should be used.
-     * 
                  
+     * 
                  
      * OpenID Connect prompt parameter can mandate that the resource owner is forced to give consent.
      *
      * @param consentSaved {@code true} if the resource owner has previously saved consent.
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResponseTypeValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResponseTypeValidator.java
index eae71cd470..e5ca289922 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResponseTypeValidator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResponseTypeValidator.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.oauth2.core;
@@ -47,9 +47,12 @@ public class ResponseTypeValidator {
      * @param clientRegistration The client registration.
      * @param requestedResponseTypes The requested response types.
      * @param providerSettings The OAuth2ProviderSettings instance.
-     * @throws org.forgerock.oauth2.core.exceptions.InvalidRequestException
-     * @throws org.forgerock.oauth2.core.exceptions.UnsupportedResponseTypeException
-     * @throws org.forgerock.oauth2.core.exceptions.ServerException
+     * @throws org.forgerock.oauth2.core.exceptions.InvalidRequestException if the provider has no allowed response
+     *          types configured.
+     * @throws org.forgerock.oauth2.core.exceptions.UnsupportedResponseTypeException if the requested response type is
+     *          not supported by either the OAuth2 client or provider.
+     * @throws org.forgerock.oauth2.core.exceptions.ServerException if there is a problem retrieving the provider's
+     *          allowed response types.
      */
     public void validate(ClientRegistration clientRegistration, Set requestedResponseTypes,
             OAuth2ProviderSettings providerSettings, OAuth2Request request)
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ScopeValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ScopeValidator.java
index 61b8aeddbb..83554dd877 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ScopeValidator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ScopeValidator.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2014-2015 ForgeRock AS.
  * Portions Copyrighted 2015 Nomura Research Institute, Ltd.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -113,7 +114,7 @@ Set validateRefreshTokenScope(ClientRegistration clientRegistration, Set
     /**
      * Provided as an extension point to allow the OAuth2 provider to return additional data from an access token
      * request.
-     * 
                  
+     * 
                  
      * Any additional data to be returned should be added to the access token by invoking,
      * AccessToken#addExtraData(String, String).
      *
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenInvalidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenInvalidator.java
index e8c917619c..c4b90dfab7 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenInvalidator.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenInvalidator.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.oauth2.core;
@@ -73,8 +73,8 @@ public TokenInvalidator(TokenStore tokenStore, OAuth2RealmResolver realmResolver
      * @param clientId The client id.
      * @param userName The username denoting the resource owner id
      * @param authGrantId The auth grant id.
-     * @throws ServerException
-     * @throws NotFoundException
+     * @throws ServerException if an internal server error occurs while invalidating the tokens.
+     * @throws NotFoundException if the realm does not have an OAuth 2.0 provider service.
      */
     public void invalidateTokens(OAuth2Request request, String clientId, String userName,
             String authGrantId) throws  ServerException, NotFoundException {
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenStore.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenStore.java
index a498254ec1..01adfe479b 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenStore.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/TokenStore.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -28,7 +29,7 @@
 
 /**
  * Interface for a Token Store which the OAuth2 Provider will implement.
- * 
                  
+ * 
                  
  * The Token Store will be where all types of OAuth2 tokens will be stored and later retrieved.
  *
  * @since 12.0.0
@@ -51,8 +52,8 @@ public interface TokenStore {
      * @param redirectUri         The redirect uri.
      * @param nonce               The nonce.
      * @param request             The OAuth2 request.
-     * @param codeChallenge
-     * @param codeChallengeMethod
+     * @param codeChallenge       The PKCE code challenge.
+     * @param codeChallengeMethod The PKCE code challenge method.
      * @return An AuthorizationCode.
      * @throws ServerException   If any internal server error occurs.
      * @throws NotFoundException If the realm does not have an OAuth 2.0 provider service.
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/Utils.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/Utils.java
index 8642c18a34..21717122a2 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/Utils.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/Utils.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.core;
@@ -71,7 +72,7 @@ public static boolean isEmpty(final Map m) {
 
     /**
      * Splits the specified String of response types into a {@code Set} of response types.
-     * 
                  
+     * 
                  
      * If the String of response types is {@code null} an empty {@code Set} is returned.
      *
      * @param responseType The String of response types.
@@ -83,7 +84,7 @@ public static Set splitResponseType(final String responseType) {
 
     /**
      * Splits the specified String of scopes into a {@code Set} of scopes.
-     * 
                  
+     * 
                  
      * If the String of scopes is {@code null} an empty {@code Set} is returned.
      *
      * @param scope The String of scopes.
@@ -95,7 +96,7 @@ public static Set splitScope(final String scope) {
 
     /**
      * Joins the specified {@code Set} of scopes into a space delimited String.
-     * 
                  
+     * 
                  
      * If the specified {@code Set} of scopes is null, an empty String is returned.
      *
      * @param scope The scopes to join.
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/AuthorizeResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/AuthorizeResource.java
index 19ed1cef3f..cada037b40 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/AuthorizeResource.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/AuthorizeResource.java
@@ -87,7 +87,7 @@ public AuthorizeResource(OAuth2RequestFactory requestFactory, AuthorizationServi
 
     /**
      * Handles GET requests to the OAuth2 authorize endpoint.
-     * 
                  
+     * 
                  
      * This method will be called when a client has requested a resource owner grants it authorization to access a
      * resource.
      *
@@ -151,7 +151,7 @@ public Representation authorize() throws OAuth2RestletException {
 
     /**
      * Handles POST requests to the OAuth2 authorize endpoint.
-     * 
                  
+     * 
                  
      * This method will be called when a user has given their consent for an authorization request.
      *
      * @param entity The entity on the request.
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeVerificationResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeVerificationResource.java
index 4397ed3e35..e0cae60105 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeVerificationResource.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeVerificationResource.java
@@ -98,7 +98,7 @@ public class DeviceCodeVerificationResource extends ConsentRequiredResource {
     /**
      * Constructs user code verification resource for OAuth2 Device Flow
      * @param router The base router
-     * @param exceptionHandler
+     * @param exceptionHandler An instance of the ExceptionHandler.
      * @param oAuth2Utils An OAuth2Utils instance.
      * @param csrfProtection An instance of the CsrfProtection.
      */
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ErrorResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ErrorResource.java
index a6be5599e3..bea1b3ca3c 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ErrorResource.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ErrorResource.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.restlet;
@@ -52,7 +53,7 @@ public ErrorResource(ExceptionHandler exceptionHandler, OAuth2Exception e) {
      * response to a internal server error.
      *
      * @return {@inheritDoc}
-     * @throws ResourceException {@inheritDoc}
+     * @throws ResourceException if an error occurs while handling the error response.
      */
     protected Representation doHandle() {
         Representation result = null;
@@ -68,7 +69,7 @@ protected Representation doHandle() {
      * Calls {@link #doHandle()}.
      *
      * @return {@inheritDoc}
-     * @throws ResourceException {@inheritDoc}
+     * @throws ResourceException if an error occurs while handling the error response.
      */
     protected Representation doConditionalHandle() {
         return doHandle();
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ExceptionHandler.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ExceptionHandler.java
index 76b4abccc1..826c3fb089 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ExceptionHandler.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ExceptionHandler.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.oauth2.restlet;
@@ -94,13 +94,13 @@ public void handle(Throwable throwable, Context context, Request request, Respon
 
     /**
      * Handles a OAuth2RestletException that is thrown when processing a OAuth2 authorization request.
-     * 
                  
+     * 
                  
      * If the OAuth2RestletException has a status of {@link Status#REDIRECTION_TEMPORARY} the user agent will be
      * redirected to the redirect uri set on the exception.
-     * 
                  
+     * 
                  
      * If the OAuth2RestletException does not have a redirect status but still has a redirect uri set, the user
      * agent will be redrected to the redirect uri with the exception message in the redirect uri.
-     * 
                  
+     * 
                  
      * In all other cases the OAuth2 error page will be presented.
      *
      * @param exception The OAuth2RestletException.
@@ -139,9 +139,9 @@ private void handle(OAuth2RestletException exception, Context context, Request r
 
     /**
      * Handles general OAuth2 exceptions from Restlet endpoints.
-     * 
                  
+     * 
                  
      * If the throwable is not a OAuth2RestletException then it will be wrapped as a ServerException.
-     * 
                  
+     * 
                  
      * If the throwable is a OAuth2RestletException then it will be set on the response as a Json representation.
      *
      * @param throwable The throwable.
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/OAuth2Filter.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/OAuth2Filter.java
index a2c04d7620..d1453bca13 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/OAuth2Filter.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/OAuth2Filter.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.oauth2.restlet;
@@ -47,7 +48,7 @@ public OAuth2Filter(Restlet restlet, JacksonRepresentationFactory jacksonReprese
 
     /**
      * Validates that the request is valid for the OAuth2 endpoint being requested.
-     * 
                  
+     * 
                  
      * Will also add no cache headers to the response.
      *
      * @param request The Restlet request.
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/TokenIntrospectionResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/TokenIntrospectionResource.java
index b0c749e7ae..bfb503c339 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/TokenIntrospectionResource.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/TokenIntrospectionResource.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.oauth2.restlet;
@@ -57,7 +57,7 @@ public TokenIntrospectionResource(OAuth2ProviderSettingsFactory providerSettings
      * Wraps the introspection service in a Restlet API.
      * @param body The body - this is ignored but needs to be present to be made available in the request.
      * @return A JSON representation of the introspection result.
-     * @throws org.forgerock.oauth2.restlet.OAuth2RestletException
+     * @throws org.forgerock.oauth2.restlet.OAuth2RestletException if an error occurs while introspecting the token.
      */
     @Post("form")
     @Get
diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ValidationServerResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ValidationServerResource.java
index 381e5d5d5d..b4c8570d3f 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ValidationServerResource.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ValidationServerResource.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.oauth2.restlet;
@@ -67,7 +67,7 @@ public ValidationServerResource(OAuth2RequestFactory requestFactory, TokenInfoSe
      * Handles GET requests to the OAuth2 tokeninfo endpoint for retrieving information about the provided token.
      *
      * @return The body to be sent in the response to the user agent.
-     * @throws OAuth2RestletException
+     * @throws OAuth2RestletException if an error occurs while validating the token.
      */
     @Get
     public Representation validate() throws OAuth2RestletException {
diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2Utils.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2Utils.java
index 13ba0189e5..293309a4a9 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2Utils.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2Utils.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2012-2016 ForgeRock AS.
  * Portions Copyrighted 2019 Open Source Solution Technology Corp.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.oauth2;
@@ -70,7 +70,7 @@ public OAuth2Utils(JacksonRepresentationFactory jacksonRepresentationFactory) {
     /**
      * Gets the deployment URI of the OAuth2 authorization server
      * @param request the request to get the deployment uri of
-     * @return
+     * @return the deployment URI of the OAuth2 authorization server.
      */
     public String getDeploymentURL(HttpServletRequest request){
         String uri = request.getRequestURI();
@@ -91,7 +91,6 @@ public String getDeploymentURL(HttpServletRequest request){
     /**
      * Determines if a string is empty. Empty is defined as null or empty
      * string.
-     * 
                  
      *
      * 
                        *  OAuth2Utils.isEmpty(null)               = true
@@ -165,16 +164,16 @@ public Set split(String string, String delimiter) {
     /**
      * Get the realm from the Attributes first and then look for the realm in
      * the request.
-     * 
                  
+     * 
                  
      * Example: Restlet Template populates the realm into the
      * {@link Request#attributes} {@code TemplateRoute route =
      * router.attach("/oauth2/ realm}/authorize", (Restlet)authorization);}
-     * 
                  
+     * 
                  
      * Example: Custom code fetches it from the query, the body or more secure
      * from the User Session
      *
-     * @param request
-     * @return
+     * @param request the Restlet request to extract the realm from.
+     * @return the realm associated with the request, or {@code "/"} if none is specified.
      */
     public String getRealm(Request request) {
         HttpServletRequest httpRequest = ServletUtils.getRequest(request);
@@ -230,7 +229,7 @@ public Map getRequestParameters(Request request) {
 
     /**
      * Get the parameters from the request.
-     * 
                  
+     * 
                  
      * If the method is GET then the parameters are fetched from the query If
      * the request has no body/payload then the parameters are fetched from the
      * query If the content type is "application/x-www-form-urlencoded" then the
diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuthProblemException.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuthProblemException.java
index b77f480dec..f60bbac509 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuthProblemException.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuthProblemException.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.oauth2;
@@ -135,7 +136,7 @@ private OAuthError(String reasonPhrase, String description, String uri, int code
         /**
          * Create a new exception from the given {@code request} parameter.
          * 
-         * @param request
+         * @param request the OAuth2 request to associate with the exception.
          * @return new instance of OAuthProblemException
          */
         public OAuthProblemException handle(Request request) {
@@ -282,7 +283,7 @@ public Status getStatus() {
 
     /**
      * Save the exception into the request.
-     * 
                  
+     * 
                  
      * Save the OAuthProblemException into the attributes and the
      * {@link OAuthProblemException#popException(org.restlet.Request)} method
      * retreive it.
@@ -323,12 +324,12 @@ public Map getErrorMessage() {
 
     /**
      * Used for formatting error according to chapter 4.2.2.1.
-     * 
                  
+     * 
                  
      * Authorization Code (Query) HTTP/1.1 302 Found Location:
-     * https://client.example.com/cb?error=access_denied&state=xyz
-     * 
                  
+     * https://client.example.com/cb?error=access_denied&state=xyz
+     * 
                  
      * Implicit (Fragment) HTTP/1.1 302 Found Location:
-     * https://client.example.com/cb#error=access_denied&state=xyz
+     * https://client.example.com/cb#error=access_denied&state=xyz
      * 
      * @see 4.2.2.1.
diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatefulTokenStore.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatefulTokenStore.java
index e116be2ecc..725cab3a47 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatefulTokenStore.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatefulTokenStore.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2014-2016 ForgeRock AS.
  * Portions Copyrighted 2015 Nomura Research Institute, Ltd.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.oauth2;
 
@@ -125,7 +125,7 @@ public class StatefulTokenStore implements OpenIdConnectTokenStore {
      * @param ssoTokenManager An instance of the SSOTokenManager
      * @param cookieExtractor An instance of the CookieExtractor
      * @param auditLogger An instance of OAuth2AuditLogger
-     * @param failureFactory
+     * @param failureFactory An instance of the ClientAuthenticationFailureFactory.
      * @param utils OAuth2 utilities
      */
     @Inject
diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.java
index b784a184ee..ccc9e04d43 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.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.oauth2.resources;
@@ -70,7 +70,7 @@
 /**
  * Restlet endpoint for OAuth2 resource servers to register resource set that should be protected.
  *
- * @link https://tools.ietf.org/html/draft-hardjono-oauth-resource-reg-04
+ * @see OAuth 2.0 Resource Set Registration
  * @since 13.0.0
  */
 public class ResourceSetRegistrationEndpoint extends ServerResource {
diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/OAuth2UserApplications.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/OAuth2UserApplications.java
index 27145aa5ae..29d38cacc0 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/OAuth2UserApplications.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/OAuth2UserApplications.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.oauth2.rest;
@@ -139,7 +139,7 @@ public OAuth2UserApplications(TokenStore tokenStore,
      *
      * @param context The request context.
      * @param queryHandler The query handler.
-     * @param request Unused but necessary for used of the {@link @Query} annotation.
+     * @param request Unused but necessary for used of the {@code @Query} annotation.
      * @return A promise of a query response.
      */
     @Query(operationDescription = @Operation(description = OAUTH2_USER_APPLICATIONS + QUERY_DESCRIPTION,
diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/Client.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/Client.java
index 25d94af88d..c49953b402 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openidconnect/Client.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openidconnect/Client.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2014-2016 ForgeRock AS.
  * Portions Copyrighted 2015 Nomura Research Institute, Ltd.
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openidconnect;
@@ -732,7 +732,7 @@ public String getIdTokenSignedResponseAlgorithm() {
 
     /**
      * Sets the id token signed response alg of the OAuth2Client.
-     * 
                  
+     * 
                  
      * If the specified idTokenSignedResponseAlgorithm is {@code null} the value is defaulted to 'HS256'.
      *
      * @param idTokenSignedResponseAlgorithm The id token signed response alg.
diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/ClientBuilder.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/ClientBuilder.java
index dddf1dff2f..977c9f2861 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openidconnect/ClientBuilder.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openidconnect/ClientBuilder.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2014-2015 ForgeRock AS.
  * Portions Copyrighted 2015 Nomura Research Institute, Ltd.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidconnect;
@@ -190,7 +191,7 @@ public ClientBuilder setClientSessionURI(String clientSessionURI) {
     /**
      *
      * @param contacts The contact information for the clients
-     * @return
+     * @return this ClientBuilder instance.
      */
     public ClientBuilder setContacts(List contacts) {
         this.contacts = contacts;
diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectClientRegistrationService.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectClientRegistrationService.java
index b1c9ce2897..de7d492313 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectClientRegistrationService.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectClientRegistrationService.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2014-2016 ForgeRock AS.
  * Portions Copyrighted 2015 Nomura Research Institute, Ltd.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openidconnect;
@@ -535,7 +535,7 @@ private boolean containsCaseInsensitive(final Set collection, final Stri
      * @return JsonValue representation of the client registration.
      * @throws InvalidRequestException If either the request does not contain the client's id or the client fails to be
      *          authenticated.
-     * @throws InvalidClientMetadata
+     * @throws InvalidClientMetadata if the client's registration metadata is invalid.
      */
     public JsonValue getRegistration(String clientId, String accessToken, OAuth2Request request)
             throws InvalidRequestException, InvalidClientMetadata, InvalidTokenException {
diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectTokenStore.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectTokenStore.java
index 2efef59eb6..07b3c1ddc5 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectTokenStore.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdConnectTokenStore.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidconnect;
@@ -25,7 +26,7 @@
 
 /**
  * Interface for a OpenId Connect Token Store which the OpenId Connect Provider will implement.
- * 
                  
+ * 
                  
  * The OpenId Connect Token Store will be where all OpenId Connect tokens will be stored and later retrieved.
  *
  * @since 12.0.0
diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdPrompt.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdPrompt.java
index 6c783d6129..e80ed559e5 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdPrompt.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openidconnect/OpenIdPrompt.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidconnect;
@@ -44,7 +45,7 @@ public class OpenIdPrompt {
 
     /**
      * Constructs a new OpenIdPrompt instance from the given prompt String.
-     * 
                  
+     * 
                  
      * Parses the prompt string (converted to lowercase) by splitting on the ' ' character.
      *
      * @param prompt The prompt.
diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/WebFinger.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/WebFinger.java
index 19b6e3fa4a..ecaec50cf3 100644
--- a/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/WebFinger.java
+++ b/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/WebFinger.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidconnect.restlet;
@@ -45,7 +46,7 @@ public class WebFinger extends Application {
 
     /**
      * Constructs a new WebFinger.
-     * 
                  
+     * 
                  
      * Sets the default media type to {@link MediaType#APPLICATION_JSON} and sets the status service to
      * {@link OAuth2StatusService}.
      */
diff --git a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationDelegate.java b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationDelegate.java
index 3c82b25e97..3240dde85b 100644
--- a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationDelegate.java
+++ b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationDelegate.java
@@ -12,6 +12,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2016 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC.
 */
 package org.forgerock.openam.services.push;
 
@@ -73,7 +74,7 @@ public interface PushNotificationDelegate extends Closeable {
      * Otherwise returns null.
      *
      * @return The (public, relative) service location of this delegate as exposed to the world, may be relative to the
-     * OpenAM server instance ID {@see WebtopNaming}.
+     * OpenAM server instance ID {@code WebtopNaming}.
      */
     String getRegServiceLocation();
 
@@ -82,7 +83,7 @@ public interface PushNotificationDelegate extends Closeable {
      * Otherwise returns null.
      *
      * @return The (public, relative) service location of this delegate as exposed to the world, may be relative to the
-     * OpenAM server instance ID {@see WebtopNaming}.
+     * OpenAM server instance ID {@code WebtopNaming}.
      */
     String getAuthServiceLocation();
 
diff --git a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationService.java b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationService.java
index f6265a515f..6a92714bed 100644
--- a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationService.java
+++ b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/PushNotificationService.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 org.forgerock.openam.services.push;
@@ -50,7 +50,7 @@
  *
  * If no delegate has been configured, the service will attempt to load the config for that realm before accessing
  * the delegate instance. Updating the service config via the service interface (after the service has been
- * instantiated) also causes the attempt to load the config & mint a delegate.
+ * instantiated) also causes the attempt to load the config & mint a delegate.
  *
  * Later changes in the config will update the delegateFactory and depending upon the delegate's implementation of
  * the isRequireNewDelegate(PushNotificationServiceConfig) method may require the generation of a new delegate. If
diff --git a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsMessageResource.java b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsMessageResource.java
index 8e7193520f..8a9e8deed7 100644
--- a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsMessageResource.java
+++ b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsMessageResource.java
@@ -89,8 +89,8 @@
  *     "messageId" : "..." // unique identifier for this message
  * }
  *
- * {@see SnsHttpDelegate}.
- * {@see PushNotificationService}.
+ * @see SnsHttpDelegate
+ * @see PushNotificationService
  */
 @RequestHandler(@Handler(mvccSupported = false,
         title = SNS_MESSAGE_RESOURCE + TITLE, description = SNS_MESSAGE_RESOURCE + DESCRIPTION))
diff --git a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsRegistrationPredicate.java b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsRegistrationPredicate.java
index bcf4dafe38..ae66799763 100644
--- a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsRegistrationPredicate.java
+++ b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/SnsRegistrationPredicate.java
@@ -12,6 +12,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2016 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC.
 */
 package org.forgerock.openam.services.push.sns;
 
@@ -32,7 +33,7 @@
  * Acts to register (via communication with SNS) the device that is currently talking to the server
  * from the mobile app.
  *
- * {@see org.forgerock.openam.authentication.modules.push.registration.AuthenticatorPushRegistration} for
+ * {@code org.forgerock.openam.authentication.modules.push.registration.AuthenticatorPushRegistration} for
  * information on the format which the perform() method alters the data to fit.
  *
  * This predicate does NOT have a listener attached to its config reading subsystem, therefore it will
diff --git a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/utils/SnsPushResponseUpdater.java b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/utils/SnsPushResponseUpdater.java
index a88e054259..50da456dbb 100644
--- a/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/utils/SnsPushResponseUpdater.java
+++ b/openam-push-notification/src/main/java/org/forgerock/openam/services/push/sns/utils/SnsPushResponseUpdater.java
@@ -12,6 +12,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2016 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC.
 */
 package org.forgerock.openam.services.push.sns.utils;
 
@@ -32,7 +33,7 @@
 import org.forgerock.openam.utils.StringUtils;
 
 /**
- * A utility class for {@see SnsRegistrationPredicate} to aid testing.
+ * A utility class for {@link org.forgerock.openam.services.push.sns.SnsRegistrationPredicate} to aid testing.
  */
 public class SnsPushResponseUpdater {
 
diff --git a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeFactory.java b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeFactory.java
index c2c0ac3776..03945b8e32 100644
--- a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeFactory.java
+++ b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeFactory.java
@@ -96,7 +96,7 @@ private AttributeFactory() {
      *            the raw octets received in a radius packet on the wire for the attribute including leading attribute
      *            type code octet and length octet.
      * @return the corresponding subclass of the {@link org.forgerock.openam.radius.common.Attribute} class or an
-     *         instance of the {@link com.sun.identity.authentication.modules.radius.client.UnknownAttribute} class if
+     *         instance of the {@code com.sun.identity.authentication.modules.radius.client.UnknownAttribute} class if
      *         the field type is unrecognized and hence not supported.
      */
     public static Attribute createAttribute(byte[] data) {
diff --git a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeSet.java b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeSet.java
index 78d03ad54e..11e74eeab9 100644
--- a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeSet.java
+++ b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/AttributeSet.java
@@ -38,7 +38,7 @@
 
 /**
  * Holder of the attribute instances in an instance of the
- * {@link com.sun.identity.authentication.modules.radius.client .Packet} type which is the superclass of all radius
+ * {@code com.sun.identity.authentication.modules.radius.client.Packet} type which is the superclass of all radius
  * packet types. Maintains the order in which attributes are added.
  */
 public class AttributeSet {
diff --git a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/OctetUtils.java b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/OctetUtils.java
index 89d8eaff97..c80e9b514c 100644
--- a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/OctetUtils.java
+++ b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/OctetUtils.java
@@ -12,6 +12,8 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyrighted 2015 Intellectual Reserve, Inc (IRI)
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.radius.common;
 
@@ -32,78 +34,78 @@
  * defined in the {@link org.forgerock.openam.radius.common.Attribute} class:
  *
  * 
                  - * {@link com.sun.identity.authentication.modules.radius.client.CallbackIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallbackNumberAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CHAPChallengeAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FilterIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedAppleTalkZoneAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedRouteAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.LoginLATGroupAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.LoginLATNodeAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.LoginLATPortAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.LoginLATServiceAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.NASClassAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.NASIdentifierAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.ProxyStateAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallbackIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallbackNumberAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CHAPChallengeAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FilterIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedAppleTalkZoneAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedRouteAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.LoginLATGroupAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.LoginLATNodeAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.LoginLATPortAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.LoginLATServiceAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.NASClassAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.NASIdentifierAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.ProxyStateAttribute}
  * {@link org.forgerock.openam.radius.common.ReplyMessageAttribute}
  * {@link org.forgerock.openam.radius.common.StateAttribute}
  * {@link org.forgerock.openam.radius.common.UserNameAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CallerStationIdAttribute}
  * 
                  
  *
  * The following attributes contain a four byte integer value:
  *
  * 
                  - * {@link com.sun.identity.authentication.modules.radius.client.FramedAppleTalkLinkAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedAppleTalkNetworkAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedCompressionAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedMTUAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedProtocolAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedRoutingAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.IdleTimeoutAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.LoginIPHostAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.LoginServiceAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.LoginTCPPortAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.NASPortAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.NASPortTypeAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.PortLimitAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.ServiceTypeAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.SessionTimeoutAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.TerminationActionAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedAppleTalkLinkAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedAppleTalkNetworkAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedCompressionAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedMTUAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedProtocolAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedRoutingAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.IdleTimeoutAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.LoginIPHostAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.LoginServiceAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.LoginTCPPortAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.NASPortAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.NASPortTypeAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.PortLimitAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.ServiceTypeAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.SessionTimeoutAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.TerminationActionAttribute}
  * 
                  
  *
  * The following classes contain a four byte array value:
  *
  * 
                  - * {@link com.sun.identity.authentication.modules.radius.client.FramedIPAddressAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedIPNetmaskAttribute}
- * {@link com.sun.identity.authentication.modules.radius.client.FramedIPXNetworkAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedIPAddressAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedIPNetmaskAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.FramedIPXNetworkAttribute}
  * 
                  
  *
  * The following classes have unique models described and hence have their own unique code that can't be
  * shared among other attribute classes:
  * 
                  - * {@link com.sun.identity.authentication.modules.radius.client.CHAPPasswordAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.CHAPPasswordAttribute}
  *  - class contains a single byte integer value followed by 16 bytes of text characters.
  *
  * {@link org.forgerock.openam.radius.common.UserPasswordAttribute}
  *  - has an encrypted string of characters.
 
- * {@link com.sun.identity.authentication.modules.radius.client.NASIPAddressAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.NASIPAddressAttribute}
  *  - has a four octets on the wire but uses an {@link java.net.InetAddress} object internally.
  *
- * {@link com.sun.identity.authentication.modules.radius.client.VendorSpecificAttribute}
+ * {@code com.sun.identity.authentication.modules.radius.client.VendorSpecificAttribute}
  *  - has a four byte integer followed by the remaining space containing textual characters.
  * 
                  
  *
diff --git a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/PacketType.java b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/PacketType.java
index c1cef0adb5..bf6bbf47b0 100644
--- a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/PacketType.java
+++ b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/PacketType.java
@@ -12,6 +12,8 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyrighted 2015 Intellectual Reserve, Inc (IRI)
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.radius.common;
 
@@ -20,7 +22,6 @@
 
 /**
  * The packet types in RADIUS rfc 2865 and 2866.
- * 
                  
  */
 public enum PacketType {
 
diff --git a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/RequestAuthenticator.java b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/RequestAuthenticator.java
index 73f261884f..2d8a3df172 100644
--- a/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/RequestAuthenticator.java
+++ b/openam-radius/openam-radius-common/src/main/java/org/forgerock/openam/radius/common/RequestAuthenticator.java
@@ -29,6 +29,7 @@
 /*
  * Portions Copyrighted 2011 ForgeRock AS
  * Portions Copyrighted 2015 Intellectual Reserve, Inc (IRI)
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.radius.common;
 
@@ -55,7 +56,6 @@ public class RequestAuthenticator implements Authenticator {
      * @param rand   in instance of SecureRandom as the source of randomness.
      * @param secret the secret shared between a radius client and server.
      * @throws NoSuchAlgorithmException if the MD5 algorithm is not available.
-     * @throws UnsupportedEncodingException 
      */
     public RequestAuthenticator(SecureRandom rand, String secret)
             throws NoSuchAlgorithmException {
diff --git a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusLifecycleException.java b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusLifecycleException.java
index 19da926443..ac72172704 100644
--- a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusLifecycleException.java
+++ b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusLifecycleException.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 /**
  *
@@ -19,7 +20,7 @@
 package org.forgerock.openam.radius.server;
 
 /**
- * Exception to be thrown for Radius startup, shutdown & re-configuration errors.
+ * Exception to be thrown for Radius startup, shutdown & re-configuration errors.
  */
 public class RadiusLifecycleException extends Exception {
     /**
diff --git a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusRequestListener.java b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusRequestListener.java
index aac43b5e57..98d4ff2aeb 100644
--- a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusRequestListener.java
+++ b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/RadiusRequestListener.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyrighted 2015 Intellectual Reserve, Inc (IRI)
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.radius.server;
 
@@ -46,7 +47,6 @@
  * for handling those that are. If the listener is being shutdown then it accepts packets and drops them to drain any
  * buffered incoming requests while packets in process of being handled are polished off and can send their responses
  * through the backing channel. Then it closes the channel and exits.
- * 
                  
  */
 public class RadiusRequestListener implements Runnable {
 
diff --git a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/config/RadiusServerManager.java b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/config/RadiusServerManager.java
index 477aeada8e..d24786f155 100644
--- a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/config/RadiusServerManager.java
+++ b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/config/RadiusServerManager.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions Copyrighted 2015 Intellectual Reserve, Inc (IRI)
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.radius.server.config;
 
@@ -32,11 +32,10 @@
  * This class is a singleton instance acting as the entry point both for starting up the RADIUS server feature in OpenAM
  * and for tearing it down upon container shutdown. This class is also responsible for ensuring that the radius
  * configuration pages are installed in OpenAM and installing them if they are not. Its daemon defers to the
- * {@link org.forgerock.openam.radius.server.config.StartupCoordinator} to ensure that OpenAM is ready for business,
+ * {@code org.forgerock.openam.radius.server.config.StartupCoordinator} to ensure that OpenAM is ready for business,
  * uses the {@link org.forgerock.openam.radius.server.config.ConfigLoader} to watch for and share changes in
  * configuration in the admin console, and starts up or shuts down the radius
  * {@link org.forgerock.openam.radius.server.RadiusRequestListener} accordingly.
- * 
                  
  */
 
 public final class RadiusServerManager implements Runnable, RadiusServer {
diff --git a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/AccessRequestHandler.java b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/AccessRequestHandler.java
index e8446e117c..f2e0a5d86f 100644
--- a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/AccessRequestHandler.java
+++ b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/AccessRequestHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyrighted 2015 Intellectual Reserve, Inc (IRI)
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.radius.server.spi;
 
@@ -27,9 +28,9 @@
  * definition of clients in the admin console and declaration on a per-client basis of the handler class to be use for
  * traffic from that client. There are several sample implementations such as the
  * {@link org.forgerock.openam.radius.server.spi.handlers.AcceptAllHandler} which always responds with an
- * {@link com.sun.identity.authentication.modules.radius.client.AccessAccept} packet granting access to everyone and the
+ * {@link org.forgerock.openam.radius.common.AccessAccept} packet granting access to everyone and the
  * {@link org.forgerock.openam.radius.server.spi.handlers.RejectAllHandler} that does just the opposite returning an
- * {@link com.sun.identity.authentication.modules.radius.client.AccessReject} packet allowing no access for anyone. The
+ * {@link org.forgerock.openam.radius.common.AccessReject} packet allowing no access for anyone. The
  * {@link org.forgerock.openam.radius.server.spi.handlers.OpenAMAuthHandler} uses an OpenAM realm and chain to allow
  * users to authenticate via authentication modules that are cognizant of non-http clients. Created by markboyd on
  * 11/21/14.
diff --git a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandler.java b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandler.java
index 0576db089b..10c93b723e 100644
--- a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandler.java
+++ b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandler.java
@@ -67,7 +67,6 @@
  * Time generally increases as we move from the top of the diagram to the bottom. However, the while and for loops
  * violate that aspect. Vertical bars imply where processing or user input is currently proceeding. Periods imply an
  * idle or waiting system.
- * 
                  
  *
  * 
                    *
@@ -75,16 +74,16 @@
  *      |                                      .
  *      | AccessRequest                        .
  *      | [username + password]                .
- *      + -----------------------------------> +
+ *      + -----------------------------------> +
  *      .                                      | ac = new AuthContext(realm)
  *      .                                      | ac.login(VIA_CHAIN, chain)
  *      .                                      |
  *      .   at a minimum the auth chain used   | ac.hasMoreRequirements()
  *      .   must have a first module that      | callback[] cbs = ac.getRequirements(true)
- *      .   accepts username and password -->  | find nameCallback and inject username
+ *      .   accepts username and password -->  | find nameCallback and inject username
  *      .                                      | find passwordCallback and inject password
  *      . AccessReject                         |
- *      + <----------------------------------- + if unable to find name/password callbacks or inject values
+ *      + <----------------------------------- + if unable to find name/password callbacks or inject values
  *      .                                      |
  *      .                                      +-- while ac.hasMoreRequirements()
  *      .                                      .    | callback[] cbs = ac.getRequirements(true)
@@ -94,11 +93,11 @@
  * callback
  *      . AccessChallenge                      .    .   |
  *      . [message + state(n)]                 .    .   |
- *      + <---------------------------------------------+
+ *      + <---------------------------------------------+
  *      |                                      .    .   .
  *      | AccessRequest                        .    .   .
  *      | [username + answer + state(n)]       .    .   .
- *      + --------------------------------------------->+
+ *      + --------------------------------------------->+
  *      .                                      .    .   | inject value into cbs(n)
  *      .                                      .    +---+
  *      .                                      .    |
@@ -106,27 +105,26 @@
  *      .                                      +----+
  *      .                                      |
  *      . AccessAccept                         | s = ac.getStatus()
- *      + <----------------------------------- + if s == SUCCESS
+ *      + <----------------------------------- + if s == SUCCESS
  *      .                                      |
  *      . AccessReject                         |
- *      + <----------------------------------- + all else
+ *      + <----------------------------------- + all else
  *      |                                      .
  *      |                                      .
  * 
                  
- * 
                  
+ * 
                  
  * Of special note to authentication module implementors is what modules are allowed in the chain used by a radius
  * client. If an authentication module uses {@link jakarta.servlet.http.HttpServletRequest} or
  * {@link jakarta.servlet.http.HttpServletResponse} they generally won't work for radius clients without modification. For
  * non-http clients the {@link jakarta.servlet.http.HttpServletRequest} and {@link jakarta.servlet.http.HttpServletResponse}
  * objects will be null typically leading to a {@link java.lang.NullPointerException}. Looking for a value of null is
  * how such modules can tell if they are dealing with a non-http client and adjust their behavior accordingly.
- * 
                  
+ * 
                  
  * This may include having different sets of callbacks for http clients than for radius clients. For example, a module
  * may support a checkbox causing a cookie to be set in the user's browser to remember that module's use for a period of
  * time and not require that the user leverage its unique authentication mechanism until that cookie has expired. Such a
  * feature won't work for radius clients since they have no such persistent client-side mechanism. Hence for non-http
  * clients a different callback set would most likely be needed that didn't include that checkbox and its label.
- * 
                  
  */
 public class OpenAMAuthHandler implements AccessRequestHandler {
 
@@ -218,7 +216,6 @@ public void init(Properties config) {
      *            - provides methods that the handler can use to obtain information about the context in which the
      *            request was made, for example the name and IP address of the client from which the request was
      *            received.
-     * @return
      * @throws RadiusProcessingException
      *             - when the response can not be sent.
      */
diff --git a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/amhandler/ContextHolder.java b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/amhandler/ContextHolder.java
index 66e2caa2a5..6e7aa6fd95 100644
--- a/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/amhandler/ContextHolder.java
+++ b/openam-radius/openam-radius-server/src/main/java/org/forgerock/openam/radius/server/spi/handlers/amhandler/ContextHolder.java
@@ -14,6 +14,7 @@
  * Copyrighted 2015 Intellectual Reserve, Inc (IRI)
  *
  * Portions Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.radius.server.spi.handlers.amhandler;
 
@@ -32,7 +33,6 @@
 
 /**
  * Holds server side info for an authentication conversation in progress for a user via a radius client.
- * 
                  
  */
 public class ContextHolder {
 
diff --git a/openam-rest/src/main/java/com/sun/identity/rest/AuthSPrincipal.java b/openam-rest/src/main/java/com/sun/identity/rest/AuthSPrincipal.java
index 2fe281dfcc..4e1393bd7c 100644
--- a/openam-rest/src/main/java/com/sun/identity/rest/AuthSPrincipal.java
+++ b/openam-rest/src/main/java/com/sun/identity/rest/AuthSPrincipal.java
@@ -25,6 +25,7 @@
  * $Id: AuthSPrincipal.java,v 1.1 2009/08/19 05:40:36 veiming Exp $
  *
  * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package com.sun.identity.rest;
@@ -62,9 +63,7 @@ public class AuthSPrincipal implements Principal, java.io.Serializable {
 
     /**
      * Create an AuthSPrincipal with a username.
-     * 
-     * 
                  
-     * 
+     *
      * @param name
      *            the username for this user.
      * 
@@ -81,9 +80,7 @@ public AuthSPrincipal(String name) {
 
     /**
      * Return the username for this AuthPrincipal.
-     * 
-     * 
                  
-     * 
+     *
      * @return the username for this AuthPrincipal
      */
     public String getName() {
@@ -92,9 +89,7 @@ public String getName() {
 
     /**
      * Return the AuthMethod for this AuthPrincipal.
-     * 
-     * 
                  
-     * 
+     *
      * @return the AuthMethod for this AuthPrincipal
      */
     public String getAuthMethod() {
@@ -103,9 +98,7 @@ public String getAuthMethod() {
 
     /**
      * Return the AuthLevel for this AuthPrincipal.
-     * 
-     * 
                  
-     * 
+     *
      * @return the AuthLevel for this AuthPrincipal
      */
     public String getAuthLevel() {
@@ -114,9 +107,7 @@ public String getAuthLevel() {
 
     /**
      * Set the AuthMethod for this AuthPrincipal.
-     * 
-     * 
                  
-     * 
+     *
      * @param auth_method
      *            AuthMethod for this AuthPrincipal
      */
@@ -126,9 +117,7 @@ protected void setAuthMethod(String auth_method) {
 
     /**
      * Set the AuthLevel for this AuthPrincipal.
-     * 
-     * 
                  
-     * 
+     *
      * @param auth_level
      *            AuthLevel for this AuthPrincipal
      */
diff --git a/openam-rest/src/main/java/org/forgerock/openam/authz/PrivilegeAuthzModule.java b/openam-rest/src/main/java/org/forgerock/openam/authz/PrivilegeAuthzModule.java
index f5cfd4bb37..d039a20489 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/authz/PrivilegeAuthzModule.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/authz/PrivilegeAuthzModule.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.authz;
@@ -156,7 +157,8 @@ protected AuthorizationResult evaluate(Context context, PrivilegeDefinition defi
      * Check to see if the realm logged into is valid for getting access to the realm requested.
      * @param requestedRealm The realm requested.
      * @param loggedInRealm The realm logged in to.
-     * @return
+     * @return {@code true} if the logged in realm is valid for accessing the requested realm,
+     *         {@code false} otherwise
      */
     protected boolean loggedIntoValidRealm(String requestedRealm, String loggedInRealm) {
         return requestedRealm.equalsIgnoreCase(loggedInRealm)
diff --git a/openam-rest/src/main/java/org/forgerock/openam/http/authz/HttpPrivilegeAuthzModule.java b/openam-rest/src/main/java/org/forgerock/openam/http/authz/HttpPrivilegeAuthzModule.java
index 0d05545efc..5355f41030 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/http/authz/HttpPrivilegeAuthzModule.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/http/authz/HttpPrivilegeAuthzModule.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 org.forgerock.openam.http.authz;
 
@@ -43,14 +43,14 @@
 import com.sun.identity.delegation.DelegationPermissionFactory;
 
 /**
- * An HTTP authorization module for performing privilege checking, {@see PrivilegeAuthzModule} for more detail.
+ * An HTTP authorization module for performing privilege checking, see {@link PrivilegeAuthzModule} for more detail.
  *
  * @since 14.0.0
  */
 public class HttpPrivilegeAuthzModule extends PrivilegeAuthzModule implements Filter {
 
     /**
-     * Create a new instance of {@link HttpAuthorizationModule}.
+     * Create a new instance of {@link HttpPrivilegeAuthzModule}.
      *
      * @param evaluator The Delegation Evaluator.
      * @param actionToDefinition The action to definition map.
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/AuthnRequestUtils.java b/openam-rest/src/main/java/org/forgerock/openam/rest/AuthnRequestUtils.java
index 70ff0e4739..6aed2dc021 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/AuthnRequestUtils.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/AuthnRequestUtils.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.rest;
 
@@ -43,7 +43,7 @@ public AuthnRequestUtils(@Named(ASYNC_SSOTOKEN_COOKIE_NAME)final Config
 
     /**
      * Finds and extracts the Token ID from the request.
-     * 
                  
+     * 
                  
      * Uses a future to get the the cookie name, so as to allow OpenAM to set the System Property as it will not be set
      * when the container is initialising the filters and servlets. If the System Property has not been set and this
      * method is called it will return null.
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java b/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java
index 5fcb1fe77f..12942f14ad 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.rest;
@@ -120,8 +120,8 @@ public String getModuleId() {
      *
      * @param requestPolicy {@inheritDoc}
      * @param responsePolicy {@inheritDoc}
-     * @param handler {@inheritDoc}
-     * @param options {@inheritDoc}
+     * @param callbackHandler {@inheritDoc}
+     * @param config {@inheritDoc}
      */
     @Override
     public Promise initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy,
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/RestUtils.java b/openam-rest/src/main/java/org/forgerock/openam/rest/RestUtils.java
index 42acc9ea6a..37caba91cb 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/RestUtils.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/RestUtils.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.rest;
@@ -224,7 +224,7 @@ public static  Promise generateNotFoundException(Reques
 
     /**
      * Parses out deployment url
-     * @param deploymentURL
+     * @param deploymentURL the deployment URL to parse the deployment URI from
      */
     public static StringBuilder getFullDeploymentURI(final String deploymentURL) throws URISyntaxException{
 
@@ -249,7 +249,7 @@ public static StringBuilder getFullDeploymentURI(final String deploymentURL) thr
 
     /**
      * Gets an SSOToken for Administrator
-     * @return
+     * @return the administrator SSOToken
      */
     public static SSOToken getToken() {
         return AccessController.doPrivileged(AdminTokenAction.getInstance());
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/Routers.java b/openam-rest/src/main/java/org/forgerock/openam/rest/Routers.java
index c5b96346d1..a9141e9e0d 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/Routers.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/Routers.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest;
@@ -437,7 +438,7 @@ public void toCollection(CollectionResourceProvider resource) {
          * version of {@literal 1} into the route.
                  
          *
          * @param resourceClass The annotated resource endpoint class. Should be annotated with
-         *         {@link org.forgerock.json.resource.annotations.RequestHandler}.
+         *         {@code org.forgerock.json.resource.annotations.RequestHandler}.
          */
         public void toAnnotatedCollection(Class resourceClass) {
             Reject.ifNull(resourceClass);
@@ -452,7 +453,7 @@ public void toAnnotatedCollection(Class resourceClass) {
          * version of {@literal 1} into the route.
                  
          *
          * @param resourceClass The annotated resource endpoint class. Should be annotated with
-         *         {@link org.forgerock.json.resource.annotations.RequestHandler}.
+         *         {@code org.forgerock.json.resource.annotations.RequestHandler}.
          */
         public void toAnnotatedSingleton(Class resourceClass) {
             Reject.ifNull(resourceClass);
@@ -856,7 +857,7 @@ public VersionableResourceRoute toCollection(CollectionResourceProvider resource
          * matching the route should be routed to.
          *
          * @param resourceClass The annotated resource endpoint class. Should be annotated with
-         *         {@link org.forgerock.json.resource.annotations.RequestHandler}.
+         *         {@code org.forgerock.json.resource.annotations.RequestHandler}.
          */
         public VersionableResourceRoute toAnnotatedCollection(Class resourceClass) {
             Reject.ifNull(resourceClass);
@@ -868,7 +869,7 @@ public VersionableResourceRoute toAnnotatedCollection(Class re
          * matching the route should be routed to.
          *
          * @param resourceClass The annotated resource endpoint class. Should be annotated with
-         *         {@link org.forgerock.json.resource.annotations.RequestHandler}.
+         *         {@code org.forgerock.json.resource.annotations.RequestHandler}.
          */
         public VersionableResourceRoute toAnnotatedSingleton(Class resourceClass) {
             Reject.ifNull(resourceClass);
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/SubjectAwareResource.java b/openam-rest/src/main/java/org/forgerock/openam/rest/SubjectAwareResource.java
index 6c1cd9a4e4..97011bbaa1 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/SubjectAwareResource.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/SubjectAwareResource.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest;
@@ -29,7 +30,7 @@
 public abstract class SubjectAwareResource implements CollectionResourceProvider {
 
     /**
-     * Retrieves the {@link javax.security.auth.Subject} from the {@link org.forgerock.http.context.Context}.
+     * Retrieves the {@link javax.security.auth.Subject} from the {@link org.forgerock.services.context.Context}.
      * If there's no Subject or no SSOTokenContext in the provided context this method will return null.
      *
      * @param context Context of the request made to this resource.
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/VersionBehaviourConfigListener.java b/openam-rest/src/main/java/org/forgerock/openam/rest/VersionBehaviourConfigListener.java
index 94aaffc98c..c983c6c2d3 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/VersionBehaviourConfigListener.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/VersionBehaviourConfigListener.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest;
@@ -60,7 +61,7 @@ public VersionBehaviourConfigListener() {
 
     /**
      * Registers the listener with the {@code ServiceConfigManager} and sets the initial default version behaviour.
-     * @param mgr
+     * @param mgr the service configuration manager to register this listener with
      */
     public void register(ServiceConfigManager mgr) {
         this.mgr = mgr;
@@ -104,6 +105,7 @@ public void schemaChanged(String serviceName, String version) {
      * @param serviceComponent
      *            name of the service components that changed.
      * @param type
+     *            the type of configuration change that occurred.
      */
     @Override
     public void globalConfigChanged(String serviceName, String version, String groupName, String serviceComponent,
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilter.java b/openam-rest/src/main/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilter.java
index 4dca1e0edb..6995811b2d 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilter.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilter.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.rest.audit;
 
@@ -67,8 +67,8 @@ public abstract class AbstractRestletAccessAuditFilter extends Filter {
      * @param restlet The restlet for which events will be logged.
      * @param auditEventPublisher The publisher responsible for logging the events.
      * @param auditEventFactory The factory that can be used to create the events.
-     * @param requestDetailCreator
-     * @param responseDetailCreator
+     * @param requestDetailCreator The auditor used to record details from the request body.
+     * @param responseDetailCreator The auditor used to record details from the response body.
      */
     public AbstractRestletAccessAuditFilter(Component component, Restlet restlet,
             AuditEventPublisher auditEventPublisher, AuditEventFactory auditEventFactory,
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/authz/CrestPrivilegeAuthzModule.java b/openam-rest/src/main/java/org/forgerock/openam/rest/authz/CrestPrivilegeAuthzModule.java
index f29663778d..d24bb6eaf8 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/authz/CrestPrivilegeAuthzModule.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/authz/CrestPrivilegeAuthzModule.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 org.forgerock.openam.rest.authz;
@@ -45,7 +45,7 @@
 import com.sun.identity.delegation.DelegationPermissionFactory;
 
 /**
- * A CREST authorization module for performing privilege checking, {@see PrivilegeAuthzModule} for more detail.
+ * A CREST authorization module for performing privilege checking, see {@link PrivilegeAuthzModule} for more detail.
  *
  * @since 14.0.0
  */
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/resource/SSOTokenContext.java b/openam-rest/src/main/java/org/forgerock/openam/rest/resource/SSOTokenContext.java
index 7324c4ef13..01fb404312 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/resource/SSOTokenContext.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/resource/SSOTokenContext.java
@@ -13,7 +13,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.rest.resource;
@@ -58,8 +58,8 @@ public class SSOTokenContext extends AbstractContext implements SubjectContext {
 
     /**
      * Construct a new SSOTokenContext using a supplier for the SSOToken instance.
-     * @param debug
-     * @param sessionCache
+     * @param debug the debug logger used by this context
+     * @param sessionCache the session cache used to look up the session for the caller
      * @param parent The parent context.
      * @param token A supplier for the SSOToken to derive the other attributes of this context from.
      */
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/router/CTSPersistentStoreProxy.java b/openam-rest/src/main/java/org/forgerock/openam/rest/router/CTSPersistentStoreProxy.java
index 5cc7aa36c7..d7692c345b 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/router/CTSPersistentStoreProxy.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/router/CTSPersistentStoreProxy.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.rest.router;
 
@@ -33,7 +33,7 @@
 
 /**
  * A proxy implementation of the CTSPersistentStore, which delegates all its calls to the "real" implementation.
- * 
                  
+ * 
                  
  * Using this proxy instead of the "real" implementation prevents singletons in the core of OpenAM to be initialised
  * prior to OpenAM being configured. As if this happens then some functions in OpenAM will be broken and a restart will
  * be required for them to be restored.
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/router/package-info.java b/openam-rest/src/main/java/org/forgerock/openam/rest/router/package-info.java
index 565d5b9916..9d425fe1f3 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/router/package-info.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/router/package-info.java
@@ -12,11 +12,12 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock Inc.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 /**
  * This package contains classes for the routing of REST requests for OpenAM.
- * 
                  
+ * 
                  
  * Each REST request is parsed for the presence of a realm in the URI before being routed to the requested
  * endpoint.
  */
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/service/OAuth2ServiceEndpointApplication.java b/openam-rest/src/main/java/org/forgerock/openam/rest/service/OAuth2ServiceEndpointApplication.java
index 19d981e9a4..c9e889e66f 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/service/OAuth2ServiceEndpointApplication.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/service/OAuth2ServiceEndpointApplication.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest.service;
@@ -28,7 +29,7 @@
 public class OAuth2ServiceEndpointApplication extends ServiceEndpointApplication {
 
     /**
-     * {@inheritDoc}
+     * Constructs a new OAuth2ServiceEndpointApplication.
      * Sets the default media type as "application/json".
      */
     public OAuth2ServiceEndpointApplication() {
@@ -37,8 +38,8 @@ public OAuth2ServiceEndpointApplication() {
     }
 
     /**
-     * Returns the XACML router.
-     * @return
+     * Returns the OAuth2 router.
+     * @return the OAuth2 router
      */
     protected Router getRouter() {
         return InjectorHolder.getInstance(Key.get(Router.class, Names.named("OAuth2Router")));
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/service/RestletServiceServlet.java b/openam-rest/src/main/java/org/forgerock/openam/rest/service/RestletServiceServlet.java
index 9613e97ac1..32357900c0 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/service/RestletServiceServlet.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/service/RestletServiceServlet.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.rest.service;
@@ -30,7 +30,7 @@
 /**
  * This class is used to create an instance of the Restlet ServerServlet programmatically outside of the Servlet
  * Container.
- * 
                  
+ * 
                  
  * This enables the creation of an instance as a delegate that can be passed requests from another Java HttpServlet
  * that is created by the Servlet Container.
  *
@@ -58,7 +58,7 @@ public RestletServiceServlet(final HttpServlet servlet, Class
+     * 
                  
      * All other parameter requests get passed onto the underlying Java HttpServlet.
      *
      * @param name {@inheritDoc}
@@ -94,9 +94,9 @@ public String getInitParameter(String name) {
     }
 
     /**
-     * Overridden to include the "org.restlet.application" init paramter name.
+     * Overridden to include the "org.restlet.application" init parameter name.
      *
-     * @return {@code}
+     * @return an enumeration of the init parameter names, including the "org.restlet.application" parameter
      */
     @SuppressWarnings("unchecked")
     @Override
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/service/ServiceEndpointApplication.java b/openam-rest/src/main/java/org/forgerock/openam/rest/service/ServiceEndpointApplication.java
index 33dbdad709..5eed7d4ed6 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/service/ServiceEndpointApplication.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/service/ServiceEndpointApplication.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest.service;
@@ -40,7 +41,7 @@ public abstract class ServiceEndpointApplication extends Application {
 
     /**
      * Constructs a new ServiceEndpointApplication.
-     * 
                  
+     * 
                  
      * Sets the StatusService to {@link RestStatusService}.
      */
     protected ServiceEndpointApplication(StatusService statusService) {
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/service/UMAServiceEndpointApplication.java b/openam-rest/src/main/java/org/forgerock/openam/rest/service/UMAServiceEndpointApplication.java
index e6ad70f9c4..db1e0a8d3c 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/service/UMAServiceEndpointApplication.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/service/UMAServiceEndpointApplication.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest.service;
@@ -28,7 +29,7 @@
 public class UMAServiceEndpointApplication extends ServiceEndpointApplication {
 
     /**
-     * {@inheritDoc}
+     * Constructs a new UMAServiceEndpointApplication.
      * Sets the default media type as "application/json".
      */
     public UMAServiceEndpointApplication() {
diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/service/XACMLServiceEndpointApplication.java b/openam-rest/src/main/java/org/forgerock/openam/rest/service/XACMLServiceEndpointApplication.java
index 01ca11c3d9..ad85d6bd72 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/rest/service/XACMLServiceEndpointApplication.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/rest/service/XACMLServiceEndpointApplication.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest.service;
@@ -32,7 +33,7 @@ public class XACMLServiceEndpointApplication extends ServiceEndpointApplication
             "application/xacml+xml; version=3.0", "XACML v3.0 XML");
 
     /**
-     * {@inheritDoc}
+     * Constructs a new XACMLServiceEndpointApplication.
      * Sets the default media type as "application/json".
      */
     public XACMLServiceEndpointApplication() {
@@ -42,7 +43,7 @@ public XACMLServiceEndpointApplication() {
 
     /**
      * Returns the XACML router.
-     * @return
+     * @return the XACML router
      */
     protected Restlet getRouter() {
         return InjectorHolder.getInstance(Key.get(Router.class, Names.named("XacmlRouter")));
diff --git a/openam-rest/src/main/java/org/forgerock/openam/services/RestSecurity.java b/openam-rest/src/main/java/org/forgerock/openam/services/RestSecurity.java
index 237be082f2..646ad145d5 100644
--- a/openam-rest/src/main/java/org/forgerock/openam/services/RestSecurity.java
+++ b/openam-rest/src/main/java/org/forgerock/openam/services/RestSecurity.java
@@ -20,6 +20,8 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions copyright [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.services;
@@ -252,7 +254,7 @@ public String getForgotPasswordConfirmationUrl() {
     /**
      * Retrieves the Self-Registration CTS Token Life Time
      * @return Long representing the time that the Token shall be valid
-     * @throws ServiceNotFoundException
+     * @throws ServiceNotFoundException if the self-registration token life time setting cannot be retrieved
      */
     public Long getSelfRegTLT() throws ServiceNotFoundException {
         if ((restSecurityConfiguration != null) && (restSecurityConfiguration.selfRegTokenLifeTime != null)) {
@@ -275,7 +277,7 @@ public String getSuccessfulUserRegistrationDestination() {
     /**
      * Retrieves the Forgotten Password CTS Token Life Time
      * @return Long representing the time that the Token shall be valid
-     * @throws ServiceNotFoundException
+     * @throws ServiceNotFoundException if the forgotten password token life time setting cannot be retrieved
      */
     public Long getForgotPassTLT() throws ServiceNotFoundException {
         if ((restSecurityConfiguration != null) && (restSecurityConfiguration.forgotPasswordTokenLifeTime != null)) {
diff --git a/openam-restlet/src/main/java/org/forgerock/openam/rest/jakarta/servlet/ServerServlet.java b/openam-restlet/src/main/java/org/forgerock/openam/rest/jakarta/servlet/ServerServlet.java
index bb823b0e08..c91cf85541 100644
--- a/openam-restlet/src/main/java/org/forgerock/openam/rest/jakarta/servlet/ServerServlet.java
+++ b/openam-restlet/src/main/java/org/forgerock/openam/rest/jakarta/servlet/ServerServlet.java
@@ -20,6 +20,8 @@
  * https://restlet.talend.com/
  *
  * Restlet is a registered trademark of QlikTech International AB.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.rest.jakarta.servlet;
@@ -67,6 +69,7 @@
  * Please note that you can also combine the two first of them whereas the last
  * one is a full alternative. They are described below by order of priority:
  * 
+ * 
  * 
  * 
  * 
@@ -1093,7 +1096,7 @@ private boolean isDefaultComponent() {
      * @param className
      *            The class name to lookup.
      * @return The class object.
-     * @throws ClassNotFoundException
+     * @throws ClassNotFoundException if no class with the given name can be found.
      */
     protected Class loadClass(String className)
             throws ClassNotFoundException {
diff --git a/openam-schema/openam-dtd-schema/pom.xml b/openam-schema/openam-dtd-schema/pom.xml
index b62cb62e3f..7ab77da4e6 100644
--- a/openam-schema/openam-dtd-schema/pom.xml
+++ b/openam-schema/openam-dtd-schema/pom.xml
@@ -29,18 +29,5 @@
     OpenAM Identity Services DTD Componentsopenam-dtd-schemajar
-
-    
-    
-        
-            
-                org.apache.maven.plugins
-                maven-javadoc-plugin
-                
-                    true
-                
-            
-        
-    
 
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AffiliationDescriptorConfigElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AffiliationDescriptorConfigElement.java
index 7438551b39..8cf27753d8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AffiliationDescriptorConfigElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AffiliationDescriptorConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AffiliationDescriptorConfig element declaration.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 60)
- * 
                  
  * 
                  - * <element name="AffiliationDescriptorConfig" type="{urn:sun:fm:ID-FF:entityconfig}BaseConfigType"/>
+ * <element name="AffiliationDescriptorConfig" type="{urn:sun:fm:ID-FF:entityconfig}BaseConfigType"/>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeElement.java
index aefd23de98..cb10729140 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Attribute element declaration.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 67)
- * 
                  
  * 
                  - * <element name="Attribute" type="{urn:sun:fm:ID-FF:entityconfig}AttributeType"/>
+ * <element name="Attribute" type="{urn:sun:fm:ID-FF:entityconfig}AttributeType"/>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeType.java
index 637f96c232..bc82a9397b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/AttributeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for AttributeType complex type.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 68)
- * 
                  
  * 
                  - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:sun:fm:ID-FF:entityconfig}Value" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:sun:fm:ID-FF:entityconfig}Value" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/BaseConfigType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/BaseConfigType.java
index 622411f60b..bfc96a1a4e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/BaseConfigType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/BaseConfigType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for BaseConfigType complex type.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 61)
- * 
                  
  * 
                  - * <complexType name="BaseConfigType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:sun:fm:ID-FF:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="metaAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BaseConfigType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:sun:fm:ID-FF:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="metaAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigElement.java
index 5daee50d4f..5080fd59ce 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EntityConfig element declaration.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 41)
- * 
                  
  * 
                  - * <element name="EntityConfig" type="{urn:sun:fm:ID-FF:entityconfig}EntityConfigType"/>
+ * <element name="EntityConfig" type="{urn:sun:fm:ID-FF:entityconfig}EntityConfigType"/>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigType.java
index 65a10afc59..c9e78045f8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/EntityConfigType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,28 +13,27 @@
 /**
  * Java content class for EntityConfigType complex type.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 42)
- * 
                  
  * 
                  - * <complexType name="EntityConfigType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:sun:fm:ID-FF:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *         <choice>
- *           <sequence>
- *             <element ref="{urn:sun:fm:ID-FF:entityconfig}IDPDescriptorConfig" maxOccurs="unbounded" minOccurs="0"/>
- *             <element ref="{urn:sun:fm:ID-FF:entityconfig}SPDescriptorConfig" maxOccurs="unbounded" minOccurs="0"/>
- *           </sequence>
- *           <element ref="{urn:sun:fm:ID-FF:entityconfig}AffiliationDescriptorConfig"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="entityID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="hosted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EntityConfigType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:sun:fm:ID-FF:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *         <choice>
+ *           <sequence>
+ *             <element ref="{urn:sun:fm:ID-FF:entityconfig}IDPDescriptorConfig" maxOccurs="unbounded" minOccurs="0"/>
+ *             <element ref="{urn:sun:fm:ID-FF:entityconfig}SPDescriptorConfig" maxOccurs="unbounded" minOccurs="0"/>
+ *           </sequence>
+ *           <element ref="{urn:sun:fm:ID-FF:entityconfig}AffiliationDescriptorConfig"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="entityID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="hosted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/IDPDescriptorConfigElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/IDPDescriptorConfigElement.java
index f987a9219b..38c0bc230d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/IDPDescriptorConfigElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/IDPDescriptorConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDPDescriptorConfig element declaration.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 58)
- * 
                  
  * 
                  - * <element name="IDPDescriptorConfig" type="{urn:sun:fm:ID-FF:entityconfig}BaseConfigType"/>
+ * <element name="IDPDescriptorConfig" type="{urn:sun:fm:ID-FF:entityconfig}BaseConfigType"/>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ObjectFactory.java
index c82490acc4..eaa8dd3fe9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -65,7 +66,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -84,7 +85,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -103,7 +104,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -115,7 +116,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of SPDescriptorConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.SPDescriptorConfigElement createSPDescriptorConfigElement()
@@ -127,7 +128,7 @@ public com.sun.identity.federation.jaxb.entityconfig.SPDescriptorConfigElement c
     /**
      * Create an instance of IDPDescriptorConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.IDPDescriptorConfigElement createIDPDescriptorConfigElement()
@@ -139,7 +140,7 @@ public com.sun.identity.federation.jaxb.entityconfig.IDPDescriptorConfigElement
     /**
      * Create an instance of ValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.ValueElement createValueElement()
@@ -151,7 +152,7 @@ public com.sun.identity.federation.jaxb.entityconfig.ValueElement createValueEle
     /**
      * Create an instance of ValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.ValueElement createValueElement(java.lang.String value)
@@ -163,7 +164,7 @@ public com.sun.identity.federation.jaxb.entityconfig.ValueElement createValueEle
     /**
      * Create an instance of EntityConfigType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.EntityConfigType createEntityConfigType()
@@ -175,7 +176,7 @@ public com.sun.identity.federation.jaxb.entityconfig.EntityConfigType createEnti
     /**
      * Create an instance of AttributeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.AttributeType createAttributeType()
@@ -187,7 +188,7 @@ public com.sun.identity.federation.jaxb.entityconfig.AttributeType createAttribu
     /**
      * Create an instance of AffiliationDescriptorConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.AffiliationDescriptorConfigElement createAffiliationDescriptorConfigElement()
@@ -199,7 +200,7 @@ public com.sun.identity.federation.jaxb.entityconfig.AffiliationDescriptorConfig
     /**
      * Create an instance of BaseConfigType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.BaseConfigType createBaseConfigType()
@@ -211,7 +212,7 @@ public com.sun.identity.federation.jaxb.entityconfig.BaseConfigType createBaseCo
     /**
      * Create an instance of EntityConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.EntityConfigElement createEntityConfigElement()
@@ -223,7 +224,7 @@ public com.sun.identity.federation.jaxb.entityconfig.EntityConfigElement createE
     /**
      * Create an instance of AttributeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.federation.jaxb.entityconfig.AttributeElement createAttributeElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/SPDescriptorConfigElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/SPDescriptorConfigElement.java
index 079394fac9..729335db7a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/SPDescriptorConfigElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/SPDescriptorConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPDescriptorConfig element declaration.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 59)
- * 
                  
  * 
                  - * <element name="SPDescriptorConfig" type="{urn:sun:fm:ID-FF:entityconfig}BaseConfigType"/>
+ * <element name="SPDescriptorConfig" type="{urn:sun:fm:ID-FF:entityconfig}BaseConfigType"/>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ValueElement.java
index 2c3c824bbd..7d149f390e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/ValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Value element declaration.
  * 
                  The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/idff-entity-config-schema.xsd line 74)
- * 
                  
  * 
                  - * <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                  
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java
index e1bba2477f..c46dce1243 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -89,7 +90,7 @@ public synchronized com.sun.msv.grammar.Grammar getGrammar() throws JAXBExceptio
      * java content-tree into XML data.
      *
      * @return a Marshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Marshaller object
      */
     public Marshaller createMarshaller() throws JAXBException {
@@ -101,7 +102,7 @@ public Marshaller createMarshaller() throws JAXBException {
      * data into a java content-tree.
      *
      * @return an Unmarshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Unmarshaller object
      */
     public Unmarshaller createUnmarshaller() throws JAXBException {
@@ -113,7 +114,7 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
      * java content-tree.
      *
      * @return an Unmarshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Validator object
      */
     public Validator createValidator() throws JAXBException {
@@ -127,7 +128,7 @@ public Validator createValidator() throws JAXBException {
      *
      * @param javaContentInterface the Class object 
      * @return an instance of the Java content interface
-     * @exception JAXBException
+     * @exception JAXBException if an error occurs while creating the instance
      */
     public Object newInstance( Class javaContentInterface ) 
         throws JAXBException {
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java
index 50057b4c87..3908e46059 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -260,7 +261,6 @@ public com.sun.msv.grammar.Expression getTopLevel() {
 
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)
      */
     public XMLSerializable castToXMLSerializable(Object o) {
         XMLSerializable result = null;
@@ -274,7 +274,6 @@ public XMLSerializable castToXMLSerializable(Object o) {
     }
 
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)
      */
     public ValidatableObject castToValidatableObject(Object o) {
         ValidatableObject result = null;
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java
index 0b42c79066..cdd6019c76 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -160,7 +161,6 @@ public final com.sun.msv.grammar.Grammar getGrammar() throws JAXBException {
     }
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)
      */
     public XMLSerializable castToXMLSerializable(Object o) {
         if( o instanceof XMLSerializable ) {
@@ -171,7 +171,6 @@ public XMLSerializable castToXMLSerializable(Object o) {
     }
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)
      */
     public ValidatableObject castToValidatableObject(Object o) {
         if( o instanceof ValidatableObject ) {
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java
index 59d97b97a8..de8c59e0b7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -20,12 +21,11 @@
 
 /**
  * Splits the unmarshalling events to bracnhes to support
- * XML Schema's <all> and RELAX NG's <interleave>
+ * XML Schema's <all> and RELAX NG's <interleave>
  * 
  * 
                  
  * This class will be extended by the generated code.
  * 
- * @optionalRuntime
  * 
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java
index 52f98845b4..9c58ac7636 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -48,7 +49,7 @@
 import com.sun.identity.shared.xml.XMLUtils;
 
 /**
- * Implementation of {@link Marshaller} interface for JAXB RI.
+ * Implementation of {@link javax.xml.bind.Marshaller} interface for JAXB RI.
  * 
  * @author Kohsuke Kawaguchi
  * @author Vivek Pandey
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java
index 1f920e391c..fe861b2e70 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java
@@ -2,7 +2,8 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v1.0.6-b27-fcs 
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Generated on: 2012.06.11 at 10:33:54 AM PDT
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -10,7 +11,7 @@
 import javax.xml.namespace.NamespaceContext;
 
 /**
- * Maintains namespace<->prefix bindings.
+ * Maintains namespace<->prefix bindings.
  * 
  * 
                  
  * This interface extends {@link NamespaceContext} and provides
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java
index 1173a7100e..6a11f55f01 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java
@@ -2,7 +2,8 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v1.0.6-b27-fcs 
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Generated on: 2012.06.11 at 10:33:54 AM PDT
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -263,7 +264,7 @@ public void endElement() throws SAXException {
      * c.endElement();
      * 
      * 
-     * will generate <foo>abc def<bar/>ghi</foo>.
+     * will generate <foo>abc def<bar/>ghi</foo>.
      */
     public void text( String text, String fieldName ) throws SAXException {
         // If the assertion fails, it must be a bug of xjc.
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java
index fa9db993ab..05edbea6a3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -17,7 +18,7 @@
  * both the SAX events and error events.
  * 
  * 
                  
- * This interface refines {@link ContentHandler} as follows:
+ * This interface refines {@link org.xml.sax.ContentHandler} as follows:
  * 
                    
  *  
                  1. element names and attribute names must be {@link String#intern()}ed.
  *  
                  2. namespace prefix and uris must be {@link String#intern()}ed.
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java
index 066a289163..b947a41ada 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -31,7 +32,7 @@
 import com.sun.xml.bind.util.AttributesImpl;
 
 /**
- * Implementation of {@link UnmarshallerHandler}.
+ * Implementation of {@link javax.xml.bind.UnmarshallerHandler}.
  * 
  * This object converts SAX events into unmarshaller events and
  * cooridnates the entire unmarshalling process.
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java
index bec21f7111..3837143634 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -25,7 +26,7 @@
  *
  * 
                    
  * Errors detected by the AbstractUnmarshallingEventHandlerImpl-derived classes should
- * be either thrown as {@link UnrepotedException} or reported through
+ * be either thrown as {@code UnreportedException} or reported through
  * the handleEvent method of this interface.
  *
  * @author
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/XMLSerializer.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/XMLSerializer.java
index 210890ad9c..0177a82424 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/XMLSerializer.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/XMLSerializer.java
@@ -2,7 +2,8 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v1.0.6-b27-fcs 
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Generated on: 2012.06.11 at 10:33:54 AM PDT
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 package com.sun.identity.federation.jaxb.entityconfig.impl.runtime;
@@ -127,7 +128,7 @@ public interface XMLSerializer
      * c.endElement();
      * 
      * 
-     * will generate <foo>abc def<bar/>ghi</foo>.
+     * will generate <foo>abc def<bar/>ghi</foo>.
      */
     void text( String text, String fieldName ) throws SAXException;
     
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/EmptyType.java
index c5471b5dd6..fb6e5a5e95 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionElement.java
index a6d328b036..e304f5f9f8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:sa:2004-04}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:sa:2004-04}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionType.java
index 29e2b54212..b406bd75d5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ObjectFactory.java
index f8852e3f8f..2af546d4ad 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -71,7 +72,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -90,7 +91,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -109,7 +110,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -121,7 +122,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of SASLResponseTypeCredentialsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseType.CredentialsType createSASLResponseTypeCredentialsType()
@@ -133,7 +134,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseType.CredentialsTyp
     /**
      * Create an instance of PasswordTransformsTypeTransformType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.PasswordTransformsType.TransformType createPasswordTransformsTypeTransformType()
@@ -145,7 +146,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.PasswordTransformsType.Transfor
     /**
      * Create an instance of PasswordTransformsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.PasswordTransformsType createPasswordTransformsType()
@@ -157,7 +158,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.PasswordTransformsType createPa
     /**
      * Create an instance of SASLResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseElement createSASLResponseElement()
@@ -169,7 +170,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseElement createSASLR
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.StatusType createStatusType()
@@ -181,7 +182,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.StatusType createStatusType()
     /**
      * Create an instance of SASLRequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLRequestType createSASLRequestType()
@@ -193,7 +194,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLRequestType createSASLReque
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.EmptyType createEmptyType()
@@ -205,7 +206,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.EmptyType createEmptyType()
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.ExtensionType createExtensionType()
@@ -217,7 +218,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.ExtensionType createExtensionTy
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.StatusElement createStatusElement()
@@ -229,7 +230,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.StatusElement createStatusEleme
     /**
      * Create an instance of SASLResponseTypeDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseType.DataType createSASLResponseTypeDataType()
@@ -241,7 +242,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseType.DataType creat
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.ExtensionElement createExtensionElement()
@@ -253,7 +254,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.ExtensionElement createExtensio
     /**
      * Create an instance of SASLRequestTypeDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLRequestType.DataType createSASLRequestTypeDataType()
@@ -265,7 +266,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLRequestType.DataType create
     /**
      * Create an instance of PasswordTransformsTypeTransformTypeParameterType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.PasswordTransformsType.TransformType.ParameterType createPasswordTransformsTypeTransformTypeParameterType()
@@ -277,7 +278,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.PasswordTransformsType.Transfor
     /**
      * Create an instance of SASLResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseType createSASLResponseType()
@@ -289,7 +290,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLResponseType createSASLResp
     /**
      * Create an instance of SASLRequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLRequestElement createSASLRequestElement()
@@ -301,7 +302,7 @@ public com.sun.identity.liberty.ws.authnsvc.jaxb.SASLRequestElement createSASLRe
     /**
      * Create an instance of PasswordTransformsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.authnsvc.jaxb.PasswordTransformsElement createPasswordTransformsElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsElement.java
index b0c512bde9..fe744a5eaa 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,39 +15,38 @@
  * 
  * Java content class for PasswordTransforms element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 166)
- * 
                    
  * 
                    - * <element name="PasswordTransforms">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="Transform" maxOccurs="unbounded">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="Parameter" maxOccurs="unbounded" minOccurs="0">
- *                       <complexType>
- *                         <simpleContent>
- *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                             <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           </extension>
- *                         </simpleContent>
- *                       </complexType>
- *                     </element>
- *                   </sequence>
- *                   <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *                   <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="PasswordTransforms">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="Transform" maxOccurs="unbounded">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="Parameter" maxOccurs="unbounded" minOccurs="0">
+ *                       <complexType>
+ *                         <simpleContent>
+ *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                             <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           </extension>
+ *                         </simpleContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *                   <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsType.java
index f51e578d0c..fdd1857195 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/PasswordTransformsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,37 +13,36 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 174)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Transform" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Parameter" maxOccurs="unbounded" minOccurs="0">
- *                     <complexType>
- *                       <simpleContent>
- *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                           <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </extension>
- *                       </simpleContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *                 <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Transform" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="Parameter" maxOccurs="unbounded" minOccurs="0">
+ *                     <complexType>
+ *                       <simpleContent>
+ *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                           <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                         </extension>
+ *                       </simpleContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *                 <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -76,27 +76,26 @@ public interface PasswordTransformsType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 178)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Parameter" maxOccurs="unbounded" minOccurs="0">
-     *           <complexType>
-     *             <simpleContent>
-     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *                 <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </extension>
-     *             </simpleContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="Parameter" maxOccurs="unbounded" minOccurs="0">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
@@ -166,15 +165,14 @@ public interface TransformType {
         /**
          * Java content class for anonymous complex type.
          * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 184)
-         * 
                    
          * 
                    -         * <complexType>
-         *   <simpleContent>
-         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-         *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </extension>
-         *   </simpleContent>
-         * </complexType>
+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
          * 
                    
          * 
          */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestElement.java
index e013dbb018..e8bad1c87b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,31 +13,30 @@
 /**
  * Java content class for SASLRequest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 82)
- * 
                    
  * 
                    - * <element name="SASLRequest">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="Data" minOccurs="0">
- *             <complexType>
- *               <simpleContent>
- *                 <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *                 </extension>
- *               </simpleContent>
- *             </complexType>
- *           </element>
- *           <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
- *         </sequence>
- *         <attribute name="advisoryAuthnID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *         <attribute name="authzID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *         <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *         <attribute name="mechanism" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="SASLRequest">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="Data" minOccurs="0">
+ *             <complexType>
+ *               <simpleContent>
+ *                 <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *                 </extension>
+ *               </simpleContent>
+ *             </complexType>
+ *           </element>
+ *           <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
+ *         </sequence>
+ *         <attribute name="advisoryAuthnID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="authzID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *         <attribute name="mechanism" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestType.java
index bec9c9fc23..16b13bbc55 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLRequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,29 +13,28 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 83)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Data" minOccurs="0">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="advisoryAuthnID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="authzID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="mechanism" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Data" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="advisoryAuthnID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="authzID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="mechanism" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -155,14 +155,13 @@ public interface SASLRequestType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 87)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseElement.java
index 01f63bc8a7..168a7ef054 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,42 +13,41 @@
 /**
  * Java content class for SASLResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 119)
- * 
                    
  * 
                    - * <element name="SASLResponse">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:sa:2004-04}Status"/>
- *           <element ref="{urn:liberty:sa:2004-04}PasswordTransforms" minOccurs="0"/>
- *           <element name="Data" minOccurs="0">
- *             <complexType>
- *               <simpleContent>
- *                 <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *                 </extension>
- *               </simpleContent>
- *             </complexType>
- *           </element>
- *           <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
- *           <element name="Credentials" minOccurs="0">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <any/>
- *                   </sequence>
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *         </sequence>
- *         <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *         <attribute name="serverMechanism" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="SASLResponse">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:sa:2004-04}Status"/>
+ *           <element ref="{urn:liberty:sa:2004-04}PasswordTransforms" minOccurs="0"/>
+ *           <element name="Data" minOccurs="0">
+ *             <complexType>
+ *               <simpleContent>
+ *                 <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *                 </extension>
+ *               </simpleContent>
+ *             </complexType>
+ *           </element>
+ *           <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="Credentials" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <any/>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *         </sequence>
+ *         <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *         <attribute name="serverMechanism" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseType.java
index 68ae6c3364..9665be4ba9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/SASLResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,40 +13,39 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 120)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:sa:2004-04}Status"/>
- *         <element ref="{urn:liberty:sa:2004-04}PasswordTransforms" minOccurs="0"/>
- *         <element name="Data" minOccurs="0">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Credentials" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="serverMechanism" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:sa:2004-04}Status"/>
+ *         <element ref="{urn:liberty:sa:2004-04}PasswordTransforms" minOccurs="0"/>
+ *         <element name="Data" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Credentials" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="serverMechanism" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -192,17 +192,16 @@ public interface SASLResponseType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 140)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <any/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <any/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
@@ -238,14 +237,13 @@ public interface CredentialsType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-idwsf-authn-svc.xsd line 128)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusElement.java
index 920e2a7925..463f545de3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:sa:2004-04}StatusType"/>
+ * <element name="Status" type="{urn:liberty:sa:2004-04}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusType.java
index ce1ff63a63..e998445c4c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/authnsvc/jaxb/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:sa:2004-04}Status" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:sa:2004-04}Status" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationElement.java
index e0f94babea..1b5efbce9a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for ActivationLimitDuration element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 662)
- * 
                    
  * 
                    - * <element name="ActivationLimitDuration" type="{urn:liberty:ac:2003-08}ActivationLimitDurationType"/>
+ * <element name="ActivationLimitDuration" type="{urn:liberty:ac:2003-08}ActivationLimitDurationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationType.java
index 33fcf7ad37..27b06d4741 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitDurationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for ActivationLimitDurationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 686)
- * 
                    
  * 
                    - * <complexType name="ActivationLimitDurationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="duration" use="required" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ActivationLimitDurationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="duration" use="required" type="{http://www.w3.org/2001/XMLSchema}duration" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitElement.java
index d04fbbada3..5a87f96d92 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for ActivationLimit element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 195)
- * 
                    
  * 
                    - * <element name="ActivationLimit" type="{urn:liberty:ac:2003-08}ActivationLimitType"/>
+ * <element name="ActivationLimit" type="{urn:liberty:ac:2003-08}ActivationLimitType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionElement.java
index 8ff82d7337..a5ac7c8149 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for ActivationLimitSession element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 678)
- * 
                    
  * 
                    - * <element name="ActivationLimitSession" type="{urn:liberty:ac:2003-08}ActivationLimitSessionType"/>
+ * <element name="ActivationLimitSession" type="{urn:liberty:ac:2003-08}ActivationLimitSessionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionType.java
index ffdfc92253..42bd268903 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitSessionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for ActivationLimitSessionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 694)
- * 
                    
  * 
                    - * <complexType name="ActivationLimitSessionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ActivationLimitSessionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitType.java
index 16a7384b8b..cc0204cbdc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for ActivationLimitType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 654)
- * 
                    
  * 
                    - * <complexType name="ActivationLimitType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{urn:liberty:ac:2003-08}ActivationLimitDuration"/>
- *         <element ref="{urn:liberty:ac:2003-08}ActivationLimitUsages"/>
- *         <element ref="{urn:liberty:ac:2003-08}ActivationLimitSession"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ActivationLimitType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{urn:liberty:ac:2003-08}ActivationLimitDuration"/>
+ *         <element ref="{urn:liberty:ac:2003-08}ActivationLimitUsages"/>
+ *         <element ref="{urn:liberty:ac:2003-08}ActivationLimitSession"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesElement.java
index 0e6a6df5e9..f57db0deda 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for ActivationLimitUsages element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 670)
- * 
                    
  * 
                    - * <element name="ActivationLimitUsages" type="{urn:liberty:ac:2003-08}ActivationLimitUsagesType"/>
+ * <element name="ActivationLimitUsages" type="{urn:liberty:ac:2003-08}ActivationLimitUsagesType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesType.java
index e705304668..5d80f63f5b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationLimitUsagesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for ActivationLimitUsagesType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 690)
- * 
                    
  * 
                    - * <complexType name="ActivationLimitUsagesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="number" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ActivationLimitUsagesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="number" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinElement.java
index d3563ba7a3..b03adfe158 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for ActivationPin element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 148)
- * 
                    
  * 
                    - * <element name="ActivationPin" type="{urn:liberty:ac:2003-08}ActivationPinType"/>
+ * <element name="ActivationPin" type="{urn:liberty:ac:2003-08}ActivationPinType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinType.java
index adfe69af4b..81fd412623 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ActivationPinType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for ActivationPinType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 611)
- * 
                    
  * 
                    - * <complexType name="ActivationPinType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Length" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Alphabet" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Generation" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}ActivationLimit" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ActivationPinType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Length" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Alphabet" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Generation" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}ActivationLimit" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetElement.java
index 33abcc48d8..7e7ecce804 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Alphabet element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 621)
- * 
                    
  * 
                    - * <element name="Alphabet" type="{urn:liberty:ac:2003-08}AlphabetType"/>
+ * <element name="Alphabet" type="{urn:liberty:ac:2003-08}AlphabetType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetType.java
index 2dd7b2c1b1..5ad6470fe5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AlphabetType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AlphabetType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 623)
- * 
                    
  * 
                    - * <complexType name="AlphabetType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="case" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="excludedChars" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="requiredChars" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AlphabetType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="case" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="excludedChars" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="requiredChars" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionElement.java
index cb2883a2a7..87204b7884 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for AsymmetricDecryption element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 321)
- * 
                    
  * 
                    - * <element name="AsymmetricDecryption">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="AsymmetricDecryption">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionType.java
index ce71ecdded..c8bce6e749 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricDecryptionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 327)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementElement.java
index 67eab324f0..258a93720b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for AsymmetricKeyAgreement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 334)
- * 
                    
  * 
                    - * <element name="AsymmetricKeyAgreement">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="AsymmetricKeyAgreement">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementType.java
index 354807a13f..6ed1eed595 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AsymmetricKeyAgreementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 340)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityElement.java
index 71f493b1eb..5d88679af2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for AuthenticatingAuthority element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 472)
- * 
                    
  * 
                    - * <element name="AuthenticatingAuthority" type="{urn:liberty:ac:2003-08}AuthenticatingAuthorityType"/>
+ * <element name="AuthenticatingAuthority" type="{urn:liberty:ac:2003-08}AuthenticatingAuthorityType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityType.java
index cc5a1175ee..5c7d652210 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatingAuthorityType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for AuthenticatingAuthorityType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 508)
- * 
                    
  * 
                    - * <complexType name="AuthenticatingAuthorityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}GoverningAgreements"/>
- *       </sequence>
- *       <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticatingAuthorityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}GoverningAgreements"/>
+ *       </sequence>
+ *       <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementElement.java
index 68b38d8428..7039e7fa5a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -16,9 +17,8 @@
  * 
  * Java content class for AuthenticationContextStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 51)
- * 
                    
  * 
                    - * <element name="AuthenticationContextStatement" type="{urn:liberty:ac:2003-08}AuthenticationContextStatementType"/>
+ * <element name="AuthenticationContextStatement" type="{urn:liberty:ac:2003-08}AuthenticationContextStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementType.java
index fb0de2076f..fdd86ad9c0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationContextStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for AuthenticationContextStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 543)
- * 
                    
  * 
                    - * <complexType name="AuthenticationContextStatementType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Identification" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}TechnicalProtection" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}OperationalProtection" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}AuthenticationMethod" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}GoverningAgreements" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}AuthenticatingAuthority" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticationContextStatementType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Identification" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}TechnicalProtection" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}OperationalProtection" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}AuthenticationMethod" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}GoverningAgreements" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}AuthenticatingAuthority" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodElement.java
index 3995f6bc0b..cc34e8f803 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for AuthenticationMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 224)
- * 
                    
  * 
                    - * <element name="AuthenticationMethod" type="{urn:liberty:ac:2003-08}AuthenticationMethodType"/>
+ * <element name="AuthenticationMethod" type="{urn:liberty:ac:2003-08}AuthenticationMethodType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodType.java
index aa9b44a297..24b8e6da9d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticationMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for AuthenticationMethodType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 535)
- * 
                    
  * 
                    - * <complexType name="AuthenticationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}PrincipalAuthenticationMechanism" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Authenticator" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}AuthenticatorTransportProtocol" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticationMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}PrincipalAuthenticationMechanism" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Authenticator" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}AuthenticatorTransportProtocol" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorElement.java
index ba7cd7c112..3ff6b4a685 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Authenticator element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 238)
- * 
                    
  * 
                    - * <element name="Authenticator" type="{urn:liberty:ac:2003-08}AuthenticatorType"/>
+ * <element name="Authenticator" type="{urn:liberty:ac:2003-08}AuthenticatorType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolElement.java
index 741f6d5549..21d84b74d8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for AuthenticatorTransportProtocol element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 360)
- * 
                    
  * 
                    - * <element name="AuthenticatorTransportProtocol" type="{urn:liberty:ac:2003-08}AuthenticatorTransportProtocolType"/>
+ * <element name="AuthenticatorTransportProtocol" type="{urn:liberty:ac:2003-08}AuthenticatorTransportProtocolType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolType.java
index 40ce80fda1..a8d09267e8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorTransportProtocolType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for AuthenticatorTransportProtocolType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 514)
- * 
                    
  * 
                    - * <complexType name="AuthenticatorTransportProtocolType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{urn:liberty:ac:2003-08}HTTP"/>
- *         <element ref="{urn:liberty:ac:2003-08}SSL"/>
- *         <element ref="{urn:liberty:ac:2003-08}MobileNetworkNoEncryption"/>
- *         <element ref="{urn:liberty:ac:2003-08}MobileNetworkRadioEncryption"/>
- *         <element ref="{urn:liberty:ac:2003-08}MobileNetworkEndToEndEncryption"/>
- *         <element ref="{urn:liberty:ac:2003-08}WTLS"/>
- *         <element ref="{urn:liberty:ac:2003-08}IPSec"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticatorTransportProtocolType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{urn:liberty:ac:2003-08}HTTP"/>
+ *         <element ref="{urn:liberty:ac:2003-08}SSL"/>
+ *         <element ref="{urn:liberty:ac:2003-08}MobileNetworkNoEncryption"/>
+ *         <element ref="{urn:liberty:ac:2003-08}MobileNetworkRadioEncryption"/>
+ *         <element ref="{urn:liberty:ac:2003-08}MobileNetworkEndToEndEncryption"/>
+ *         <element ref="{urn:liberty:ac:2003-08}WTLS"/>
+ *         <element ref="{urn:liberty:ac:2003-08}IPSec"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorType.java
index 8e4c03ed4d..e0d9e13077 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/AuthenticatorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for AuthenticatorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 569)
- * 
                    
  * 
                    - * <complexType name="AuthenticatorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{urn:liberty:ac:2003-08}PreviousSession"/>
- *         <element ref="{urn:liberty:ac:2003-08}ResumeSession"/>
- *         <element ref="{urn:liberty:ac:2003-08}DigSig"/>
- *         <element ref="{urn:liberty:ac:2003-08}Password"/>
- *         <element ref="{urn:liberty:ac:2003-08}ZeroKnowledge"/>
- *         <element ref="{urn:liberty:ac:2003-08}SharedSecretChallengeResponse"/>
- *         <element ref="{urn:liberty:ac:2003-08}SharedSecretDynamicPlaintext"/>
- *         <element ref="{urn:liberty:ac:2003-08}IPAddress"/>
- *         <element ref="{urn:liberty:ac:2003-08}AsymmetricDecryption"/>
- *         <element ref="{urn:liberty:ac:2003-08}AsymmetricKeyAgreement"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticatorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{urn:liberty:ac:2003-08}PreviousSession"/>
+ *         <element ref="{urn:liberty:ac:2003-08}ResumeSession"/>
+ *         <element ref="{urn:liberty:ac:2003-08}DigSig"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Password"/>
+ *         <element ref="{urn:liberty:ac:2003-08}ZeroKnowledge"/>
+ *         <element ref="{urn:liberty:ac:2003-08}SharedSecretChallengeResponse"/>
+ *         <element ref="{urn:liberty:ac:2003-08}SharedSecretDynamicPlaintext"/>
+ *         <element ref="{urn:liberty:ac:2003-08}IPAddress"/>
+ *         <element ref="{urn:liberty:ac:2003-08}AsymmetricDecryption"/>
+ *         <element ref="{urn:liberty:ac:2003-08}AsymmetricKeyAgreement"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterElement.java
index c5c860c5de..e688394692 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for DeactivationCallCenter element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 457)
- * 
                    
  * 
                    - * <element name="DeactivationCallCenter">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="DeactivationCallCenter">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterType.java
index 1940b168ea..eeb63357b1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DeactivationCallCenterType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 458)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigElement.java
index 51b3b4710e..34562b7808 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for DigSig element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 295)
- * 
                    
  * 
                    - * <element name="DigSig">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="DigSig">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigType.java
index 1e096cc6a5..9e30e6b24e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/DigSigType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 301)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/EmptyType.java
index 0fa206b0ef..be94a32b78 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type can be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 69)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionElement.java
index 8e9279b7da..3017432e9f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * For arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 77)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:ac:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:ac:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionType.java
index 09d2004487..ecc4303227 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * For arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 82)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationElement.java
index 59b849e455..5c8e0d48d2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -19,24 +20,23 @@
  * 
  * Java content class for Generation element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 202)
- * 
                    
  * 
                    - * <element name="Generation">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <attribute name="mechanism" use="required">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *               <enumeration value="principalchosen"/>
- *               <enumeration value="automatic"/>
- *             </restriction>
- *           </simpleType>
- *         </attribute>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="Generation">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <attribute name="mechanism" use="required">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *               <enumeration value="principalchosen"/>
+ *               <enumeration value="automatic"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </attribute>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationType.java
index aea6bd4f57..05e93f1401 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GenerationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 213)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="mechanism" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             <enumeration value="principalchosen"/>
- *             <enumeration value="automatic"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="mechanism" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             <enumeration value="principalchosen"/>
+ *             <enumeration value="automatic"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefElement.java
index 313d3623d8..c8730dd9a4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for GoverningAgreementRef element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 471)
- * 
                    
  * 
                    - * <element name="GoverningAgreementRef" type="{urn:liberty:ac:2003-08}GoverningAgreementRefType"/>
+ * <element name="GoverningAgreementRef" type="{urn:liberty:ac:2003-08}GoverningAgreementRefType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefType.java
index a2bac597e6..ed6d3d9988 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementRefType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for GoverningAgreementRefType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 505)
- * 
                    
  * 
                    - * <complexType name="GoverningAgreementRefType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="governingAgreementRef" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GoverningAgreementRefType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="governingAgreementRef" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsElement.java
index b4c5a51415..e9a3875eaa 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for GoverningAgreements element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 464)
- * 
                    
  * 
                    - * <element name="GoverningAgreements" type="{urn:liberty:ac:2003-08}GoverningAgreementsType"/>
+ * <element name="GoverningAgreements" type="{urn:liberty:ac:2003-08}GoverningAgreementsType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsType.java
index 2832c594d6..84353bfb11 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/GoverningAgreementsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for GoverningAgreementsType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 500)
- * 
                    
  * 
                    - * <complexType name="GoverningAgreementsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}GoverningAgreementRef" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GoverningAgreementsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}GoverningAgreementRef" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPElement.java
index 82f196c765..cdd4b9da5c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for HTTP element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 367)
- * 
                    
  * 
                    - * <element name="HTTP">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="HTTP">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPType.java
index 5a0031101c..1f25dd2477 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/HTTPType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 373)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressElement.java
index fba9555e5d..05037b3524 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for IPAddress element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 308)
- * 
                    
  * 
                    - * <element name="IPAddress">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="IPAddress">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressType.java
index f37f098dd5..1ddbc6bdfa 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPAddressType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 314)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecElement.java
index 0736128162..64ecbd8ba8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for IPSec element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 379)
- * 
                    
  * 
                    - * <element name="IPSec">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="IPSec">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecType.java
index 84cb28f20e..95a7f3895b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IPSecType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 385)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationElement.java
index 8863149666..28500b98b4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -16,9 +17,8 @@
  * 
  * Java content class for Identification element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 60)
- * 
                    
  * 
                    - * <element name="Identification" type="{urn:liberty:ac:2003-08}IdentificationType"/>
+ * <element name="Identification" type="{urn:liberty:ac:2003-08}IdentificationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationType.java
index 9550e9bdc9..024e71f576 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/IdentificationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,28 +13,27 @@
 /**
  * Java content class for IdentificationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 479)
- * 
                    
  * 
                    - * <complexType name="IdentificationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}PhysicalVerification" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}WrittenConsent" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="nym">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             <enumeration value="anonymity"/>
- *             <enumeration value="verinymity"/>
- *             <enumeration value="pseudonymity"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IdentificationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}PhysicalVerification" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}WrittenConsent" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="nym">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             <enumeration value="anonymity"/>
+ *             <enumeration value="verinymity"/>
+ *             <enumeration value="pseudonymity"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationElement.java
index d0b1e0ba28..aaa6389683 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * The actions that must be performed before the private key can be used.
  * Java content class for KeyActivation element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 118)
- * 
                    
  * 
                    - * <element name="KeyActivation" type="{urn:liberty:ac:2003-08}KeyActivationType"/>
+ * <element name="KeyActivation" type="{urn:liberty:ac:2003-08}KeyActivationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationType.java
index f7dd585ddc..85dd8c79f7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyActivationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for KeyActivationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 584)
- * 
                    
  * 
                    - * <complexType name="KeyActivationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{urn:liberty:ac:2003-08}ActivationPin"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyActivationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{urn:liberty:ac:2003-08}ActivationPin"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingElement.java
index 616e51bd98..9e912bdcc3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * Whether or not the private key is shared with the certificate authority.
  * Java content class for KeySharing element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 123)
- * 
                    
  * 
                    - * <element name="KeySharing" type="{urn:liberty:ac:2003-08}KeySharingType"/>
+ * <element name="KeySharing" type="{urn:liberty:ac:2003-08}KeySharingType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingType.java
index 7a8d0defcf..727881b3b5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeySharingType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for KeySharingType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 590)
- * 
                    
  * 
                    - * <complexType name="KeySharingType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="sharing" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeySharingType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="sharing" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageElement.java
index 13a48ae131..68a9262ab1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -19,9 +20,8 @@
  * 
  * Java content class for KeyStorage element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 128)
- * 
                    
  * 
                    - * <element name="KeyStorage" type="{urn:liberty:ac:2003-08}KeyStorageType"/>
+ * <element name="KeyStorage" type="{urn:liberty:ac:2003-08}KeyStorageType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageType.java
index 7942b931e6..7144ba0eaa 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/KeyStorageType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for KeyStorageType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 701)
- * 
                    
  * 
                    - * <complexType name="KeyStorageType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="medium" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             <enumeration value="memory"/>
- *             <enumeration value="smartcard"/>
- *             <enumeration value="token"/>
- *             <enumeration value="MobileDevice"/>
- *             <enumeration value="MobileAuthCard"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyStorageType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="medium" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             <enumeration value="memory"/>
+ *             <enumeration value="smartcard"/>
+ *             <enumeration value="token"/>
+ *             <enumeration value="MobileDevice"/>
+ *             <enumeration value="MobileAuthCard"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthElement.java
index 878571b2df..4e9f518e4d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -16,9 +17,8 @@
  * 
  * Java content class for Length element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 186)
- * 
                    
  * 
                    - * <element name="Length" type="{urn:liberty:ac:2003-08}LengthType"/>
+ * <element name="Length" type="{urn:liberty:ac:2003-08}LengthType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthType.java
index 575b972263..6c8a00e43b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/LengthType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for LengthType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 696)
- * 
                    
  * 
                    - * <complexType name="LengthType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="max" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="LengthType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="max" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionElement.java
index 13423748c1..366fb24895 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for MobileNetworkEndToEndEncryption element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 422)
- * 
                    
  * 
                    - * <element name="MobileNetworkEndToEndEncryption">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="MobileNetworkEndToEndEncryption">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionType.java
index 0dc0f3898c..15fd5d2a96 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkEndToEndEncryptionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 423)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionElement.java
index 4f7b8006fd..819441faba 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for MobileNetworkNoEncryption element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 403)
- * 
                    
  * 
                    - * <element name="MobileNetworkNoEncryption">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="MobileNetworkNoEncryption">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionType.java
index 3de8affff1..ef80845f0c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkNoEncryptionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 409)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionElement.java
index 09dbe10806..01f2ff02b8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for MobileNetworkRadioEncryption element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 415)
- * 
                    
  * 
                    - * <element name="MobileNetworkRadioEncryption">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="MobileNetworkRadioEncryption">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionType.java
index 3ac3fdc71b..b1e04d7e82 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/MobileNetworkRadioEncryptionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 416)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ObjectFactory.java
index b89ac38211..4d3706f7ef 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -204,7 +205,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -223,7 +224,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -242,7 +243,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -254,7 +255,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of PrincipalAuthenticationMechanismElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PrincipalAuthenticationMechanismElement createPrincipalAuthenticationMechanismElement()
@@ -266,7 +267,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PrincipalAuthenticationMechani
     /**
      * Create an instance of AuthenticatorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorType createAuthenticatorType()
@@ -278,7 +279,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorType createAuthen
     /**
      * Create an instance of ActivationLimitDurationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitDurationElement createActivationLimitDurationElement()
@@ -290,7 +291,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitDurationElement
     /**
      * Create an instance of AuthenticatorTransportProtocolType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorTransportProtocolType createAuthenticatorTransportProtocolType()
@@ -302,7 +303,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorTransportProtocol
     /**
      * Create an instance of AuthenticationMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationMethodType createAuthenticationMethodType()
@@ -314,7 +315,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationMethodType creat
     /**
      * Create an instance of KeyActivationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.KeyActivationElement createKeyActivationElement()
@@ -326,7 +327,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.KeyActivationElement createKey
     /**
      * Create an instance of MobileNetworkNoEncryptionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkNoEncryptionType createMobileNetworkNoEncryptionType()
@@ -338,7 +339,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkNoEncryptionType
     /**
      * Create an instance of SecurityAuditType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SecurityAuditType createSecurityAuditType()
@@ -350,7 +351,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SecurityAuditType createSecuri
     /**
      * Create an instance of KeyStorageType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.KeyStorageType createKeyStorageType()
@@ -362,7 +363,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.KeyStorageType createKeyStorag
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.StatusType createStatusType()
@@ -374,7 +375,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.StatusType createStatusType()
     /**
      * Create an instance of PrivateKeyProtectionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PrivateKeyProtectionElement createPrivateKeyProtectionElement()
@@ -386,7 +387,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PrivateKeyProtectionElement cr
     /**
      * Create an instance of IdentificationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.IdentificationElement createIdentificationElement()
@@ -398,7 +399,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.IdentificationElement createId
     /**
      * Create an instance of SharedSecretDynamicPlaintextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretDynamicPlaintextType createSharedSecretDynamicPlaintextType()
@@ -410,7 +411,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretDynamicPlaintextTy
     /**
      * Create an instance of AuthenticationMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationMethodElement createAuthenticationMethodElement()
@@ -422,7 +423,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationMethodElement cr
     /**
      * Create an instance of ResumeSessionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ResumeSessionType createResumeSessionType()
@@ -434,7 +435,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ResumeSessionType createResume
     /**
      * Create an instance of ActivationPinType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationPinType createActivationPinType()
@@ -446,7 +447,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationPinType createActiva
     /**
      * Create an instance of GoverningAgreementsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementsElement createGoverningAgreementsElement()
@@ -458,7 +459,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementsElement cre
     /**
      * Create an instance of ZeroKnowledgeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ZeroKnowledgeElement createZeroKnowledgeElement()
@@ -470,7 +471,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ZeroKnowledgeElement createZer
     /**
      * Create an instance of DigSigType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.DigSigType createDigSigType()
@@ -482,7 +483,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.DigSigType createDigSigType()
     /**
      * Create an instance of PreviousSessionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PreviousSessionElement createPreviousSessionElement()
@@ -494,7 +495,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PreviousSessionElement createP
     /**
      * Create an instance of TechnicalProtectionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.TechnicalProtectionType createTechnicalProtectionType()
@@ -506,7 +507,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.TechnicalProtectionType create
     /**
      * Create an instance of AsymmetricDecryptionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricDecryptionType createAsymmetricDecryptionType()
@@ -518,7 +519,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricDecryptionType creat
     /**
      * Create an instance of AsymmetricKeyAgreementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricKeyAgreementType createAsymmetricKeyAgreementType()
@@ -530,7 +531,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricKeyAgreementType cre
     /**
      * Create an instance of SSLElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SSLElement createSSLElement()
@@ -542,7 +543,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SSLElement createSSLElement()
     /**
      * Create an instance of WTLSType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.WTLSType createWTLSType()
@@ -554,7 +555,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.WTLSType createWTLSType()
     /**
      * Create an instance of WrittenConsentElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.WrittenConsentElement createWrittenConsentElement()
@@ -566,7 +567,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.WrittenConsentElement createWr
     /**
      * Create an instance of SmartcardType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SmartcardType createSmartcardType()
@@ -578,7 +579,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SmartcardType createSmartcardT
     /**
      * Create an instance of MobileNetworkNoEncryptionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkNoEncryptionElement createMobileNetworkNoEncryptionElement()
@@ -590,7 +591,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkNoEncryptionEleme
     /**
      * Create an instance of IdentificationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.IdentificationType createIdentificationType()
@@ -602,7 +603,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.IdentificationType createIdent
     /**
      * Create an instance of GenerationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.GenerationElement createGenerationElement()
@@ -614,7 +615,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.GenerationElement createGenera
     /**
      * Create an instance of LengthElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.LengthElement createLengthElement()
@@ -626,7 +627,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.LengthElement createLengthElem
     /**
      * Create an instance of PhysicalVerificationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PhysicalVerificationType createPhysicalVerificationType()
@@ -638,7 +639,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PhysicalVerificationType creat
     /**
      * Create an instance of GoverningAgreementRefType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementRefType createGoverningAgreementRefType()
@@ -650,7 +651,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementRefType crea
     /**
      * Create an instance of IPAddressType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.IPAddressType createIPAddressType()
@@ -662,7 +663,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.IPAddressType createIPAddressT
     /**
      * Create an instance of ActivationLimitSessionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitSessionElement createActivationLimitSessionElement()
@@ -674,7 +675,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitSessionElement
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.StatusElement createStatusElement()
@@ -686,7 +687,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.StatusElement createStatusElem
     /**
      * Create an instance of SecretKeyProtectionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SecretKeyProtectionElement createSecretKeyProtectionElement()
@@ -698,7 +699,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SecretKeyProtectionElement cre
     /**
      * Create an instance of IPAddressElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.IPAddressElement createIPAddressElement()
@@ -710,7 +711,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.IPAddressElement createIPAddre
     /**
      * Create an instance of IPSecType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.IPSecType createIPSecType()
@@ -722,7 +723,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.IPSecType createIPSecType()
     /**
      * Create an instance of ActivationPinElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationPinElement createActivationPinElement()
@@ -734,7 +735,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationPinElement createAct
     /**
      * Create an instance of ActivationLimitElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitElement createActivationLimitElement()
@@ -746,7 +747,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitElement createA
     /**
      * Create an instance of TokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.TokenElement createTokenElement()
@@ -758,7 +759,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.TokenElement createTokenElemen
     /**
      * Create an instance of ActivationLimitUsagesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitUsagesElement createActivationLimitUsagesElement()
@@ -770,7 +771,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitUsagesElement c
     /**
      * Create an instance of PasswordType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PasswordType createPasswordType()
@@ -782,7 +783,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PasswordType createPasswordTyp
     /**
      * Create an instance of WTLSElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.WTLSElement createWTLSElement()
@@ -794,7 +795,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.WTLSElement createWTLSElement(
     /**
      * Create an instance of TimeSyncTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.TimeSyncTokenType createTimeSyncTokenType()
@@ -806,7 +807,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.TimeSyncTokenType createTimeSy
     /**
      * Create an instance of IPSecElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.IPSecElement createIPSecElement()
@@ -818,7 +819,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.IPSecElement createIPSecElemen
     /**
      * Create an instance of ResumeSessionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ResumeSessionElement createResumeSessionElement()
@@ -830,7 +831,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ResumeSessionElement createRes
     /**
      * Create an instance of MobileNetworkEndToEndEncryptionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkEndToEndEncryptionElement createMobileNetworkEndToEndEncryptionElement()
@@ -842,7 +843,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkEndToEndEncryptio
     /**
      * Create an instance of SecurityAuditElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SecurityAuditElement createSecurityAuditElement()
@@ -854,7 +855,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SecurityAuditElement createSec
     /**
      * Create an instance of AuthenticationContextStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationContextStatementType createAuthenticationContextStatementType()
@@ -866,7 +867,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationContextStatement
     /**
      * Create an instance of OperationalProtectionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.OperationalProtectionElement createOperationalProtectionElement()
@@ -878,7 +879,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.OperationalProtectionElement c
     /**
      * Create an instance of AuthenticationContextStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationContextStatementElement createAuthenticationContextStatementElement()
@@ -890,7 +891,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticationContextStatement
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ExtensionElement createExtensionElement()
@@ -902,7 +903,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ExtensionElement createExtensi
     /**
      * Create an instance of AuthenticatorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorElement createAuthenticatorElement()
@@ -914,7 +915,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorElement createAut
     /**
      * Create an instance of SecretKeyProtectionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SecretKeyProtectionType createSecretKeyProtectionType()
@@ -926,7 +927,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SecretKeyProtectionType create
     /**
      * Create an instance of AuthenticatingAuthorityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatingAuthorityElement createAuthenticatingAuthorityElement()
@@ -938,7 +939,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatingAuthorityElement
     /**
      * Create an instance of ActivationLimitSessionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitSessionType createActivationLimitSessionType()
@@ -950,7 +951,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitSessionType cre
     /**
      * Create an instance of KeyStorageElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.KeyStorageElement createKeyStorageElement()
@@ -962,7 +963,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.KeyStorageElement createKeySto
     /**
      * Create an instance of TechnicalProtectionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.TechnicalProtectionElement createTechnicalProtectionElement()
@@ -974,7 +975,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.TechnicalProtectionElement cre
     /**
      * Create an instance of ActivationLimitDurationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitDurationType createActivationLimitDurationType()
@@ -986,7 +987,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitDurationType cr
     /**
      * Create an instance of KeySharingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.KeySharingElement createKeySharingElement()
@@ -998,7 +999,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.KeySharingElement createKeySha
     /**
      * Create an instance of MobileNetworkEndToEndEncryptionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkEndToEndEncryptionType createMobileNetworkEndToEndEncryptionType()
@@ -1010,7 +1011,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkEndToEndEncryptio
     /**
      * Create an instance of DeactivationCallCenterType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.DeactivationCallCenterType createDeactivationCallCenterType()
@@ -1022,7 +1023,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.DeactivationCallCenterType cre
     /**
      * Create an instance of SmartcardElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SmartcardElement createSmartcardElement()
@@ -1034,7 +1035,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SmartcardElement createSmartca
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.EmptyType createEmptyType()
@@ -1046,7 +1047,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.EmptyType createEmptyType()
     /**
      * Create an instance of TimeSyncTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.TimeSyncTokenElement createTimeSyncTokenElement()
@@ -1058,7 +1059,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.TimeSyncTokenElement createTim
     /**
      * Create an instance of KeyActivationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.KeyActivationType createKeyActivationType()
@@ -1070,7 +1071,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.KeyActivationType createKeyAct
     /**
      * Create an instance of ActivationLimitType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitType createActivationLimitType()
@@ -1082,7 +1083,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitType createActi
     /**
      * Create an instance of PasswordElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PasswordElement createPasswordElement()
@@ -1094,7 +1095,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PasswordElement createPassword
     /**
      * Create an instance of KeySharingType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.KeySharingType createKeySharingType()
@@ -1106,7 +1107,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.KeySharingType createKeySharin
     /**
      * Create an instance of GoverningAgreementsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementsType createGoverningAgreementsType()
@@ -1118,7 +1119,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementsType create
     /**
      * Create an instance of SwitchAuditType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SwitchAuditType createSwitchAuditType()
@@ -1130,7 +1131,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SwitchAuditType createSwitchAu
     /**
      * Create an instance of TokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.TokenType createTokenType()
@@ -1142,7 +1143,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.TokenType createTokenType()
     /**
      * Create an instance of GenerationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.GenerationType createGenerationType()
@@ -1154,7 +1155,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.GenerationType createGeneratio
     /**
      * Create an instance of OperationalProtectionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.OperationalProtectionType createOperationalProtectionType()
@@ -1166,7 +1167,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.OperationalProtectionType crea
     /**
      * Create an instance of PhysicalVerificationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PhysicalVerificationElement createPhysicalVerificationElement()
@@ -1178,7 +1179,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PhysicalVerificationElement cr
     /**
      * Create an instance of AlphabetElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AlphabetElement createAlphabetElement()
@@ -1190,7 +1191,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AlphabetElement createAlphabet
     /**
      * Create an instance of MobileNetworkRadioEncryptionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkRadioEncryptionType createMobileNetworkRadioEncryptionType()
@@ -1202,7 +1203,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkRadioEncryptionTy
     /**
      * Create an instance of HTTPElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.HTTPElement createHTTPElement()
@@ -1214,7 +1215,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.HTTPElement createHTTPElement(
     /**
      * Create an instance of AsymmetricDecryptionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricDecryptionElement createAsymmetricDecryptionElement()
@@ -1226,7 +1227,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricDecryptionElement cr
     /**
      * Create an instance of ZeroKnowledgeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ZeroKnowledgeType createZeroKnowledgeType()
@@ -1238,7 +1239,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ZeroKnowledgeType createZeroKn
     /**
      * Create an instance of SharedSecretChallengeResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretChallengeResponseElement createSharedSecretChallengeResponseElement()
@@ -1250,7 +1251,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretChallengeResponseE
     /**
      * Create an instance of AlphabetType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AlphabetType createAlphabetType()
@@ -1262,7 +1263,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AlphabetType createAlphabetTyp
     /**
      * Create an instance of PrivateKeyProtectionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PrivateKeyProtectionType createPrivateKeyProtectionType()
@@ -1274,7 +1275,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PrivateKeyProtectionType creat
     /**
      * Create an instance of LengthType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.LengthType createLengthType()
@@ -1286,7 +1287,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.LengthType createLengthType()
     /**
      * Create an instance of MobileNetworkRadioEncryptionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkRadioEncryptionElement createMobileNetworkRadioEncryptionElement()
@@ -1298,7 +1299,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.MobileNetworkRadioEncryptionEl
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ExtensionType createExtensionType()
@@ -1310,7 +1311,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ExtensionType createExtensionT
     /**
      * Create an instance of SharedSecretDynamicPlaintextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretDynamicPlaintextElement createSharedSecretDynamicPlaintextElement()
@@ -1322,7 +1323,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretDynamicPlaintextEl
     /**
      * Create an instance of SharedSecretChallengeResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretChallengeResponseType createSharedSecretChallengeResponseType()
@@ -1334,7 +1335,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SharedSecretChallengeResponseT
     /**
      * Create an instance of ActivationLimitUsagesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitUsagesType createActivationLimitUsagesType()
@@ -1346,7 +1347,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.ActivationLimitUsagesType crea
     /**
      * Create an instance of WrittenConsentType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.WrittenConsentType createWrittenConsentType()
@@ -1358,7 +1359,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.WrittenConsentType createWritt
     /**
      * Create an instance of AsymmetricKeyAgreementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricKeyAgreementElement createAsymmetricKeyAgreementElement()
@@ -1370,7 +1371,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AsymmetricKeyAgreementElement
     /**
      * Create an instance of GoverningAgreementRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementRefElement createGoverningAgreementRefElement()
@@ -1382,7 +1383,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.GoverningAgreementRefElement c
     /**
      * Create an instance of SSLType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SSLType createSSLType()
@@ -1394,7 +1395,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.SSLType createSSLType()
     /**
      * Create an instance of DigSigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.DigSigElement createDigSigElement()
@@ -1406,7 +1407,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.DigSigElement createDigSigElem
     /**
      * Create an instance of PreviousSessionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PreviousSessionType createPreviousSessionType()
@@ -1418,7 +1419,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PreviousSessionType createPrev
     /**
      * Create an instance of AuthenticatorTransportProtocolElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorTransportProtocolElement createAuthenticatorTransportProtocolElement()
@@ -1430,7 +1431,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatorTransportProtocol
     /**
      * Create an instance of HTTPType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.HTTPType createHTTPType()
@@ -1442,7 +1443,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.HTTPType createHTTPType()
     /**
      * Create an instance of AuthenticatingAuthorityType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatingAuthorityType createAuthenticatingAuthorityType()
@@ -1454,7 +1455,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.AuthenticatingAuthorityType cr
     /**
      * Create an instance of PrincipalAuthenticationMechanismType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.PrincipalAuthenticationMechanismType createPrincipalAuthenticationMechanismType()
@@ -1466,7 +1467,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.PrincipalAuthenticationMechani
     /**
      * Create an instance of DeactivationCallCenterElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.DeactivationCallCenterElement createDeactivationCallCenterElement()
@@ -1478,7 +1479,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ac.DeactivationCallCenterElement
     /**
      * Create an instance of SwitchAuditElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ac.SwitchAuditElement createSwitchAuditElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionElement.java
index ee9e23495e..0b328e7e44 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for OperationalProtection element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 442)
- * 
                    
  * 
                    - * <element name="OperationalProtection" type="{urn:liberty:ac:2003-08}OperationalProtectionType"/>
+ * <element name="OperationalProtection" type="{urn:liberty:ac:2003-08}OperationalProtectionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionType.java
index 67e2257213..5ebacd1a4b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/OperationalProtectionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for OperationalProtectionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 562)
- * 
                    
  * 
                    - * <complexType name="OperationalProtectionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}SecurityAudit" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}DeactivationCallCenter" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OperationalProtectionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}SecurityAudit" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}DeactivationCallCenter" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordElement.java
index 538a1902a3..5c3283ec21 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -15,9 +16,8 @@
  * 
  * Java content class for Password element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 140)
- * 
                    
  * 
                    - * <element name="Password" type="{urn:liberty:ac:2003-08}PasswordType"/>
+ * <element name="Password" type="{urn:liberty:ac:2003-08}PasswordType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordType.java
index a2a419394f..059919e2b5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PasswordType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for PasswordType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 602)
- * 
                    
  * 
                    - * <complexType name="PasswordType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Length" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Alphabet" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Generation" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PasswordType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Length" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Alphabet" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Generation" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationElement.java
index 702991467d..401d8ddca3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -15,24 +16,23 @@
  * 
  * Java content class for PhysicalVerification element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 69)
- * 
                    
  * 
                    - * <element name="PhysicalVerification">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <attribute name="credentialLevel">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *               <enumeration value="primary"/>
- *               <enumeration value="secondary"/>
- *             </restriction>
- *           </simpleType>
- *         </attribute>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="PhysicalVerification">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <attribute name="credentialLevel">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *               <enumeration value="primary"/>
+ *               <enumeration value="secondary"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </attribute>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationType.java
index e4b7355f6a..f468d0e7c4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PhysicalVerificationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 76)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="credentialLevel">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             <enumeration value="primary"/>
- *             <enumeration value="secondary"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="credentialLevel">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             <enumeration value="primary"/>
+ *             <enumeration value="secondary"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionElement.java
index fc128dc286..688ccfdd80 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for PreviousSession element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 245)
- * 
                    
  * 
                    - * <element name="PreviousSession">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="PreviousSession">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionType.java
index 2d1686e7b2..c584d1aeb3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PreviousSessionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 251)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismElement.java
index c352866beb..2199b3788d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for PrincipalAuthenticationMechanism element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 231)
- * 
                    
  * 
                    - * <element name="PrincipalAuthenticationMechanism" type="{urn:liberty:ac:2003-08}PrincipalAuthenticationMechanismType"/>
+ * <element name="PrincipalAuthenticationMechanism" type="{urn:liberty:ac:2003-08}PrincipalAuthenticationMechanismType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismType.java
index 5d8dd5b53a..a643689efd 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrincipalAuthenticationMechanismType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for PrincipalAuthenticationMechanismType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 526)
- * 
                    
  * 
                    - * <complexType name="PrincipalAuthenticationMechanismType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{urn:liberty:ac:2003-08}Password"/>
- *         <element ref="{urn:liberty:ac:2003-08}Token"/>
- *         <element ref="{urn:liberty:ac:2003-08}Smartcard"/>
- *         <element ref="{urn:liberty:ac:2003-08}ActivationPin"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PrincipalAuthenticationMechanismType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{urn:liberty:ac:2003-08}Password"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Token"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Smartcard"/>
+ *         <element ref="{urn:liberty:ac:2003-08}ActivationPin"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionElement.java
index 60ba68f0f7..6c38e88078 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -15,9 +16,8 @@
  * 
  * Java content class for PrivateKeyProtection element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 110)
- * 
                    
  * 
                    - * <element name="PrivateKeyProtection" type="{urn:liberty:ac:2003-08}PrivateKeyProtectionType"/>
+ * <element name="PrivateKeyProtection" type="{urn:liberty:ac:2003-08}PrivateKeyProtectionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionType.java
index cf26470fae..cdbbf07291 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/PrivateKeyProtectionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for PrivateKeyProtectionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 593)
- * 
                    
  * 
                    - * <complexType name="PrivateKeyProtectionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}KeyActivation" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}KeyStorage" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}KeySharing" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PrivateKeyProtectionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}KeyActivation" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}KeyStorage" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}KeySharing" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionElement.java
index 4c7f54f41f..cdeb659f89 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for ResumeSession element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 258)
- * 
                    
  * 
                    - * <element name="ResumeSession">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="ResumeSession">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionType.java
index bc237262e7..8cb93a94d6 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ResumeSessionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 264)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLElement.java
index 393ac37d43..73a8554d87 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for SSL element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 430)
- * 
                    
  * 
                    - * <element name="SSL">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="SSL">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLType.java
index c776c256a4..9b9422d026 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SSLType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 436)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionElement.java
index cf1ffbd58d..94dccee9f5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -15,9 +16,8 @@
  * 
  * Java content class for SecretKeyProtection element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 102)
- * 
                    
  * 
                    - * <element name="SecretKeyProtection" type="{urn:liberty:ac:2003-08}SecretKeyProtectionType"/>
+ * <element name="SecretKeyProtection" type="{urn:liberty:ac:2003-08}SecretKeyProtectionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionType.java
index 3dc40c52ba..5050df8eb3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecretKeyProtectionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SecretKeyProtectionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 714)
- * 
                    
  * 
                    - * <complexType name="SecretKeyProtectionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}KeyActivation" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}KeyStorage" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecretKeyProtectionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}KeyActivation" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}KeyStorage" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditElement.java
index 1cf8356589..f898127f58 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SecurityAudit element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 449)
- * 
                    
  * 
                    - * <element name="SecurityAudit" type="{urn:liberty:ac:2003-08}SecurityAuditType"/>
+ * <element name="SecurityAudit" type="{urn:liberty:ac:2003-08}SecurityAuditType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditType.java
index 10cd7983bf..b65568e4fa 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SecurityAuditType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SecurityAuditType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 721)
- * 
                    
  * 
                    - * <complexType name="SecurityAuditType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}SwitchAudit" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecurityAuditType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}SwitchAudit" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseElement.java
index c269831efb..79df41a834 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for SharedSecretChallengeResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 283)
- * 
                    
  * 
                    - * <element name="SharedSecretChallengeResponse">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="SharedSecretChallengeResponse">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseType.java
index db5ce1f3cb..6230c413d1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretChallengeResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 289)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextElement.java
index 1241df8d45..17228d39c9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for SharedSecretDynamicPlaintext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 347)
- * 
                    
  * 
                    - * <element name="SharedSecretDynamicPlaintext">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="SharedSecretDynamicPlaintext">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextType.java
index 05d418f773..30624c80cc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SharedSecretDynamicPlaintextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 353)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardElement.java
index 39000003b7..b9ca21724a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for Smartcard element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 174)
- * 
                    
  * 
                    - * <element name="Smartcard">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="Smartcard">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardType.java
index aec71dde02..db269a8461 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SmartcardType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 180)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusElement.java
index 3437fad15e..d1d1d76133 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 53)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:ac:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:ac:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusType.java
index a72a5498e1..d63a9ed4a5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that can be used for status codes
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 58)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Status" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Status" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditElement.java
index 182dce4151..b09248bcc8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SwitchAudit element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 450)
- * 
                    
  * 
                    - * <element name="SwitchAudit">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="SwitchAudit">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditType.java
index 80756b964c..854c7d5ba4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/SwitchAuditType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 451)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionElement.java
index edb2e1717b..4560cd29e4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -15,9 +16,8 @@
  * 
  * Java content class for TechnicalProtection element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 94)
- * 
                    
  * 
                    - * <element name="TechnicalProtection" type="{urn:liberty:ac:2003-08}TechnicalProtectionType"/>
+ * <element name="TechnicalProtection" type="{urn:liberty:ac:2003-08}TechnicalProtectionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionType.java
index 52ec344dc7..5eb74e66a2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TechnicalProtectionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for TechnicalProtectionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 555)
- * 
                    
  * 
                    - * <complexType name="TechnicalProtectionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{urn:liberty:ac:2003-08}PrivateKeyProtection" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}SecretKeyProtection" minOccurs="0"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TechnicalProtectionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{urn:liberty:ac:2003-08}PrivateKeyProtection" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}SecretKeyProtection" minOccurs="0"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenElement.java
index d7653012b3..cbcd50d0e3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -18,9 +19,8 @@
  * 
  * Java content class for TimeSyncToken element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 163)
- * 
                    
  * 
                    - * <element name="TimeSyncToken" type="{urn:liberty:ac:2003-08}TimeSyncTokenType"/>
+ * <element name="TimeSyncToken" type="{urn:liberty:ac:2003-08}TimeSyncTokenType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenType.java
index 3e24aa6c34..120ac24f33 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TimeSyncTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,31 +13,30 @@
 /**
  * Java content class for TimeSyncTokenType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 635)
- * 
                    
  * 
                    - * <complexType name="TimeSyncTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="DeviceInHand" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             <enumeration value="true"/>
- *             <enumeration value="false"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="DeviceType" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             <enumeration value="hardware"/>
- *             <enumeration value="software"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="SeedLength" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TimeSyncTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="DeviceInHand" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             <enumeration value="true"/>
+ *             <enumeration value="false"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="DeviceType" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             <enumeration value="hardware"/>
+ *             <enumeration value="software"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="SeedLength" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenElement.java
index 81d5e8feae..280967f105 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -15,9 +16,8 @@
  * 
  * Java content class for Token element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 155)
- * 
                    
  * 
                    - * <element name="Token" type="{urn:liberty:ac:2003-08}TokenType"/>
+ * <element name="Token" type="{urn:liberty:ac:2003-08}TokenType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenType.java
index 684dbe15ba..550bf978a3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/TokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for TokenType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 629)
- * 
                    
  * 
                    - * <complexType name="TokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}TimeSyncToken"/>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}TimeSyncToken"/>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSElement.java
index 18ac755db9..5bdf7c7ee5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for WTLS element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 391)
- * 
                    
  * 
                    - * <element name="WTLS">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="WTLS">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSType.java
index 25c31b04af..07b7dff367 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WTLSType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 397)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentElement.java
index fba8bf2ee7..13c590962b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for WrittenConsent element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 87)
- * 
                    
  * 
                    - * <element name="WrittenConsent">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="WrittenConsent">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentType.java
index 3f44dfe465..549379c2c7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/WrittenConsentType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 88)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeElement.java
index 090b5c77a4..4c88ef604a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,19 +15,18 @@
  * 
  * Java content class for ZeroKnowledge element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 271)
- * 
                    
  * 
                    - * <element name="ZeroKnowledge">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="ZeroKnowledge">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeType.java
index 30a4c473bf..45212d5d6f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ac/ZeroKnowledgeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-authentication-context.xsd line 277)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:ac:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionElement.java
index f9a2dd6dbb..954b2a0252 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Action element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 189)
- * 
                    
  * 
                    - * <element name="Action" type="{urn:oasis:names:tc:SAML:1.0:assertion}ActionType"/>
+ * <element name="Action" type="{urn:oasis:names:tc:SAML:1.0:assertion}ActionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionType.java
index 8274068d2e..b7eb77aa17 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ActionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for ActionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 190)
- * 
                    
  * 
                    - * <complexType name="ActionType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="Namespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ActionType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="Namespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceElement.java
index a6f00df464..cdd74efdad 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Advice element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 103)
- * 
                    
  * 
                    - * <element name="Advice" type="{urn:oasis:names:tc:SAML:1.0:assertion}AdviceType"/>
+ * <element name="Advice" type="{urn:oasis:names:tc:SAML:1.0:assertion}AdviceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceType.java
index 493d1c83f8..d362b5d8b8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AdviceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for AdviceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 104)
- * 
                    
  * 
                    - * <complexType name="AdviceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
- *         <any/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AdviceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
+ *         <any/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionElement.java
index a1636dbe7d..2afa06bc0d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Assertion element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 54)
- * 
                    
  * 
                    - * <element name="Assertion" type="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionType"/>
+ * <element name="Assertion" type="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionIDReferenceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionIDReferenceElement.java
index 213e6cde09..dd042a0414 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionIDReferenceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionIDReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AssertionIDReference element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 53)
- * 
                    
  * 
                    - * <element name="AssertionIDReference" type="{http://www.w3.org/2001/XMLSchema}NCName"/>
+ * <element name="AssertionIDReference" type="{http://www.w3.org/2001/XMLSchema}NCName"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionType.java
index 2d63d85f6e..ff6c26dadb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AssertionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,31 +13,30 @@
 /**
  * Java content class for AssertionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 55)
- * 
                    
  * 
                    - * <complexType name="AssertionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Conditions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Advice" minOccurs="0"/>
- *         <choice maxOccurs="unbounded">
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Statement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorizationDecisionStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeStatement"/>
- *         </choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="AssertionID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="Issuer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AssertionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Conditions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Advice" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Statement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorizationDecisionStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeStatement"/>
+ *         </choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="AssertionID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="Issuer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorElement.java
index 3f3c569b55..1ae656fbb7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeDesignator element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 214)
- * 
                    
  * 
                    - * <element name="AttributeDesignator" type="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignatorType"/>
+ * <element name="AttributeDesignator" type="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignatorType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorType.java
index d30cf4f7ee..e2e08328de 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeDesignatorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for AttributeDesignatorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 215)
- * 
                    
  * 
                    - * <complexType name="AttributeDesignatorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="AttributeName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="AttributeNamespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeDesignatorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="AttributeName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="AttributeNamespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeElement.java
index 613fb7db00..dc47c0dcaf 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Attribute element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 219)
- * 
                    
  * 
                    - * <element name="Attribute" type="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeType"/>
+ * <element name="Attribute" type="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementElement.java
index 17236bd9e2..8d1eb9629a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 204)
- * 
                    
  * 
                    - * <element name="AttributeStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeStatementType"/>
+ * <element name="AttributeStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementType.java
index 9030524d6a..f82b33ccfe 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AttributeStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 205)
- * 
                    
  * 
                    - * <complexType name="AttributeStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Attribute" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Attribute" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeType.java
index 979a850251..9ad9d6e0ec 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AttributeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 220)
- * 
                    
  * 
                    - * <complexType name="AttributeType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignatorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeValue" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignatorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeValue" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeValueElement.java
index bf36ff296f..2037f98dd9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AttributeValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 229)
- * 
                    
  * 
                    - * <element name="AttributeValue" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ * <element name="AttributeValue" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceElement.java
index 2c55a29567..c422d07e78 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Audience element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 96)
- * 
                    
  * 
                    - * <element name="Audience" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="Audience" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionElement.java
index 122faaf562..2cf644c980 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AudienceRestrictionCondition element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 86)
- * 
                    
  * 
                    - * <element name="AudienceRestrictionCondition" type="{urn:oasis:names:tc:SAML:1.0:assertion}AudienceRestrictionConditionType"/>
+ * <element name="AudienceRestrictionCondition" type="{urn:oasis:names:tc:SAML:1.0:assertion}AudienceRestrictionConditionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionType.java
index eba7b3912a..f00c1b0bdf 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AudienceRestrictionConditionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AudienceRestrictionConditionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 87)
- * 
                    
  * 
                    - * <complexType name="AudienceRestrictionConditionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Audience" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AudienceRestrictionConditionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Audience" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementElement.java
index a3b74d9d8b..7cc7807909 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthenticationStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 152)
- * 
                    
  * 
                    - * <element name="AuthenticationStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatementType"/>
+ * <element name="AuthenticationStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementType.java
index a208db987f..1d773e33c4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthenticationStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for AuthenticationStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 153)
- * 
                    
  * 
                    - * <complexType name="AuthenticationStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectLocality" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBinding" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="AuthenticationInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="AuthenticationMethod" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticationStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectLocality" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBinding" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="AuthenticationInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="AuthenticationMethod" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingElement.java
index b8aef15389..833de2d383 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthorityBinding element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 170)
- * 
                    
  * 
                    - * <element name="AuthorityBinding" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBindingType"/>
+ * <element name="AuthorityBinding" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBindingType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingType.java
index 9c3425c688..507b46807c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorityBindingType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AuthorityBindingType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 171)
- * 
                    
  * 
                    - * <complexType name="AuthorityBindingType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="AuthorityKind" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthorityBindingType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="AuthorityKind" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementElement.java
index 45634a9194..3732db293c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthorizationDecisionStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 176)
- * 
                    
  * 
                    - * <element name="AuthorizationDecisionStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorizationDecisionStatementType"/>
+ * <element name="AuthorizationDecisionStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorizationDecisionStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementType.java
index eba990b022..cfe51e6831 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/AuthorizationDecisionStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for AuthorizationDecisionStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 177)
- * 
                    
  * 
                    - * <complexType name="AuthorizationDecisionStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Action" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Evidence" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:1.0:assertion}DecisionType" />
- *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthorizationDecisionStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Action" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Evidence" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:1.0:assertion}DecisionType" />
+ *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionAbstractType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionAbstractType.java
index 2d2d9ec23b..c54f3bb034 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionAbstractType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for ConditionAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 85)
- * 
                    
  * 
                    - * <complexType name="ConditionAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConditionAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionElement.java
index 7a75383d94..56f53033ac 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Condition element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 84)
- * 
                    
  * 
                    - * <element name="Condition" type="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType"/>
+ * <element name="Condition" type="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsElement.java
index 5b4dce030b..899cbc04b8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Conditions element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 74)
- * 
                    
  * 
                    - * <element name="Conditions" type="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionsType"/>
+ * <element name="Conditions" type="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionsType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsType.java
index a9b0186641..c9896bc124 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConditionsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for ConditionsType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 75)
- * 
                    
  * 
                    - * <complexType name="ConditionsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AudienceRestrictionCondition"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}DoNotCacheCondition"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Condition"/>
- *       </choice>
- *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConditionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AudienceRestrictionCondition"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}DoNotCacheCondition"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Condition"/>
+ *       </choice>
+ *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConfirmationMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConfirmationMethodElement.java
index 39698a40a1..969eee595b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConfirmationMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ConfirmationMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ConfirmationMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 151)
- * 
                    
  * 
                    - * <element name="ConfirmationMethod" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="ConfirmationMethod" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionElement.java
index b998e923c9..f1444b8a0e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DoNotCacheCondition element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 97)
- * 
                    
  * 
                    - * <element name="DoNotCacheCondition" type="{urn:oasis:names:tc:SAML:1.0:assertion}DoNotCacheConditionType"/>
+ * <element name="DoNotCacheCondition" type="{urn:oasis:names:tc:SAML:1.0:assertion}DoNotCacheConditionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionType.java
index a81cfb8bfd..3f81e61b9e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/DoNotCacheConditionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for DoNotCacheConditionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 98)
- * 
                    
  * 
                    - * <complexType name="DoNotCacheConditionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DoNotCacheConditionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceElement.java
index 4797ae9b76..cdbcab9972 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Evidence element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 197)
- * 
                    
  * 
                    - * <element name="Evidence" type="{urn:oasis:names:tc:SAML:1.0:assertion}EvidenceType"/>
+ * <element name="Evidence" type="{urn:oasis:names:tc:SAML:1.0:assertion}EvidenceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceType.java
index e2948810b4..ce58fefa4b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/EvidenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for EvidenceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 198)
- * 
                    
  * 
                    - * <complexType name="EvidenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EvidenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierElement.java
index 14edb57005..18107623a8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NameIdentifier element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 133)
- * 
                    
  * 
                    - * <element name="NameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
+ * <element name="NameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierType.java
index e9df257ec5..5cd570e95e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/NameIdentifierType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for NameIdentifierType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 134)
- * 
                    
  * 
                    - * <complexType name="NameIdentifierType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="NameQualifier" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="NameIdentifierType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="NameQualifier" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ObjectFactory.java
index 04c07cf311..2ae8307e14 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -120,7 +121,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -139,7 +140,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -158,7 +159,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -170,7 +171,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of AttributeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeElement createAttributeElement()
@@ -182,7 +183,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeElement create
     /**
      * Create an instance of ActionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ActionType createActionType()
@@ -194,7 +195,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ActionType createAction
     /**
      * Create an instance of ConfirmationMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ConfirmationMethodElement createConfirmationMethodElement()
@@ -206,7 +207,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ConfirmationMethodEleme
     /**
      * Create an instance of ConfirmationMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ConfirmationMethodElement createConfirmationMethodElement(java.lang.String value)
@@ -218,7 +219,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ConfirmationMethodEleme
     /**
      * Create an instance of StatementAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.StatementAbstractType createStatementAbstractType()
@@ -230,7 +231,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.StatementAbstractType c
     /**
      * Create an instance of ConditionsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionsType createConditionsType()
@@ -242,7 +243,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionsType createCo
     /**
      * Create an instance of AttributeDesignatorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeDesignatorElement createAttributeDesignatorElement()
@@ -254,7 +255,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeDesignatorElem
     /**
      * Create an instance of AdviceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AdviceElement createAdviceElement()
@@ -266,7 +267,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AdviceElement createAdv
     /**
      * Create an instance of SubjectConfirmationDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectConfirmationDataElement createSubjectConfirmationDataElement()
@@ -278,7 +279,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectConfirmationData
     /**
      * Create an instance of AttributeStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeStatementElement createAttributeStatementElement()
@@ -290,7 +291,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeStatementEleme
     /**
      * Create an instance of SubjectConfirmationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectConfirmationElement createSubjectConfirmationElement()
@@ -302,7 +303,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectConfirmationElem
     /**
      * Create an instance of AuthorizationDecisionStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorizationDecisionStatementElement createAuthorizationDecisionStatementElement()
@@ -314,7 +315,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorizationDecisionSt
     /**
      * Create an instance of DoNotCacheConditionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.DoNotCacheConditionElement createDoNotCacheConditionElement()
@@ -326,7 +327,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.DoNotCacheConditionElem
     /**
      * Create an instance of SubjectConfirmationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectConfirmationType createSubjectConfirmationType()
@@ -338,7 +339,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectConfirmationType
     /**
      * Create an instance of SubjectLocalityType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectLocalityType createSubjectLocalityType()
@@ -350,7 +351,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectLocalityType cre
     /**
      * Create an instance of AuthorityBindingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorityBindingElement createAuthorityBindingElement()
@@ -362,7 +363,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorityBindingElement
     /**
      * Create an instance of SubjectLocalityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectLocalityElement createSubjectLocalityElement()
@@ -374,7 +375,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectLocalityElement
     /**
      * Create an instance of AuthenticationStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthenticationStatementType createAuthenticationStatementType()
@@ -386,7 +387,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthenticationStatement
     /**
      * Create an instance of AttributeDesignatorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeDesignatorType createAttributeDesignatorType()
@@ -398,7 +399,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeDesignatorType
     /**
      * Create an instance of AudienceRestrictionConditionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceRestrictionConditionType createAudienceRestrictionConditionType()
@@ -410,7 +411,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceRestrictionCond
     /**
      * Create an instance of SubjectType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectType createSubjectType()
@@ -422,7 +423,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectType createSubje
     /**
      * Create an instance of SubjectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectElement createSubjectElement()
@@ -434,7 +435,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectElement createSu
     /**
      * Create an instance of EvidenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.EvidenceElement createEvidenceElement()
@@ -446,7 +447,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.EvidenceElement createE
     /**
      * Create an instance of ConditionAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionAbstractType createConditionAbstractType()
@@ -458,7 +459,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionAbstractType c
     /**
      * Create an instance of NameIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.NameIdentifierElement createNameIdentifierElement()
@@ -470,7 +471,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.NameIdentifierElement c
     /**
      * Create an instance of NameIdentifierType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.NameIdentifierType createNameIdentifierType()
@@ -482,7 +483,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.NameIdentifierType crea
     /**
      * Create an instance of AuthorizationDecisionStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorizationDecisionStatementType createAuthorizationDecisionStatementType()
@@ -494,7 +495,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorizationDecisionSt
     /**
      * Create an instance of EvidenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.EvidenceType createEvidenceType()
@@ -506,7 +507,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.EvidenceType createEvid
     /**
      * Create an instance of DoNotCacheConditionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.DoNotCacheConditionType createDoNotCacheConditionType()
@@ -518,7 +519,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.DoNotCacheConditionType
     /**
      * Create an instance of ConditionsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionsElement createConditionsElement()
@@ -530,7 +531,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionsElement creat
     /**
      * Create an instance of AttributeValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeValueElement createAttributeValueElement()
@@ -542,7 +543,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeValueElement c
     /**
      * Create an instance of AttributeStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeStatementType createAttributeStatementType()
@@ -554,7 +555,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeStatementType
     /**
      * Create an instance of AudienceRestrictionConditionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceRestrictionConditionElement createAudienceRestrictionConditionElement()
@@ -566,7 +567,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceRestrictionCond
     /**
      * Create an instance of SubjectStatementAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectStatementAbstractType createSubjectStatementAbstractType()
@@ -578,7 +579,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectStatementAbstrac
     /**
      * Create an instance of AudienceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceElement createAudienceElement()
@@ -590,7 +591,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceElement createA
     /**
      * Create an instance of AudienceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceElement createAudienceElement(java.lang.String value)
@@ -602,7 +603,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AudienceElement createA
     /**
      * Create an instance of AuthorityBindingType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorityBindingType createAuthorityBindingType()
@@ -614,7 +615,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthorityBindingType cr
     /**
      * Create an instance of AssertionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionElement createAssertionElement()
@@ -626,7 +627,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionElement create
     /**
      * Create an instance of AdviceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AdviceType createAdviceType()
@@ -638,7 +639,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AdviceType createAdvice
     /**
      * Create an instance of SubjectStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectStatementElement createSubjectStatementElement()
@@ -650,7 +651,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.SubjectStatementElement
     /**
      * Create an instance of AttributeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeType createAttributeType()
@@ -662,7 +663,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AttributeType createAtt
     /**
      * Create an instance of AssertionIDReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionIDReferenceElement createAssertionIDReferenceElement()
@@ -674,7 +675,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionIDReferenceEle
     /**
      * Create an instance of AssertionIDReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionIDReferenceElement createAssertionIDReferenceElement(java.lang.String value)
@@ -686,7 +687,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionIDReferenceEle
     /**
      * Create an instance of AuthenticationStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthenticationStatementElement createAuthenticationStatementElement()
@@ -698,7 +699,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AuthenticationStatement
     /**
      * Create an instance of ActionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ActionElement createActionElement()
@@ -710,7 +711,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ActionElement createAct
     /**
      * Create an instance of AssertionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionType createAssertionType()
@@ -722,7 +723,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.AssertionType createAss
     /**
      * Create an instance of ConditionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionElement createConditionElement()
@@ -734,7 +735,7 @@ public com.sun.identity.liberty.ws.common.jaxb.assertion.ConditionElement create
     /**
      * Create an instance of StatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.assertion.StatementElement createStatementElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementAbstractType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementAbstractType.java
index e48002cd8e..38c703fbcd 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementAbstractType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for StatementAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 112)
- * 
                    
  * 
                    - * <complexType name="StatementAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatementAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementElement.java
index b68edb8aa8..f70947c27f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/StatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Statement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 111)
- * 
                    
  * 
                    - * <element name="Statement" type="{urn:oasis:names:tc:SAML:1.0:assertion}StatementAbstractType"/>
+ * <element name="Statement" type="{urn:oasis:names:tc:SAML:1.0:assertion}StatementAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationDataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationDataElement.java
index 0c7e31e390..bfabce36eb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationDataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectConfirmationData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 150)
- * 
                    
  * 
                    - * <element name="SubjectConfirmationData" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ * <element name="SubjectConfirmationData" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationElement.java
index 1aef0c0729..263c0ec557 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectConfirmation element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 142)
- * 
                    
  * 
                    - * <element name="SubjectConfirmation" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmationType"/>
+ * <element name="SubjectConfirmation" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationType.java
index 4d6866cd41..0bea1be60e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectConfirmationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SubjectConfirmationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 143)
- * 
                    
  * 
                    - * <complexType name="SubjectConfirmationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}ConfirmationMethod" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmationData" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectConfirmationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}ConfirmationMethod" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmationData" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectElement.java
index aa35125a0f..7309ade46f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Subject element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 123)
- * 
                    
  * 
                    - * <element name="Subject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType"/>
+ * <element name="Subject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityElement.java
index a4f86ec173..db92ab2ecf 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectLocality element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 165)
- * 
                    
  * 
                    - * <element name="SubjectLocality" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectLocalityType"/>
+ * <element name="SubjectLocality" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectLocalityType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityType.java
index 48c372e772..59efe80dee 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectLocalityType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for SubjectLocalityType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 166)
- * 
                    
  * 
                    - * <complexType name="SubjectLocalityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="DNSAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="IPAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectLocalityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="DNSAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="IPAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementAbstractType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementAbstractType.java
index b09ce08028..4531e320d3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementAbstractType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for SubjectStatementAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 114)
- * 
                    
  * 
                    - * <complexType name="SubjectStatementAbstractType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}StatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Subject"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectStatementAbstractType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}StatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Subject"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementElement.java
index c8443a0931..30fc54e43d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 113)
- * 
                    
  * 
                    - * <element name="SubjectStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType"/>
+ * <element name="SubjectStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectType.java
index 07c0d6a5c3..054ecb41ed 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/assertion/SubjectType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for SubjectType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-assertion-01.xsd line 124)
- * 
                    
  * 
                    - * <complexType name="SubjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation" minOccurs="0"/>
- *         </sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation" minOccurs="0"/>
+ *         </sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AssertionArtifactElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AssertionArtifactElement.java
index eb148cb11b..3ea46d9bf6 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AssertionArtifactElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AssertionArtifactElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AssertionArtifact element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 73)
- * 
                    
  * 
                    - * <element name="AssertionArtifact" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="AssertionArtifact" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryElement.java
index 440cfa1676..ff2db2844d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeQuery element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 94)
- * 
                    
  * 
                    - * <element name="AttributeQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}AttributeQueryType"/>
+ * <element name="AttributeQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}AttributeQueryType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryType.java
index 165ba2985b..460d3a739b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AttributeQueryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for AttributeQueryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 95)
- * 
                    
  * 
                    - * <complexType name="AttributeQueryType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignator" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Resource" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeQueryType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignator" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Resource" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryElement.java
index 3c4b2b8f98..098151ab13 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthenticationQuery element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 86)
- * 
                    
  * 
                    - * <element name="AuthenticationQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}AuthenticationQueryType"/>
+ * <element name="AuthenticationQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}AuthenticationQueryType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryType.java
index 73ca5dfc41..606fc6806c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthenticationQueryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for AuthenticationQueryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 87)
- * 
                    
  * 
                    - * <complexType name="AuthenticationQueryType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType">
- *       <attribute name="AuthenticationMethod" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticationQueryType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType">
+ *       <attribute name="AuthenticationMethod" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryElement.java
index 0f0ec1af57..8646a4bb6b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthorizationDecisionQuery element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 105)
- * 
                    
  * 
                    - * <element name="AuthorizationDecisionQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}AuthorizationDecisionQueryType"/>
+ * <element name="AuthorizationDecisionQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}AuthorizationDecisionQueryType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryType.java
index 9b0d528b6b..95d502ecbc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/AuthorizationDecisionQueryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for AuthorizationDecisionQueryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 106)
- * 
                    
  * 
                    - * <complexType name="AuthorizationDecisionQueryType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Action" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Evidence" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthorizationDecisionQueryType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Action" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Evidence" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ObjectFactory.java
index c03af118c6..762af24f15 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -88,7 +89,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -107,7 +108,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -126,7 +127,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -138,7 +139,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of StatusCodeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusCodeElement createStatusCodeElement()
@@ -150,7 +151,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusCodeElement create
     /**
      * Create an instance of SubjectQueryAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.SubjectQueryAbstractType createSubjectQueryAbstractType()
@@ -162,7 +163,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.SubjectQueryAbstractType
     /**
      * Create an instance of AssertionArtifactElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AssertionArtifactElement createAssertionArtifactElement()
@@ -174,7 +175,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AssertionArtifactElement
     /**
      * Create an instance of AssertionArtifactElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AssertionArtifactElement createAssertionArtifactElement(java.lang.String value)
@@ -186,7 +187,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AssertionArtifactElement
     /**
      * Create an instance of RequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.RequestElement createRequestElement()
@@ -198,7 +199,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.RequestElement createReq
     /**
      * Create an instance of QueryAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.QueryAbstractType createQueryAbstractType()
@@ -210,7 +211,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.QueryAbstractType create
     /**
      * Create an instance of ResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.ResponseType createResponseType()
@@ -222,7 +223,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.ResponseType createRespo
     /**
      * Create an instance of RequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.RequestType createRequestType()
@@ -234,7 +235,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.RequestType createReques
     /**
      * Create an instance of StatusDetailType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusDetailType createStatusDetailType()
@@ -246,7 +247,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusDetailType createS
     /**
      * Create an instance of AttributeQueryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AttributeQueryElement createAttributeQueryElement()
@@ -258,7 +259,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AttributeQueryElement cr
     /**
      * Create an instance of AuthorizationDecisionQueryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthorizationDecisionQueryElement createAuthorizationDecisionQueryElement()
@@ -270,7 +271,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthorizationDecisionQue
     /**
      * Create an instance of AuthenticationQueryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthenticationQueryType createAuthenticationQueryType()
@@ -282,7 +283,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthenticationQueryType
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusElement createStatusElement()
@@ -294,7 +295,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusElement createStat
     /**
      * Create an instance of ResponseAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.ResponseAbstractType createResponseAbstractType()
@@ -306,7 +307,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.ResponseAbstractType cre
     /**
      * Create an instance of AttributeQueryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AttributeQueryType createAttributeQueryType()
@@ -318,7 +319,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AttributeQueryType creat
     /**
      * Create an instance of ResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.ResponseElement createResponseElement()
@@ -330,7 +331,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.ResponseElement createRe
     /**
      * Create an instance of StatusMessageElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusMessageElement createStatusMessageElement()
@@ -342,7 +343,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusMessageElement cre
     /**
      * Create an instance of StatusMessageElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusMessageElement createStatusMessageElement(java.lang.String value)
@@ -354,7 +355,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusMessageElement cre
     /**
      * Create an instance of RespondWithElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.RespondWithElement createRespondWithElement()
@@ -366,7 +367,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.RespondWithElement creat
     /**
      * Create an instance of RespondWithElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.RespondWithElement createRespondWithElement(javax.xml.namespace.QName value)
@@ -378,7 +379,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.RespondWithElement creat
     /**
      * Create an instance of AuthorizationDecisionQueryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthorizationDecisionQueryType createAuthorizationDecisionQueryType()
@@ -390,7 +391,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthorizationDecisionQue
     /**
      * Create an instance of StatusDetailElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusDetailElement createStatusDetailElement()
@@ -402,7 +403,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusDetailElement crea
     /**
      * Create an instance of RequestAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.RequestAbstractType createRequestAbstractType()
@@ -414,7 +415,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.RequestAbstractType crea
     /**
      * Create an instance of StatusCodeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusCodeType createStatusCodeType()
@@ -426,7 +427,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusCodeType createSta
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusType createStatusType()
@@ -438,7 +439,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.StatusType createStatusT
     /**
      * Create an instance of QueryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.QueryElement createQueryElement()
@@ -450,7 +451,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.QueryElement createQuery
     /**
      * Create an instance of AuthenticationQueryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthenticationQueryElement createAuthenticationQueryElement()
@@ -462,7 +463,7 @@ public com.sun.identity.liberty.ws.common.jaxb.protocol.AuthenticationQueryEleme
     /**
      * Create an instance of SubjectQueryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.protocol.SubjectQueryElement createSubjectQueryElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryAbstractType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryAbstractType.java
index 0723787e26..44a38817d1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryAbstractType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for QueryAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 75)
- * 
                    
  * 
                    - * <complexType name="QueryAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryElement.java
index 39cda0fc6a..7e92c7e71b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/QueryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Query element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 74)
- * 
                    
  * 
                    - * <element name="Query" type="{urn:oasis:names:tc:SAML:1.0:protocol}QueryAbstractType"/>
+ * <element name="Query" type="{urn:oasis:names:tc:SAML:1.0:protocol}QueryAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestAbstractType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestAbstractType.java
index 6bb11da8dc..6324ea40c5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestAbstractType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for RequestAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 46)
- * 
                    
  * 
                    - * <complexType name="RequestAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}RespondWith" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="RequestID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}RespondWith" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="RequestID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestElement.java
index c88e0ab7a2..4e330e7392 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Request element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 57)
- * 
                    
  * 
                    - * <element name="Request" type="{urn:oasis:names:tc:SAML:1.0:protocol}RequestType"/>
+ * <element name="Request" type="{urn:oasis:names:tc:SAML:1.0:protocol}RequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestType.java
index 287c2ca8c6..b454c6dcae 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for RequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 58)
- * 
                    
  * 
                    - * <complexType name="RequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
- *       <choice>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Query"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQuery"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AuthenticationQuery"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AttributeQuery"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AuthorizationDecisionQuery"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AssertionArtifact" maxOccurs="unbounded"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
+ *       <choice>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Query"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQuery"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AuthenticationQuery"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AttributeQuery"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AuthorizationDecisionQuery"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}AssertionArtifact" maxOccurs="unbounded"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RespondWithElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RespondWithElement.java
index 533fb3f979..1323ab273f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RespondWithElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/RespondWithElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RespondWith element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 56)
- * 
                    
  * 
                    - * <element name="RespondWith" type="{http://www.w3.org/2001/XMLSchema}QName"/>
+ * <element name="RespondWith" type="{http://www.w3.org/2001/XMLSchema}QName"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseAbstractType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseAbstractType.java
index 2743d12343..2cd45a4763 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseAbstractType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for ResponseAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 117)
- * 
                    
  * 
                    - * <complexType name="ResponseAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="ResponseID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ResponseID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseElement.java
index 173fb8d487..4b614a5577 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Response element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 128)
- * 
                    
  * 
                    - * <element name="Response" type="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseType"/>
+ * <element name="Response" type="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseType.java
index 9d73d11b21..ecd466bc77 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/ResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 129)
- * 
                    
  * 
                    - * <complexType name="ResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Status"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Status"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeElement.java
index 5257926af3..634b7c97f2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for StatusCode element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 147)
- * 
                    
  * 
                    - * <element name="StatusCode" type="{urn:oasis:names:tc:SAML:1.0:protocol}StatusCodeType"/>
+ * <element name="StatusCode" type="{urn:oasis:names:tc:SAML:1.0:protocol}StatusCodeType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeType.java
index 4f96d0e64e..9c35831898 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusCodeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for StatusCodeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 148)
- * 
                    
  * 
                    - * <complexType name="StatusCodeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusCode" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusCodeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusCode" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailElement.java
index b2adcba097..81f567f7b0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for StatusDetail element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 155)
- * 
                    
  * 
                    - * <element name="StatusDetail" type="{urn:oasis:names:tc:SAML:1.0:protocol}StatusDetailType"/>
+ * <element name="StatusDetail" type="{urn:oasis:names:tc:SAML:1.0:protocol}StatusDetailType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailType.java
index 326dce8885..8ea2f8bae7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusDetailType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for StatusDetailType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 156)
- * 
                    
  * 
                    - * <complexType name="StatusDetailType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusDetailType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusElement.java
index 98d9f3e1a0..69963e1064 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 139)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:oasis:names:tc:SAML:1.0:protocol}StatusType"/>
+ * <element name="Status" type="{urn:oasis:names:tc:SAML:1.0:protocol}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusMessageElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusMessageElement.java
index b8c34ee4ab..e8cef90ef3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusMessageElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusMessageElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for StatusMessage element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 154)
- * 
                    
  * 
                    - * <element name="StatusMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="StatusMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusType.java
index 2bc457abe1..06021b0d31 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 140)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusCode"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusMessage" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusDetail" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusCode"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusMessage" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}StatusDetail" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryAbstractType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryAbstractType.java
index ca0323a192..2178bde6a7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryAbstractType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for SubjectQueryAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 77)
- * 
                    
  * 
                    - * <complexType name="SubjectQueryAbstractType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}QueryAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Subject"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectQueryAbstractType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}QueryAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Subject"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryElement.java
index 4ff052c001..fcca90a1b0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/protocol/SubjectQueryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectQuery element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/cs-sstc-schema-protocol-01.xsd line 76)
- * 
                    
  * 
                    - * <element name="SubjectQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType"/>
+ * <element name="SubjectQuery" type="{urn:oasis:names:tc:SAML:1.0:protocol}SubjectQueryAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AffiliationIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AffiliationIDElement.java
index 24b5a61f98..0aab82246f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AffiliationIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AffiliationIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AffiliationID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 66)
- * 
                    
  * 
                    - * <element name="AffiliationID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
+ * <element name="AffiliationID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionElement.java
index 71b07df85e..24b23099b4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Assertion element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 139)
- * 
                    
  * 
                    - * <element name="Assertion" type="{urn:liberty:iff:2003-08}AssertionType"/>
+ * <element name="Assertion" type="{urn:liberty:iff:2003-08}AssertionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionType.java
index 9ed064a9ab..d69f026d58 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AssertionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for AssertionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 140)
- * 
                    
  * 
                    - * <complexType name="AssertionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionType">
- *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AssertionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionType">
+ *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementElement.java
index f7f55ed242..1d064257f0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthenticationStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 175)
- * 
                    
  * 
                    - * <element name="AuthenticationStatement" type="{urn:liberty:iff:2003-08}AuthenticationStatementType"/>
+ * <element name="AuthenticationStatement" type="{urn:liberty:iff:2003-08}AuthenticationStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementType.java
index 132ae8216a..6fc1b10ede 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthenticationStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for AuthenticationStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 176)
- * 
                    
  * 
                    - * <complexType name="AuthenticationStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatementType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}AuthnContext" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ReauthenticateOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticationStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatementType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}AuthnContext" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ReauthenticateOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextElement.java
index da5b942206..665d3ec9af 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for AuthnContext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 187)
- * 
                    
  * 
                    - * <element name="AuthnContext">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *           <choice>
- *             <element ref="{urn:liberty:ac:2003-08}AuthenticationContextStatement"/>
- *             <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *           </choice>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="AuthnContext">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *           <choice>
+ *             <element ref="{urn:liberty:ac:2003-08}AuthenticationContextStatement"/>
+ *             <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *           </choice>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextType.java
index 47906c7845..6f0bc3997c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnContextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 188)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <choice>
- *           <element ref="{urn:liberty:ac:2003-08}AuthenticationContextStatement"/>
- *           <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <choice>
+ *           <element ref="{urn:liberty:ac:2003-08}AuthenticationContextStatement"/>
+ *           <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestElement.java
index 228dde46bc..e0a74ea841 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnRequest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 68)
- * 
                    
  * 
                    - * <element name="AuthnRequest" type="{urn:liberty:iff:2003-08}AuthnRequestType"/>
+ * <element name="AuthnRequest" type="{urn:liberty:iff:2003-08}AuthnRequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeElement.java
index 0163c781e5..7764d7c320 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnRequestEnvelope element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 198)
- * 
                    
  * 
                    - * <element name="AuthnRequestEnvelope" type="{urn:liberty:iff:2003-08}AuthnRequestEnvelopeType"/>
+ * <element name="AuthnRequestEnvelope" type="{urn:liberty:iff:2003-08}AuthnRequestEnvelopeType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeType.java
index 2b5cac7482..7038d1db7f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestEnvelopeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for AuthnRequestEnvelopeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 199)
- * 
                    
  * 
                    - * <complexType name="AuthnRequestEnvelopeType">
- *   <complexContent>
- *     <extension base="{urn:liberty:iff:2003-08}RequestEnvelopeType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}AuthnRequest"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="AssertionConsumerServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <element ref="{urn:liberty:iff:2003-08}IDPList" minOccurs="0"/>
- *         <element name="IsPassive" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnRequestEnvelopeType">
+ *   <complexContent>
+ *     <extension base="{urn:liberty:iff:2003-08}RequestEnvelopeType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}AuthnRequest"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="AssertionConsumerServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element ref="{urn:liberty:iff:2003-08}IDPList" minOccurs="0"/>
+ *         <element name="IsPassive" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestType.java
index 2af51e9491..f4dd30fc8e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnRequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,28 +13,27 @@
 /**
  * Java content class for AuthnRequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 69)
- * 
                    
  * 
                    - * <complexType name="AuthnRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:liberty:iff:2003-08}AffiliationID" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}NameIDPolicy" minOccurs="0"/>
- *         <element name="ForceAuthn" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="IsPassive" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProtocolProfile" minOccurs="0"/>
- *         <element name="AssertionConsumerServiceID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}Scoping" minOccurs="0"/>
- *       </sequence>
- *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:liberty:iff:2003-08}AffiliationID" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}NameIDPolicy" minOccurs="0"/>
+ *         <element name="ForceAuthn" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="IsPassive" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProtocolProfile" minOccurs="0"/>
+ *         <element name="AssertionConsumerServiceID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}Scoping" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseElement.java
index 857c8bc6b3..f451f7a8d9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 126)
- * 
                    
  * 
                    - * <element name="AuthnResponse" type="{urn:liberty:iff:2003-08}AuthnResponseType"/>
+ * <element name="AuthnResponse" type="{urn:liberty:iff:2003-08}AuthnResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeElement.java
index bf9e6e3dd2..ee7fbf87cf 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnResponseEnvelope element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 242)
- * 
                    
  * 
                    - * <element name="AuthnResponseEnvelope" type="{urn:liberty:iff:2003-08}AuthnResponseEnvelopeType"/>
+ * <element name="AuthnResponseEnvelope" type="{urn:liberty:iff:2003-08}AuthnResponseEnvelopeType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeType.java
index cff2a8bf8a..3d510c45a0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseEnvelopeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for AuthnResponseEnvelopeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 243)
- * 
                    
  * 
                    - * <complexType name="AuthnResponseEnvelopeType">
- *   <complexContent>
- *     <extension base="{urn:liberty:iff:2003-08}ResponseEnvelopeType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}AuthnResponse"/>
- *         <element name="AssertionConsumerServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnResponseEnvelopeType">
+ *   <complexContent>
+ *     <extension base="{urn:liberty:iff:2003-08}ResponseEnvelopeType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}AuthnResponse"/>
+ *         <element name="AssertionConsumerServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseType.java
index bd0334f65b..022363c1c9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/AuthnResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for AuthnResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 127)
- * 
                    
  * 
                    - * <complexType name="AuthnResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
- *       </sequence>
- *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EmptyType.java
index 5825e58348..4e5a623f07 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iff-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierElement.java
index 1050d68084..e6c5cb9dc2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptableNameIdentifier element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 158)
- * 
                    
  * 
                    - * <element name="EncryptableNameIdentifier" type="{urn:liberty:iff:2003-08}EncryptableNameIdentifierType"/>
+ * <element name="EncryptableNameIdentifier" type="{urn:liberty:iff:2003-08}EncryptableNameIdentifierType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierType.java
index a8800fa64e..b8c71a5a88 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptableNameIdentifierType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for EncryptableNameIdentifierType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 159)
- * 
                    
  * 
                    - * <complexType name="EncryptableNameIdentifierType">
- *   <simpleContent>
- *     <extension base="<urn:oasis:names:tc:SAML:1.0:assertion>NameIdentifierType">
- *       <attribute name="IssueInstant" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="Nonce" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="EncryptableNameIdentifierType">
+ *   <simpleContent>
+ *     <extension base="<urn:oasis:names:tc:SAML:1.0:assertion>NameIdentifierType">
+ *       <attribute name="IssueInstant" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="Nonce" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierElement.java
index 17a53ab2fd..ee5bf4455b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedNameIdentifier element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 167)
- * 
                    
  * 
                    - * <element name="EncryptedNameIdentifier" type="{urn:liberty:iff:2003-08}EncryptedNameIdentifierType"/>
+ * <element name="EncryptedNameIdentifier" type="{urn:liberty:iff:2003-08}EncryptedNameIdentifierType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierType.java
index 8a81b37e43..5549513aef 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/EncryptedNameIdentifierType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for EncryptedNameIdentifierType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 168)
- * 
                    
  * 
                    - * <complexType name="EncryptedNameIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedNameIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionElement.java
index 0072c2c05d..02a4fc6ead 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iff-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:iff:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:iff:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionType.java
index 7f7f3910de..5921946152 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iff-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationElement.java
index 6d9bf10438..39bdbfe700 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FederationTerminationNotification element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 289)
- * 
                    
  * 
                    - * <element name="FederationTerminationNotification" type="{urn:liberty:iff:2003-08}FederationTerminationNotificationType"/>
+ * <element name="FederationTerminationNotification" type="{urn:liberty:iff:2003-08}FederationTerminationNotificationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationType.java
index f990a661ac..89929cc6e9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/FederationTerminationNotificationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for FederationTerminationNotificationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 290)
- * 
                    
  * 
                    - * <complexType name="FederationTerminationNotificationType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
- *       </sequence>
- *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FederationTerminationNotificationType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
+ *       </sequence>
+ *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/GetCompleteElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/GetCompleteElement.java
index 9f6dae027e..9babcace11 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/GetCompleteElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/GetCompleteElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for GetComplete element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 241)
- * 
                    
  * 
                    - * <element name="GetComplete" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="GetComplete" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesElement.java
index 80e18146fd..a5b7600a00 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for IDPEntries element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 234)
- * 
                    
  * 
                    - * <element name="IDPEntries">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:iff:2003-08}IDPEntry" maxOccurs="unbounded"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="IDPEntries">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:iff:2003-08}IDPEntry" maxOccurs="unbounded"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesType.java
index d1fbac4bac..7c19cce6c5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntriesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 235)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}IDPEntry" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}IDPEntry" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryElement.java
index 71bf04b956..0549651a0d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for IDPEntry element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 225)
- * 
                    
  * 
                    - * <element name="IDPEntry">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *           <element name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *           <element name="Loc" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="IDPEntry">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *           <element name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *           <element name="Loc" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryType.java
index 5eb954824e..e6ea894bb8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPEntryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 226)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Loc" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="Loc" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListElement.java
index 7123178724..a1fc681a4a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDPList element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 218)
- * 
                    
  * 
                    - * <element name="IDPList" type="{urn:liberty:iff:2003-08}IDPListType"/>
+ * <element name="IDPList" type="{urn:liberty:iff:2003-08}IDPListType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListType.java
index 2dc15fb24e..c7e6686e89 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPListType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for IDPListType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 219)
- * 
                    
  * 
                    - * <complexType name="IDPListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}IDPEntries"/>
- *         <element ref="{urn:liberty:iff:2003-08}GetComplete" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IDPListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}IDPEntries"/>
+ *         <element ref="{urn:liberty:iff:2003-08}GetComplete" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPProvidedNameIdentifierElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPProvidedNameIdentifierElement.java
index fec5cda917..908527bed1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPProvidedNameIdentifierElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/IDPProvidedNameIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDPProvidedNameIdentifier element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 273)
- * 
                    
  * 
                    - * <element name="IDPProvidedNameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
+ * <element name="IDPProvidedNameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestElement.java
index 3eaa6ce7fd..f9290a97a2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LogoutRequest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 302)
- * 
                    
  * 
                    - * <element name="LogoutRequest" type="{urn:liberty:iff:2003-08}LogoutRequestType"/>
+ * <element name="LogoutRequest" type="{urn:liberty:iff:2003-08}LogoutRequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestType.java
index b79b2f1f96..f36c7f7b7a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutRequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for LogoutRequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 303)
- * 
                    
  * 
                    - * <complexType name="LogoutRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
- *         <element name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
- *       </sequence>
- *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="LogoutRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
+ *         <element name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutResponseElement.java
index 6de1d1a1b1..fbd9e9e0ce 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/LogoutResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LogoutResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 317)
- * 
                    
  * 
                    - * <element name="LogoutResponse" type="{urn:liberty:iff:2003-08}StatusResponseType"/>
+ * <element name="LogoutResponse" type="{urn:liberty:iff:2003-08}StatusResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIDPolicyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIDPolicyElement.java
index f5f96a7f10..560ab1f758 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIDPolicyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIDPolicyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NameIDPolicy element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 97)
- * 
                    
  * 
                    - * <element name="NameIDPolicy" type="{urn:liberty:iff:2003-08}NameIDPolicyType"/>
+ * <element name="NameIDPolicy" type="{urn:liberty:iff:2003-08}NameIDPolicyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestElement.java
index 2723a42bea..091d55ce57 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NameIdentifierMappingRequest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 318)
- * 
                    
  * 
                    - * <element name="NameIdentifierMappingRequest" type="{urn:liberty:iff:2003-08}NameIdentifierMappingRequestType"/>
+ * <element name="NameIdentifierMappingRequest" type="{urn:liberty:iff:2003-08}NameIdentifierMappingRequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestType.java
index 25700bdd26..5002ab86c6 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingRequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for NameIdentifierMappingRequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 319)
- * 
                    
  * 
                    - * <complexType name="NameIdentifierMappingRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
- *         <element name="TargetNamespace" type="{urn:liberty:metadata:2003-08}entityIDType"/>
- *       </sequence>
- *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NameIdentifierMappingRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
+ *         <element name="TargetNamespace" type="{urn:liberty:metadata:2003-08}entityIDType"/>
+ *       </sequence>
+ *       <attribute ref="{urn:liberty:iff:2003-08}consent"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseElement.java
index f7f3749e9a..d02764e5c1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NameIdentifierMappingResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 332)
- * 
                    
  * 
                    - * <element name="NameIdentifierMappingResponse" type="{urn:liberty:iff:2003-08}NameIdentifierMappingResponseType"/>
+ * <element name="NameIdentifierMappingResponse" type="{urn:liberty:iff:2003-08}NameIdentifierMappingResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseType.java
index 7fbcb36d36..ed6ddd078f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/NameIdentifierMappingResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for NameIdentifierMappingResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 333)
- * 
                    
  * 
                    - * <complexType name="NameIdentifierMappingResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseAbstractType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Status"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NameIdentifierMappingResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Status"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ObjectFactory.java
index a1df0b4d32..070d00978f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -142,7 +143,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -161,7 +162,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -180,7 +181,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -192,7 +193,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of AuthnRequestEnvelopeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestEnvelopeElement createAuthnRequestEnvelopeElement()
@@ -204,7 +205,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestEnvelopeElement cr
     /**
      * Create an instance of AuthnResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseElement createAuthnResponseElement()
@@ -216,7 +217,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseElement createAut
     /**
      * Create an instance of NameIdentifierMappingResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingResponseType createNameIdentifierMappingResponseType()
@@ -228,7 +229,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingResponseT
     /**
      * Create an instance of SubjectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.SubjectElement createSubjectElement()
@@ -240,7 +241,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.SubjectElement createSubjectEl
     /**
      * Create an instance of IDPEntriesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntriesElement createIDPEntriesElement()
@@ -252,7 +253,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntriesElement createIDPEnt
     /**
      * Create an instance of IDPListType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.IDPListType createIDPListType()
@@ -264,7 +265,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.IDPListType createIDPListType(
     /**
      * Create an instance of RequestEnvelopeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RequestEnvelopeType createRequestEnvelopeType()
@@ -276,7 +277,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RequestEnvelopeType createRequ
     /**
      * Create an instance of OldProvidedNameIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.OldProvidedNameIdentifierElement createOldProvidedNameIdentifierElement()
@@ -288,7 +289,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.OldProvidedNameIdentifierEleme
     /**
      * Create an instance of IDPProvidedNameIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.IDPProvidedNameIdentifierElement createIDPProvidedNameIdentifierElement()
@@ -300,7 +301,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.IDPProvidedNameIdentifierEleme
     /**
      * Create an instance of AuthnResponseEnvelopeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseEnvelopeType createAuthnResponseEnvelopeType()
@@ -312,7 +313,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseEnvelopeType crea
     /**
      * Create an instance of LogoutResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.LogoutResponseElement createLogoutResponseElement()
@@ -324,7 +325,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.LogoutResponseElement createLo
     /**
      * Create an instance of NameIdentifierMappingRequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingRequestElement createNameIdentifierMappingRequestElement()
@@ -336,7 +337,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingRequestEl
     /**
      * Create an instance of RequestAuthnContextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RequestAuthnContextElement createRequestAuthnContextElement()
@@ -348,7 +349,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RequestAuthnContextElement cre
     /**
      * Create an instance of ResponseEnvelopeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ResponseEnvelopeType createResponseEnvelopeType()
@@ -360,7 +361,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ResponseEnvelopeType createRes
     /**
      * Create an instance of AuthenticationStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthenticationStatementType createAuthenticationStatementType()
@@ -372,7 +373,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthenticationStatementType cr
     /**
      * Create an instance of AuthnContextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnContextType createAuthnContextType()
@@ -384,7 +385,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnContextType createAuthnCo
     /**
      * Create an instance of LogoutRequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.LogoutRequestElement createLogoutRequestElement()
@@ -396,7 +397,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.LogoutRequestElement createLog
     /**
      * Create an instance of RegisterNameIdentifierRequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RegisterNameIdentifierRequestElement createRegisterNameIdentifierRequestElement()
@@ -408,7 +409,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RegisterNameIdentifierRequestE
     /**
      * Create an instance of ScopingType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ScopingType createScopingType()
@@ -420,7 +421,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ScopingType createScopingType(
     /**
      * Create an instance of IDPEntriesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntriesType createIDPEntriesType()
@@ -432,7 +433,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntriesType createIDPEntrie
     /**
      * Create an instance of LogoutRequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.LogoutRequestType createLogoutRequestType()
@@ -444,7 +445,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.LogoutRequestType createLogout
     /**
      * Create an instance of AuthnRequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestType createAuthnRequestType()
@@ -456,7 +457,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestType createAuthnRe
     /**
      * Create an instance of AuthnContextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnContextElement createAuthnContextElement()
@@ -468,7 +469,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnContextElement createAuth
     /**
      * Create an instance of EncryptableNameIdentifierType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.EncryptableNameIdentifierType createEncryptableNameIdentifierType()
@@ -480,7 +481,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.EncryptableNameIdentifierType
     /**
      * Create an instance of AuthenticationStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthenticationStatementElement createAuthenticationStatementElement()
@@ -492,7 +493,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthenticationStatementElement
     /**
      * Create an instance of SubjectType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.SubjectType createSubjectType()
@@ -504,7 +505,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.SubjectType createSubjectType(
     /**
      * Create an instance of FederationTerminationNotificationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.FederationTerminationNotificationType createFederationTerminationNotificationType()
@@ -516,7 +517,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.FederationTerminationNotificat
     /**
      * Create an instance of RegisterNameIdentifierRequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RegisterNameIdentifierRequestType createRegisterNameIdentifierRequestType()
@@ -528,7 +529,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RegisterNameIdentifierRequestT
     /**
      * Create an instance of IDPListElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.IDPListElement createIDPListElement()
@@ -540,7 +541,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.IDPListElement createIDPListEl
     /**
      * Create an instance of AuthnRequestEnvelopeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestEnvelopeType createAuthnRequestEnvelopeType()
@@ -552,7 +553,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestEnvelopeType creat
     /**
      * Create an instance of AssertionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AssertionType createAssertionType()
@@ -564,7 +565,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AssertionType createAssertionT
     /**
      * Create an instance of RelayStateElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RelayStateElement createRelayStateElement()
@@ -576,7 +577,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RelayStateElement createRelayS
     /**
      * Create an instance of RelayStateElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RelayStateElement createRelayStateElement(java.lang.String value)
@@ -588,7 +589,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RelayStateElement createRelayS
     /**
      * Create an instance of AuthnResponseEnvelopeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseEnvelopeElement createAuthnResponseEnvelopeElement()
@@ -600,7 +601,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseEnvelopeElement c
     /**
      * Create an instance of SPProvidedNameIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.SPProvidedNameIdentifierElement createSPProvidedNameIdentifierElement()
@@ -612,7 +613,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.SPProvidedNameIdentifierElemen
     /**
      * Create an instance of ProviderIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ProviderIDElement createProviderIDElement()
@@ -624,7 +625,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ProviderIDElement createProvid
     /**
      * Create an instance of ProviderIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ProviderIDElement createProviderIDElement(java.lang.String value)
@@ -636,7 +637,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ProviderIDElement createProvid
     /**
      * Create an instance of ProtocolProfileElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ProtocolProfileElement createProtocolProfileElement()
@@ -648,7 +649,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ProtocolProfileElement createP
     /**
      * Create an instance of ProtocolProfileElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ProtocolProfileElement createProtocolProfileElement(java.lang.String value)
@@ -660,7 +661,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ProtocolProfileElement createP
     /**
      * Create an instance of IDPEntryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntryType createIDPEntryType()
@@ -672,7 +673,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntryType createIDPEntryTyp
     /**
      * Create an instance of EncryptedNameIdentifierType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.EncryptedNameIdentifierType createEncryptedNameIdentifierType()
@@ -684,7 +685,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.EncryptedNameIdentifierType cr
     /**
      * Create an instance of FederationTerminationNotificationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.FederationTerminationNotificationElement createFederationTerminationNotificationElement()
@@ -696,7 +697,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.FederationTerminationNotificat
     /**
      * Create an instance of AuthnRequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestElement createAuthnRequestElement()
@@ -708,7 +709,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnRequestElement createAuth
     /**
      * Create an instance of EncryptedNameIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.EncryptedNameIdentifierElement createEncryptedNameIdentifierElement()
@@ -720,7 +721,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.EncryptedNameIdentifierElement
     /**
      * Create an instance of NameIdentifierMappingRequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingRequestType createNameIdentifierMappingRequestType()
@@ -732,7 +733,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingRequestTy
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.StatusElement createStatusElement()
@@ -744,7 +745,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.StatusElement createStatusElem
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ExtensionElement createExtensionElement()
@@ -756,7 +757,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ExtensionElement createExtensi
     /**
      * Create an instance of ScopingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ScopingElement createScopingElement()
@@ -768,7 +769,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ScopingElement createScopingEl
     /**
      * Create an instance of AffiliationIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AffiliationIDElement createAffiliationIDElement()
@@ -780,7 +781,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AffiliationIDElement createAff
     /**
      * Create an instance of AffiliationIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AffiliationIDElement createAffiliationIDElement(java.lang.String value)
@@ -792,7 +793,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AffiliationIDElement createAff
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.StatusType createStatusType()
@@ -804,7 +805,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.StatusType createStatusType()
     /**
      * Create an instance of NameIDPolicyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.NameIDPolicyElement createNameIDPolicyElement()
@@ -816,7 +817,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.NameIDPolicyElement createName
     /**
      * Create an instance of NameIDPolicyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.NameIDPolicyElement createNameIDPolicyElement(java.lang.String value)
@@ -828,7 +829,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.NameIDPolicyElement createName
     /**
      * Create an instance of NameIdentifierMappingResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingResponseElement createNameIdentifierMappingResponseElement()
@@ -840,7 +841,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.NameIdentifierMappingResponseE
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.EmptyType createEmptyType()
@@ -852,7 +853,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.EmptyType createEmptyType()
     /**
      * Create an instance of RequestAuthnContextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RequestAuthnContextType createRequestAuthnContextType()
@@ -864,7 +865,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RequestAuthnContextType create
     /**
      * Create an instance of AssertionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AssertionElement createAssertionElement()
@@ -876,7 +877,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AssertionElement createAsserti
     /**
      * Create an instance of AuthnResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseType createAuthnResponseType()
@@ -888,7 +889,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.AuthnResponseType createAuthnR
     /**
      * Create an instance of IDPEntryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntryElement createIDPEntryElement()
@@ -900,7 +901,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.IDPEntryElement createIDPEntry
     /**
      * Create an instance of RegisterNameIdentifierResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.RegisterNameIdentifierResponseElement createRegisterNameIdentifierResponseElement()
@@ -912,7 +913,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.RegisterNameIdentifierResponse
     /**
      * Create an instance of GetCompleteElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.GetCompleteElement createGetCompleteElement()
@@ -924,7 +925,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.GetCompleteElement createGetCo
     /**
      * Create an instance of GetCompleteElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.GetCompleteElement createGetCompleteElement(java.lang.String value)
@@ -936,7 +937,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.GetCompleteElement createGetCo
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.ExtensionType createExtensionType()
@@ -948,7 +949,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.ExtensionType createExtensionT
     /**
      * Create an instance of StatusResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.StatusResponseType createStatusResponseType()
@@ -960,7 +961,7 @@ public com.sun.identity.liberty.ws.common.jaxb.ps.StatusResponseType createStatu
     /**
      * Create an instance of EncryptableNameIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.ps.EncryptableNameIdentifierElement createEncryptableNameIdentifierElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/OldProvidedNameIdentifierElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/OldProvidedNameIdentifierElement.java
index 6c83a8fe83..ad68498232 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/OldProvidedNameIdentifierElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/OldProvidedNameIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for OldProvidedNameIdentifier element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 275)
- * 
                    
  * 
                    - * <element name="OldProvidedNameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
+ * <element name="OldProvidedNameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProtocolProfileElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProtocolProfileElement.java
index fbb7c65062..abbeb5f340 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProtocolProfileElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProtocolProfileElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProtocolProfile element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 113)
- * 
                    
  * 
                    - * <element name="ProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="ProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProviderIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProviderIDElement.java
index 3decfd90cd..e6c0b47e40 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProviderIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ProviderIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProviderID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 65)
- * 
                    
  * 
                    - * <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
+ * <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestElement.java
index de719f0721..ffb9ab08a3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RegisterNameIdentifierRequest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 258)
- * 
                    
  * 
                    - * <element name="RegisterNameIdentifierRequest" type="{urn:liberty:iff:2003-08}RegisterNameIdentifierRequestType"/>
+ * <element name="RegisterNameIdentifierRequest" type="{urn:liberty:iff:2003-08}RegisterNameIdentifierRequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestType.java
index 6165835cf5..44d2a6276c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierRequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for RegisterNameIdentifierRequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 259)
- * 
                    
  * 
                    - * <complexType name="RegisterNameIdentifierRequestType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:liberty:iff:2003-08}IDPProvidedNameIdentifier"/>
- *         <element ref="{urn:liberty:iff:2003-08}SPProvidedNameIdentifier"/>
- *         <element ref="{urn:liberty:iff:2003-08}OldProvidedNameIdentifier"/>
- *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RegisterNameIdentifierRequestType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}RequestAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:liberty:iff:2003-08}IDPProvidedNameIdentifier"/>
+ *         <element ref="{urn:liberty:iff:2003-08}SPProvidedNameIdentifier"/>
+ *         <element ref="{urn:liberty:iff:2003-08}OldProvidedNameIdentifier"/>
+ *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierResponseElement.java
index 728541f814..182c747afb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RegisterNameIdentifierResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RegisterNameIdentifierResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 276)
- * 
                    
  * 
                    - * <element name="RegisterNameIdentifierResponse" type="{urn:liberty:iff:2003-08}StatusResponseType"/>
+ * <element name="RegisterNameIdentifierResponse" type="{urn:liberty:iff:2003-08}StatusResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RelayStateElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RelayStateElement.java
index 5cfd2df6dd..fe2de5c534 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RelayStateElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RelayStateElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RelayState element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 112)
- * 
                    
  * 
                    - * <element name="RelayState" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="RelayState" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextElement.java
index 3be5745244..4b6c4374ad 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for RequestAuthnContext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 114)
- * 
                    
  * 
                    - * <element name="RequestAuthnContext">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <choice>
- *             <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *             <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *           </choice>
- *           <element name="AuthnContextComparison" type="{urn:liberty:iff:2003-08}AuthnContextComparisonType" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="RequestAuthnContext">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <choice>
+ *             <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *             <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *           </choice>
+ *           <element name="AuthnContextComparison" type="{urn:liberty:iff:2003-08}AuthnContextComparisonType" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextType.java
index 23dccb2464..5ce2430bcc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestAuthnContextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 115)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *           <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *         </choice>
- *         <element name="AuthnContextComparison" type="{urn:liberty:iff:2003-08}AuthnContextComparisonType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *           <element name="AuthnContextStatementRef" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *         </choice>
+ *         <element name="AuthnContextComparison" type="{urn:liberty:iff:2003-08}AuthnContextComparisonType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestEnvelopeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestEnvelopeType.java
index 1d3d096827..0cc88c9dd4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestEnvelopeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/RequestEnvelopeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for RequestEnvelopeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 213)
- * 
                    
  * 
                    - * <complexType name="RequestEnvelopeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestEnvelopeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ResponseEnvelopeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ResponseEnvelopeType.java
index 82074f474e..70507f77eb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ResponseEnvelopeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ResponseEnvelopeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for ResponseEnvelopeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 253)
- * 
                    
  * 
                    - * <complexType name="ResponseEnvelopeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseEnvelopeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SPProvidedNameIdentifierElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SPProvidedNameIdentifierElement.java
index 214779f4b8..3751e70454 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SPProvidedNameIdentifierElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SPProvidedNameIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPProvidedNameIdentifier element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 274)
- * 
                    
  * 
                    - * <element name="SPProvidedNameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
+ * <element name="SPProvidedNameIdentifier" type="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifierType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingElement.java
index ca04cdf274..42f66be33d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Scoping element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 111)
- * 
                    
  * 
                    - * <element name="Scoping" type="{urn:liberty:iff:2003-08}ScopingType"/>
+ * <element name="Scoping" type="{urn:liberty:iff:2003-08}ScopingType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingType.java
index e11d3887c8..b16aa21f02 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/ScopingType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ScopingType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 105)
- * 
                    
  * 
                    - * <complexType name="ScopingType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ProxyCount" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}IDPList" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ScopingType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ProxyCount" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}IDPList" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusElement.java
index 4fd2a7b9f3..84201dce5e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iff-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:iff:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:iff:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusResponseType.java
index d0260fb28f..87856f1618 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for StatusResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 277)
- * 
                    
  * 
                    - * <complexType name="StatusResponseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseAbstractType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Status"/>
- *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusResponseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:protocol}ResponseAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:iff:2003-08}ProviderID"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:protocol}Status"/>
+ *         <element ref="{urn:liberty:iff:2003-08}RelayState" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusType.java
index a293bae602..32bc10b98f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iff-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}Status" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}Status" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectElement.java
index 744b2be44b..67796e6d74 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Subject element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 156)
- * 
                    
  * 
                    - * <element name="Subject" type="{urn:liberty:iff:2003-08}SubjectType"/>
+ * <element name="Subject" type="{urn:liberty:iff:2003-08}SubjectType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectType.java
index 0503597e49..3e5762c17d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/ps/SubjectType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for SubjectType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-protocols-schema.xsd line 147)
- * 
                    
  * 
                    - * <complexType name="SubjectType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}IDPProvidedNameIdentifier"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}IDPProvidedNameIdentifier"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/AttributedString.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/AttributedString.java
index dbec123b5d..e6ac139eab 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/AttributedString.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/AttributedString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,15 +14,14 @@
  * This type represents an element with arbitrary attributes.
  * Java content class for AttributedString complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 35)
- * 
                    
  * 
                    - * <complexType name="AttributedString">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Id"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedString">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Id"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenElement.java
index b303cc584c..241d457e27 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:BinarySecurityToken element per Section 4.2.
  * Java content class for BinarySecurityToken element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 155)
- * 
                    
  * 
                    - * <element name="BinarySecurityToken" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}BinarySecurityTokenType"/>
+ * <element name="BinarySecurityToken" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}BinarySecurityTokenType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenType.java
index f1bd0292bf..0516c16b27 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/BinarySecurityTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,15 +14,14 @@
  * A security token that is encoded in binary
  * Java content class for BinarySecurityTokenType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 77)
- * 
                    
  * 
                    - * <complexType name="BinarySecurityTokenType">
- *   <simpleContent>
- *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>EncodedString">
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="BinarySecurityTokenType">
+ *   <simpleContent>
+ *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>EncodedString">
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedElement.java
index 1364c21dec..99d8492591 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines a security token embedded reference
  * Java content class for Embedded element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 165)
- * 
                    
  * 
                    - * <element name="Embedded" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}EmbeddedType"/>
+ * <element name="Embedded" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}EmbeddedType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedType.java
index 80bf188b29..fd2627ba84 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EmbeddedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,18 +14,17 @@
  * This type represents a reference to an embedded security token.
  * Java content class for EmbeddedType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 116)
- * 
                    
  * 
                    - * <complexType name="EmbeddedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </choice>
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmbeddedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EncodedString.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EncodedString.java
index a7fdca373f..fa30eab0c5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EncodedString.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/EncodedString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,15 +14,14 @@
  * This type is used for elements containing stringified binary data.
  * Java content class for EncodedString complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 56)
- * 
                    
  * 
                    - * <complexType name="EncodedString">
- *   <simpleContent>
- *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>AttributedString">
- *       <attribute name="EncodingType" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="EncodedString">
+ *   <simpleContent>
+ *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>AttributedString">
+ *       <attribute name="EncodingType" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierElement.java
index d4d57f4fb8..8f5bfd103b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines a key identifier reference
  * Java content class for KeyIdentifier element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 170)
- * 
                    
  * 
                    - * <element name="KeyIdentifier" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}KeyIdentifierType"/>
+ * <element name="KeyIdentifier" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}KeyIdentifierType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierType.java
index d29ce06b1a..02d6d40e09 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/KeyIdentifierType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,15 +14,14 @@
  * A security token key identifier
  * Java content class for KeyIdentifierType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 87)
- * 
                    
  * 
                    - * <complexType name="KeyIdentifierType">
- *   <simpleContent>
- *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>EncodedString">
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="KeyIdentifierType">
+ *   <simpleContent>
+ *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>EncodedString">
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/NonceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/NonceElement.java
index e1b3f958c6..e91ea638fc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/NonceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/NonceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Nonce element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 186)
- * 
                    
  * 
                    - * <element name="Nonce" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}EncodedString"/>
+ * <element name="Nonce" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}EncodedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ObjectFactory.java
index 204706825c..74e4d4b5dc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -78,7 +79,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -97,7 +98,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -116,7 +117,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -128,7 +129,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of SecurityTokenReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityTokenReferenceType createSecurityTokenReferenceType()
@@ -140,7 +141,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityTokenReferenceType
     /**
      * Create an instance of KeyIdentifierType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.KeyIdentifierType createKeyIdentifierType()
@@ -152,7 +153,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.KeyIdentifierType createKe
     /**
      * Create an instance of KeyIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.KeyIdentifierElement createKeyIdentifierElement()
@@ -164,7 +165,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.KeyIdentifierElement creat
     /**
      * Create an instance of UsernameTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.UsernameTokenType createUsernameTokenType()
@@ -176,7 +177,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.UsernameTokenType createUs
     /**
      * Create an instance of PasswordString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.PasswordString createPasswordString()
@@ -188,7 +189,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.PasswordString createPassw
     /**
      * Create an instance of EncodedString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.EncodedString createEncodedString()
@@ -200,7 +201,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.EncodedString createEncode
     /**
      * Create an instance of BinarySecurityTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.BinarySecurityTokenType createBinarySecurityTokenType()
@@ -212,7 +213,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.BinarySecurityTokenType cr
     /**
      * Create an instance of UsernameTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.UsernameTokenElement createUsernameTokenElement()
@@ -224,7 +225,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.UsernameTokenElement creat
     /**
      * Create an instance of SecurityHeaderType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityHeaderType createSecurityHeaderType()
@@ -236,7 +237,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityHeaderType createS
     /**
      * Create an instance of ReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.ReferenceElement createReferenceElement()
@@ -248,7 +249,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.ReferenceElement createRef
     /**
      * Create an instance of SecurityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityElement createSecurityElement()
@@ -260,7 +261,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityElement createSecu
     /**
      * Create an instance of EmbeddedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.EmbeddedType createEmbeddedType()
@@ -272,7 +273,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.EmbeddedType createEmbedde
     /**
      * Create an instance of AttributedString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.AttributedString createAttributedString()
@@ -284,7 +285,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.AttributedString createAtt
     /**
      * Create an instance of NonceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.NonceElement createNonceElement()
@@ -296,7 +297,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.NonceElement createNonceEl
     /**
      * Create an instance of SecurityTokenReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityTokenReferenceElement createSecurityTokenReferenceElement()
@@ -308,7 +309,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.SecurityTokenReferenceElem
     /**
      * Create an instance of ReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.ReferenceType createReferenceType()
@@ -320,7 +321,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.ReferenceType createRefere
     /**
      * Create an instance of EmbeddedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.EmbeddedElement createEmbeddedElement()
@@ -332,7 +333,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.EmbeddedElement createEmbe
     /**
      * Create an instance of BinarySecurityTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.BinarySecurityTokenElement createBinarySecurityTokenElement()
@@ -344,7 +345,7 @@ public com.sun.identity.liberty.ws.common.jaxb.secext.BinarySecurityTokenElement
     /**
      * Create an instance of PasswordElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.secext.PasswordElement createPasswordElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordElement.java
index 67eba148ef..60169c49f1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Password element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 185)
- * 
                    
  * 
                    - * <element name="Password" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}PasswordString"/>
+ * <element name="Password" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}PasswordString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordString.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordString.java
index 0fdec4a41c..1183c75a50 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordString.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/PasswordString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,15 +14,14 @@
  * This type is used for password elements per Section 4.1.
  * Java content class for PasswordString complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 46)
- * 
                    
  * 
                    - * <complexType name="PasswordString">
- *   <simpleContent>
- *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>AttributedString">
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="PasswordString">
+ *   <simpleContent>
+ *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/secext>AttributedString">
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceElement.java
index 2a88a42c93..a0c88d1c86 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines a security token reference
  * Java content class for Reference element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 160)
- * 
                    
  * 
                    - * <element name="Reference" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}ReferenceType"/>
+ * <element name="Reference" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}ReferenceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceType.java
index 1bdf059640..dfa3f3d0e4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/ReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,16 +14,15 @@
  * This type represents a reference to an external security token.
  * Java content class for ReferenceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 108)
- * 
                    
  * 
                    - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityElement.java
index 10a5c7eca0..e802700c6b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:Security SOAP header element per Section 4.
  * Java content class for Security element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 180)
- * 
                    
  * 
                    - * <element name="Security" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}SecurityHeaderType"/>
+ * <element name="Security" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}SecurityHeaderType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityHeaderType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityHeaderType.java
index 653c629c74..3af149a370 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityHeaderType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityHeaderType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.
  * Java content class for SecurityHeaderType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 137)
- * 
                    
  * 
                    - * <complexType name="SecurityHeaderType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecurityHeaderType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceElement.java
index 8ac6a12690..67cf4c166b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:SecurityTokenReference per Section 4.3.
  * Java content class for SecurityTokenReference element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 175)
- * 
                    
  * 
                    - * <element name="SecurityTokenReference" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}SecurityTokenReferenceType"/>
+ * <element name="SecurityTokenReference" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}SecurityTokenReferenceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceType.java
index 801e891088..ceef1e2c90 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/SecurityTokenReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,19 +14,18 @@
  * This type is used reference a security token.
  * Java content class for SecurityTokenReferenceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 126)
- * 
                    
  * 
                    - * <complexType name="SecurityTokenReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </choice>
- *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/secext}Usage"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Id"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecurityTokenReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </choice>
+ *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/secext}Usage"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Id"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenElement.java
index 2f1083f49f..1471d38ede 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:UsernameToken element per Section 4.1.
  * Java content class for UsernameToken element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 150)
- * 
                    
  * 
                    - * <element name="UsernameToken" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}UsernameTokenType"/>
+ * <element name="UsernameToken" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}UsernameTokenType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenType.java
index eb9f8a914f..3c69511657 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/secext/UsernameTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,19 +14,18 @@
  * This type represents a username token per Section 4.1
  * Java content class for UsernameTokenType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/secext.xsd line 66)
- * 
                    
  * 
                    - * <complexType name="UsernameTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Username" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}AttributedString"/>
- *         <any/>
- *       </sequence>
- *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Id"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UsernameTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Username" type="{http://schemas.xmlsoap.org/ws/2003/06/secext}AttributedString"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Id"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/MessageAuthenticationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/MessageAuthenticationElement.java
index b404db5807..30937ca71a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/MessageAuthenticationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/MessageAuthenticationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MessageAuthentication element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 73)
- * 
                    
  * 
                    - * <element name="MessageAuthentication" type="{http://www.w3.org/2001/XMLSchema}QName"/>
+ * <element name="MessageAuthentication" type="{http://www.w3.org/2001/XMLSchema}QName"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ObjectFactory.java
index 31d0753285..50792b79ac 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -73,7 +74,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -92,7 +93,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -111,7 +112,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -123,7 +124,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of ProxySubjectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ProxySubjectElement createProxySubjectElement()
@@ -135,7 +136,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.ProxySubjectElement crea
     /**
      * Create an instance of ValidityRestrictionConditionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ValidityRestrictionConditionType createValidityRestrictionConditionType()
@@ -147,7 +148,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.ValidityRestrictionCondi
     /**
      * Create an instance of SessionContextStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextStatementType createSessionContextStatementType()
@@ -159,7 +160,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextStatementT
     /**
      * Create an instance of ProxyTransitedStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ProxyTransitedStatementElement createProxyTransitedStatementElement()
@@ -171,7 +172,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.ProxyTransitedStatementE
     /**
      * Create an instance of SessionContextStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextStatementElement createSessionContextStatementElement()
@@ -183,7 +184,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextStatementE
     /**
      * Create an instance of MessageAuthenticationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.MessageAuthenticationElement createMessageAuthenticationElement()
@@ -195,7 +196,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.MessageAuthenticationEle
     /**
      * Create an instance of MessageAuthenticationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.MessageAuthenticationElement createMessageAuthenticationElement(javax.xml.namespace.QName value)
@@ -207,7 +208,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.MessageAuthenticationEle
     /**
      * Create an instance of SessionContextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextType createSessionContextType()
@@ -219,7 +220,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextType creat
     /**
      * Create an instance of ValidityRestrictionConditionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ValidityRestrictionConditionElement createValidityRestrictionConditionElement()
@@ -231,7 +232,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.ValidityRestrictionCondi
     /**
      * Create an instance of RequesterAuthorizationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.RequesterAuthorizationElement createRequesterAuthorizationElement()
@@ -243,7 +244,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.RequesterAuthorizationEl
     /**
      * Create an instance of RequesterAuthorizationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.RequesterAuthorizationElement createRequesterAuthorizationElement(javax.xml.namespace.QName value)
@@ -255,7 +256,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.RequesterAuthorizationEl
     /**
      * Create an instance of ProxyInfoConfirmationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ProxyInfoConfirmationType createProxyInfoConfirmationType()
@@ -267,7 +268,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.ProxyInfoConfirmationTyp
     /**
      * Create an instance of ResourceAccessStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ResourceAccessStatementType createResourceAccessStatementType()
@@ -279,7 +280,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.ResourceAccessStatementT
     /**
      * Create an instance of SessionContextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextElement createSessionContextElement()
@@ -291,7 +292,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.SessionContextElement cr
     /**
      * Create an instance of ResourceAccessStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ResourceAccessStatementElement createResourceAccessStatementElement()
@@ -303,7 +304,7 @@ public com.sun.identity.liberty.ws.common.jaxb.security.ResourceAccessStatementE
     /**
      * Create an instance of ProxyInfoConfirmationDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.security.ProxyInfoConfirmationDataElement createProxyInfoConfirmationDataElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationDataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationDataElement.java
index a64581c536..252d590091 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationDataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProxyInfoConfirmationData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 104)
- * 
                    
  * 
                    - * <element name="ProxyInfoConfirmationData" type="{urn:liberty:sec:2003-08}ProxyInfoConfirmationType"/>
+ * <element name="ProxyInfoConfirmationData" type="{urn:liberty:sec:2003-08}ProxyInfoConfirmationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationType.java
index 24a2032df7..b14935c745 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyInfoConfirmationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for ProxyInfoConfirmationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 105)
- * 
                    
  * 
                    - * <complexType name="ProxyInfoConfirmationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
- *         <element name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="IssueInstant" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ProxyInfoConfirmationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
+ *         <element name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="IssueInstant" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxySubjectElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxySubjectElement.java
index 5db38c21ab..40c99b7510 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxySubjectElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxySubjectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProxySubject element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 87)
- * 
                    
  * 
                    - * <element name="ProxySubject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType"/>
+ * <element name="ProxySubject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyTransitedStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyTransitedStatementElement.java
index ac01d0624e..a34aa80fc7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyTransitedStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ProxyTransitedStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProxyTransitedStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 94)
- * 
                    
  * 
                    - * <element name="ProxyTransitedStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType"/>
+ * <element name="ProxyTransitedStatement" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/RequesterAuthorizationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/RequesterAuthorizationElement.java
index 76b54ee762..ba2c8c679b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/RequesterAuthorizationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/RequesterAuthorizationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequesterAuthorization element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 74)
- * 
                    
  * 
                    - * <element name="RequesterAuthorization" type="{http://www.w3.org/2001/XMLSchema}QName"/>
+ * <element name="RequesterAuthorization" type="{http://www.w3.org/2001/XMLSchema}QName"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementElement.java
index cc090d8336..d9410e38cc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ResourceAccessStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 151)
- * 
                    
  * 
                    - * <element name="ResourceAccessStatement" type="{urn:liberty:sec:2003-08}ResourceAccessStatementType"/>
+ * <element name="ResourceAccessStatement" type="{urn:liberty:sec:2003-08}ResourceAccessStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementType.java
index 9ccf3ba777..f021882d18 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ResourceAccessStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for ResourceAccessStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 153)
- * 
                    
  * 
                    - * <complexType name="ResourceAccessStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
- *         <sequence minOccurs="0">
- *           <element name="ProxySubject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType"/>
- *           <element ref="{urn:liberty:sec:2003-08}SessionContext" minOccurs="0"/>
- *         </sequence>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResourceAccessStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
+ *         <sequence minOccurs="0">
+ *           <element name="ProxySubject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType"/>
+ *           <element ref="{urn:liberty:sec:2003-08}SessionContext" minOccurs="0"/>
+ *         </sequence>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextElement.java
index c201fb2f0b..867112d787 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SessionContext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 115)
- * 
                    
  * 
                    - * <element name="SessionContext" type="{urn:liberty:sec:2003-08}SessionContextType"/>
+ * <element name="SessionContext" type="{urn:liberty:sec:2003-08}SessionContextType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementElement.java
index 03ed27ca2f..1587681420 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SessionContextStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 130)
- * 
                    
  * 
                    - * <element name="SessionContextStatement" type="{urn:liberty:sec:2003-08}SessionContextStatementType"/>
+ * <element name="SessionContextStatement" type="{urn:liberty:sec:2003-08}SessionContextStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementType.java
index d7dfe0ea7c..eaa96cf124 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SessionContextStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 132)
- * 
                    
  * 
                    - * <complexType name="SessionContextStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <element name="ProxySubject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType" minOccurs="0"/>
- *         <element ref="{urn:liberty:sec:2003-08}SessionContext"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SessionContextStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <element name="ProxySubject" type="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectType" minOccurs="0"/>
+ *         <element ref="{urn:liberty:sec:2003-08}SessionContext"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextType.java
index 1a8c9908a0..ae07472cd3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/SessionContextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for SessionContextType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 116)
- * 
                    
  * 
                    - * <complexType name="SessionContextType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SessionSubject" type="{urn:liberty:iff:2003-08}SubjectType"/>
- *         <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
- *         <element ref="{urn:liberty:iff:2003-08}AuthnContext" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="AssertionIssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="AuthenticationInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SessionContextType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SessionSubject" type="{urn:liberty:iff:2003-08}SubjectType"/>
+ *         <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
+ *         <element ref="{urn:liberty:iff:2003-08}AuthnContext" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="AssertionIssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="AuthenticationInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionElement.java
index a4104c2397..e58f568a64 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ValidityRestrictionCondition element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 76)
- * 
                    
  * 
                    - * <element name="ValidityRestrictionCondition" type="{urn:liberty:sec:2003-08}ValidityRestrictionConditionType"/>
+ * <element name="ValidityRestrictionCondition" type="{urn:liberty:sec:2003-08}ValidityRestrictionConditionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionType.java
index 752ac112df..8838055b54 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/security/ValidityRestrictionConditionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for ValidityRestrictionConditionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-security-fmwk.xsd line 77)
- * 
                    
  * 
                    - * <complexType name="ValidityRestrictionConditionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
- *       <sequence>
- *         <element name="NumberOfUses" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ValidityRestrictionConditionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
+ *       <sequence>
+ *         <element name="NumberOfUses" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyElement.java
index 466b167efc..b4a796a3c5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Body element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 88)
- * 
                    
  * 
                    - * <element name="Body" type="{http://schemas.xmlsoap.org/soap/envelope/}BodyType"/>
+ * <element name="Body" type="{http://schemas.xmlsoap.org/soap/envelope/}BodyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyType.java
index bd53e809c9..4d9dbb0105 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/BodyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for BodyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 89)
- * 
                    
  * 
                    - * <complexType name="BodyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BodyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/Detail.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/Detail.java
index c1b815e5da..f989f20aea 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/Detail.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/Detail.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for detail complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 142)
- * 
                    
  * 
                    - * <complexType name="detail">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="detail">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeElement.java
index c221fbed47..0c7384cdd7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Envelope element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 70)
- * 
                    
  * 
                    - * <element name="Envelope" type="{http://schemas.xmlsoap.org/soap/envelope/}EnvelopeType"/>
+ * <element name="Envelope" type="{http://schemas.xmlsoap.org/soap/envelope/}EnvelopeType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeType.java
index f22d1c5957..dfa0898bd0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/EnvelopeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for EnvelopeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 71)
- * 
                    
  * 
                    - * <complexType name="EnvelopeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.xmlsoap.org/soap/envelope/}Header" minOccurs="0"/>
- *         <element ref="{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EnvelopeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://schemas.xmlsoap.org/soap/envelope/}Header" minOccurs="0"/>
+ *         <element ref="{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultElement.java
index 90adc6ed8a..9b969dba24 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Fault element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 127)
- * 
                    
  * 
                    - * <element name="Fault" type="{http://schemas.xmlsoap.org/soap/envelope/}FaultType"/>
+ * <element name="Fault" type="{http://schemas.xmlsoap.org/soap/envelope/}FaultType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultType.java
index 22523ddaab..f2fbeb20b3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/FaultType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,20 +15,19 @@
  * 
  * Java content class for FaultType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 128)
- * 
                    
  * 
                    - * <complexType name="FaultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="faultcode" type="{http://www.w3.org/2001/XMLSchema}QName"/>
- *         <element name="faultstring" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="faultactor" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="detail" type="{http://schemas.xmlsoap.org/soap/envelope/}detail" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FaultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="faultcode" type="{http://www.w3.org/2001/XMLSchema}QName"/>
+ *         <element name="faultstring" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="faultactor" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="detail" type="{http://schemas.xmlsoap.org/soap/envelope/}detail" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderElement.java
index fabb25c7ea..f207d80c4f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Header element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 80)
- * 
                    
  * 
                    - * <element name="Header" type="{http://schemas.xmlsoap.org/soap/envelope/}HeaderType"/>
+ * <element name="Header" type="{http://schemas.xmlsoap.org/soap/envelope/}HeaderType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderType.java
index 6898623f2f..23ce53eedb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/HeaderType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for HeaderType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/soap.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="HeaderType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="HeaderType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/ObjectFactory.java
index 0b646fb880..e33e943ba8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/soap/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -63,7 +64,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -82,7 +83,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -101,7 +102,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -113,7 +114,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of BodyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.BodyElement createBodyElement()
@@ -125,7 +126,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.BodyElement createBodyElemen
     /**
      * Create an instance of Detail
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.Detail createDetail()
@@ -137,7 +138,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.Detail createDetail()
     /**
      * Create an instance of BodyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.BodyType createBodyType()
@@ -149,7 +150,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.BodyType createBodyType()
     /**
      * Create an instance of FaultElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.FaultElement createFaultElement()
@@ -161,7 +162,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.FaultElement createFaultElem
     /**
      * Create an instance of HeaderType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.HeaderType createHeaderType()
@@ -173,7 +174,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.HeaderType createHeaderType(
     /**
      * Create an instance of FaultType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.FaultType createFaultType()
@@ -185,7 +186,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.FaultType createFaultType()
     /**
      * Create an instance of EnvelopeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.EnvelopeElement createEnvelopeElement()
@@ -197,7 +198,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.EnvelopeElement createEnvelo
     /**
      * Create an instance of EnvelopeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.EnvelopeType createEnvelopeType()
@@ -209,7 +210,7 @@ public com.sun.identity.liberty.ws.common.jaxb.soap.EnvelopeType createEnvelopeT
     /**
      * Create an instance of HeaderElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.soap.HeaderElement createHeaderElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedDateTime.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedDateTime.java
index 1c27dbf0d8..0cd4415244 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedDateTime.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedDateTime.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,16 +15,15 @@
  * 
  * Java content class for AttributedDateTime complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 75)
- * 
                    
  * 
                    - * <complexType name="AttributedDateTime">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedDateTime">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedURI.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedURI.java
index 9d1767b286..62b49c5c4a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedURI.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/AttributedURI.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,15 +15,14 @@
  * 
  * Java content class for AttributedURI complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 121)
- * 
                    
  * 
                    - * <complexType name="AttributedURI">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedURI">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/CreatedElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/CreatedElement.java
index d6c7ba1978..b72dfe4d81 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/CreatedElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/CreatedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Created element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 186)
- * 
                    
  * 
                    - * <element name="Created" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}AttributedDateTime"/>
+ * <element name="Created" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}AttributedDateTime"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ExpiresElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ExpiresElement.java
index b67420d335..a4c48387e1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ExpiresElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ExpiresElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Expires element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 179)
- * 
                    
  * 
                    - * <element name="Expires" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}AttributedDateTime"/>
+ * <element name="Expires" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}AttributedDateTime"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ObjectFactory.java
index 7e6ff72a16..090a0f7fce 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -65,7 +66,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -84,7 +85,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -103,7 +104,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -115,7 +116,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of CreatedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.CreatedElement createCreatedElement()
@@ -127,7 +128,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.CreatedElement createCrea
     /**
      * Create an instance of TimestampTraceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.TimestampTraceElement createTimestampTraceElement()
@@ -139,7 +140,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.TimestampTraceElement cre
     /**
      * Create an instance of ReceivedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.ReceivedElement createReceivedElement()
@@ -151,7 +152,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.ReceivedElement createRec
     /**
      * Create an instance of ReceivedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.ReceivedType createReceivedType()
@@ -163,7 +164,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.ReceivedType createReceiv
     /**
      * Create an instance of TimestampTraceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.TimestampTraceType createTimestampTraceType()
@@ -175,7 +176,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.TimestampTraceType create
     /**
      * Create an instance of AttributedDateTime
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.AttributedDateTime createAttributedDateTime()
@@ -187,7 +188,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.AttributedDateTime create
     /**
      * Create an instance of ExpiresElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.ExpiresElement createExpiresElement()
@@ -199,7 +200,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.ExpiresElement createExpi
     /**
      * Create an instance of TimestampElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.TimestampElement createTimestampElement()
@@ -211,7 +212,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.TimestampElement createTi
     /**
      * Create an instance of AttributedURI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.AttributedURI createAttributedURI()
@@ -223,7 +224,7 @@ public com.sun.identity.liberty.ws.common.jaxb.utility.AttributedURI createAttri
     /**
      * Create an instance of TimestampType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.utility.TimestampType createTimestampType()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedElement.java
index 3b8d72f4c7..432a4cede9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Received element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 193)
- * 
                    
  * 
                    - * <element name="Received" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}ReceivedType"/>
+ * <element name="Received" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}ReceivedType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedType.java
index 08e654a3e4..9e4b57ec84 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/ReceivedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,16 +15,15 @@
  * 
  * Java content class for ReceivedType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 96)
- * 
                    
  * 
                    - * <complexType name="ReceivedType">
- *   <simpleContent>
- *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/utility>AttributedDateTime">
- *       <attribute name="Actor" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Delay" type="{http://www.w3.org/2001/XMLSchema}int" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ReceivedType">
+ *   <simpleContent>
+ *     <extension base="<http://schemas.xmlsoap.org/ws/2003/06/utility>AttributedDateTime">
+ *       <attribute name="Actor" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Delay" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampElement.java
index ac527f6897..0df427f89d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -15,9 +16,8 @@
  * 
  * Java content class for Timestamp element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 149)
- * 
                    
  * 
                    - * <element name="Timestamp" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}TimestampType"/>
+ * <element name="Timestamp" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}TimestampType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceElement.java
index cf1034ff52..0b786db5a6 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for TimestampTrace element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 171)
- * 
                    
  * 
                    - * <element name="TimestampTrace" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}TimestampTraceType"/>
+ * <element name="TimestampTrace" type="{http://schemas.xmlsoap.org/ws/2003/06/utility}TimestampTraceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceType.java
index 5e07596a26..0b2dd6ada2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampTraceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,21 +15,20 @@
  * 
  * Java content class for TimestampTraceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 157)
- * 
                    
  * 
                    - * <complexType name="TimestampTraceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Received"/>
- *           <any/>
- *         </choice>
- *       </sequence>
- *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TimestampTraceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Received"/>
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampType.java
index bdeaab09f4..a6e828caaf 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/utility/TimestampType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -14,22 +15,21 @@
  * 
  * Java content class for TimestampType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/utility.xsd line 134)
- * 
                    
  * 
                    - * <complexType name="TimestampType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Created" minOccurs="0"/>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Expires" minOccurs="0"/>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <any/>
- *         </choice>
- *       </sequence>
- *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TimestampType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Created" minOccurs="0"/>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}Expires" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *       <attGroup ref="{http://schemas.xmlsoap.org/ws/2003/06/utility}commonAtts"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodElement.java
index 46e3e8f7b0..104f41d1ef 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AgreementMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 114)
- * 
                    
  * 
                    - * <element name="AgreementMethod" type="{http://www.w3.org/2001/04/xmlenc#}AgreementMethodType"/>
+ * <element name="AgreementMethod" type="{http://www.w3.org/2001/04/xmlenc#}AgreementMethodType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodType.java
index b93d4b9929..2cf3a87bef 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/AgreementMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for AgreementMethodType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 115)
- * 
                    
  * 
                    - * <complexType name="AgreementMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *         <any/>
- *         <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
- *         <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AgreementMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *         <any/>
+ *         <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
+ *         <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -82,9 +82,8 @@ public interface AgreementMethodType {
     /**
      * Java content class for KA-Nonce element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 117)
-     * 
                    
      * 
                    -     * <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                    
      * 
      */
@@ -117,9 +116,8 @@ public interface KANonce
     /**
      * Java content class for OriginatorKeyInfo element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 120)
-     * 
                    
      * 
                    -     * <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+     * <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
      * 
                    
      * 
      */
@@ -134,9 +132,8 @@ public interface OriginatorKeyInfo
     /**
      * Java content class for RecipientKeyInfo element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 121)
-     * 
                    
      * 
                    -     * <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+     * <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataElement.java
index 5b6000f200..ce79a005e0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CipherData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 67)
- * 
                    
  * 
                    - * <element name="CipherData" type="{http://www.w3.org/2001/04/xmlenc#}CipherDataType"/>
+ * <element name="CipherData" type="{http://www.w3.org/2001/04/xmlenc#}CipherDataType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataType.java
index 67d6938751..033171ccc2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for CipherDataType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="CipherDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="CipherValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherReference"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CipherDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="CipherValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherReference"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceElement.java
index 98bc646e4d..95f6e94574 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CipherReference element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 75)
- * 
                    
  * 
                    - * <element name="CipherReference" type="{http://www.w3.org/2001/04/xmlenc#}CipherReferenceType"/>
+ * <element name="CipherReference" type="{http://www.w3.org/2001/04/xmlenc#}CipherReferenceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceType.java
index 7c4b19db45..26d4a6942c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/CipherReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for CipherReferenceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 76)
- * 
                    
  * 
                    - * <complexType name="CipherReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="Transforms" type="{http://www.w3.org/2001/04/xmlenc#}TransformsType" minOccurs="0"/>
- *       </choice>
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CipherReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="Transforms" type="{http://www.w3.org/2001/04/xmlenc#}TransformsType" minOccurs="0"/>
+ *       </choice>
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataElement.java
index 629d8c3c7c..2586988a03 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 90)
- * 
                    
  * 
                    - * <element name="EncryptedData" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedDataType"/>
+ * <element name="EncryptedData" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedDataType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataType.java
index a8f07c37b0..362e0c6218 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for EncryptedDataType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 91)
- * 
                    
  * 
                    - * <complexType name="EncryptedDataType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedDataType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyElement.java
index 32d74a90af..da8c312a90 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedKey element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 100)
- * 
                    
  * 
                    - * <element name="EncryptedKey" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedKeyType"/>
+ * <element name="EncryptedKey" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedKeyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyType.java
index 73c866cfe4..40bbec2623 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedKeyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for EncryptedKeyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 101)
- * 
                    
  * 
                    - * <complexType name="EncryptedKeyType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}ReferenceList" minOccurs="0"/>
- *         <element name="CarriedKeyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedKeyType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}ReferenceList" minOccurs="0"/>
+ *         <element name="CarriedKeyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedType.java
index a519a8f9b4..2d5ce90585 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for EncryptedType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 40)
- * 
                    
  * 
                    - * <complexType name="EncryptedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncryptionMethod" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionMethodType" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherData"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperties" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncryptionMethod" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionMethodType" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherData"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperties" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionMethodType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionMethodType.java
index 2aca720a09..366e572b61 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionMethodType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for EncryptionMethodType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 54)
- * 
                    
  * 
                    - * <complexType name="EncryptionMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType" minOccurs="0"/>
- *         <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptionMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType" minOccurs="0"/>
+ *         <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -80,9 +80,8 @@ public interface EncryptionMethodType {
     /**
      * Java content class for KeySize element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 56)
-     * 
                    
      * 
                    -     * <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType"/>
+     * <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType"/>
      * 
                    
      * 
      */
@@ -115,9 +114,8 @@ public interface KeySize
     /**
      * Java content class for OAEPparams element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 57)
-     * 
                    
      * 
                    -     * <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesElement.java
index 3fa3c9a15a..3b4e4eb559 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptionProperties element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 145)
- * 
                    
  * 
                    - * <element name="EncryptionProperties" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertiesType"/>
+ * <element name="EncryptionProperties" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertiesType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesType.java
index 1677674830..46ae648710 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertiesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for EncryptionPropertiesType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 146)
- * 
                    
  * 
                    - * <complexType name="EncryptionPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptionPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperty" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyElement.java
index 78c9c53ecb..2018676e4e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptionProperty element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 153)
- * 
                    
  * 
                    - * <element name="EncryptionProperty" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertyType"/>
+ * <element name="EncryptionProperty" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyType.java
index 79c3894b3d..60afb5dfbe 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/EncryptionPropertyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for EncryptionPropertyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 154)
- * 
                    
  * 
                    - * <complexType name="EncryptionPropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Target" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptionPropertyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Target" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ObjectFactory.java
index cad4be6744..28076e7250 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -85,7 +86,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -104,7 +105,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -123,7 +124,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -135,7 +136,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of AgreementMethodTypeOriginatorKeyInfo
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.OriginatorKeyInfo createAgreementMethodTypeOriginatorKeyInfo()
@@ -147,7 +148,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.Origin
     /**
      * Create an instance of AgreementMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodElement createAgreementMethodElement()
@@ -159,7 +160,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodElement cre
     /**
      * Create an instance of ReferenceListTypeKeyReference
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListType.KeyReference createReferenceListTypeKeyReference()
@@ -171,7 +172,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListType.KeyRefer
     /**
      * Create an instance of EncryptedKeyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedKeyType createEncryptedKeyType()
@@ -183,7 +184,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedKeyType createEnc
     /**
      * Create an instance of EncryptionPropertyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertyElement createEncryptionPropertyElement()
@@ -195,7 +196,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertyElement
     /**
      * Create an instance of ReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceType createReferenceType()
@@ -207,7 +208,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceType createRefere
     /**
      * Create an instance of EncryptedDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedDataType createEncryptedDataType()
@@ -219,7 +220,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedDataType createEn
     /**
      * Create an instance of AgreementMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType createAgreementMethodType()
@@ -231,7 +232,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType create
     /**
      * Create an instance of TransformsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.TransformsType createTransformsType()
@@ -243,7 +244,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.TransformsType createTrans
     /**
      * Create an instance of EncryptedDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedDataElement createEncryptedDataElement()
@@ -255,7 +256,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedDataElement creat
     /**
      * Create an instance of EncryptionMethodTypeOAEPparams
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.OAEPparams createEncryptionMethodTypeOAEPparams()
@@ -267,7 +268,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.OAEPp
     /**
      * Create an instance of EncryptionMethodTypeOAEPparams
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.OAEPparams createEncryptionMethodTypeOAEPparams(byte[] value)
@@ -279,7 +280,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.OAEPp
     /**
      * Create an instance of EncryptionPropertiesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertiesElement createEncryptionPropertiesElement()
@@ -291,7 +292,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertiesElemen
     /**
      * Create an instance of CipherDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherDataElement createCipherDataElement()
@@ -303,7 +304,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherDataElement createCi
     /**
      * Create an instance of ReferenceListType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListType createReferenceListType()
@@ -315,7 +316,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListType createRe
     /**
      * Create an instance of AgreementMethodTypeKANonce
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.KANonce createAgreementMethodTypeKANonce()
@@ -327,7 +328,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.KANonc
     /**
      * Create an instance of AgreementMethodTypeKANonce
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.KANonce createAgreementMethodTypeKANonce(byte[] value)
@@ -339,7 +340,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.KANonc
     /**
      * Create an instance of EncryptionMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType createEncryptionMethodType()
@@ -351,7 +352,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType creat
     /**
      * Create an instance of CipherDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherDataType createCipherDataType()
@@ -363,7 +364,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherDataType createCiphe
     /**
      * Create an instance of EncryptionPropertiesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertiesType createEncryptionPropertiesType()
@@ -375,7 +376,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertiesType c
     /**
      * Create an instance of CipherReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherReferenceType createCipherReferenceType()
@@ -387,7 +388,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherReferenceType create
     /**
      * Create an instance of ReferenceListTypeDataReference
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListType.DataReference createReferenceListTypeDataReference()
@@ -399,7 +400,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListType.DataRefe
     /**
      * Create an instance of AgreementMethodTypeRecipientKeyInfo
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.RecipientKeyInfo createAgreementMethodTypeRecipientKeyInfo()
@@ -411,7 +412,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.AgreementMethodType.Recipi
     /**
      * Create an instance of EncryptionMethodTypeKeySize
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.KeySize createEncryptionMethodTypeKeySize()
@@ -423,7 +424,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.KeySi
     /**
      * Create an instance of EncryptionMethodTypeKeySize
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.KeySize createEncryptionMethodTypeKeySize(java.math.BigInteger value)
@@ -435,7 +436,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionMethodType.KeySi
     /**
      * Create an instance of EncryptionPropertyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertyType createEncryptionPropertyType()
@@ -447,7 +448,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptionPropertyType cre
     /**
      * Create an instance of CipherReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherReferenceElement createCipherReferenceElement()
@@ -459,7 +460,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.CipherReferenceElement cre
     /**
      * Create an instance of EncryptedKeyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedKeyElement createEncryptedKeyElement()
@@ -471,7 +472,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedKeyElement create
     /**
      * Create an instance of ReferenceListElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListElement createReferenceListElement()
@@ -483,7 +484,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlenc.ReferenceListElement creat
     /**
      * Create an instance of EncryptedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlenc.EncryptedType createEncryptedType()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListElement.java
index dfa6a55868..9db83bc691 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ReferenceList element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 128)
- * 
                    
  * 
                    - * <element name="ReferenceList">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <choice maxOccurs="unbounded">
- *           <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *           <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *         </choice>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="ReferenceList">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <choice maxOccurs="unbounded">
+ *           <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *           <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *         </choice>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListType.java
index d6c10c3675..5f32429b9b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceListType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 129)
- * 
                    
  * 
                    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *         <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *         <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -58,9 +58,8 @@ public interface ReferenceListType {
     /**
      * Java content class for DataReference element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 131)
-     * 
                    
      * 
                    -     * <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+     * <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
      * 
                    
      * 
      */
@@ -75,9 +74,8 @@ public interface DataReference
     /**
      * Java content class for KeyReference element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 132)
-     * 
                    
      * 
                    -     * <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+     * <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceType.java
index 8e8803c6dc..da318965dd 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/ReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ReferenceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 137)
- * 
                    
  * 
                    - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/TransformsType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/TransformsType.java
index baf47b66ec..ace0201abf 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/TransformsType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlenc/TransformsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for TransformsType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xenc-schema.xsd line 83)
- * 
                    
  * 
                    - * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodElement.java
index 0ceb4f62bb..e146fb2fea 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CanonicalizationMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 77)
- * 
                    
  * 
                    - * <element name="CanonicalizationMethod" type="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethodType"/>
+ * <element name="CanonicalizationMethod" type="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethodType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodType.java
index 84963c4b20..8249eb2ef1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/CanonicalizationMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for CanonicalizationMethodType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 78)
- * 
                    
  * 
                    - * <complexType name="CanonicalizationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CanonicalizationMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueElement.java
index 2afb572337..ff33c13e45 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DSAKeyValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 291)
- * 
                    
  * 
                    - * <element name="DSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValueType"/>
+ * <element name="DSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValueType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueType.java
index 916078c420..1deca0fd96 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DSAKeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for DSAKeyValueType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 292)
- * 
                    
  * 
                    - * <complexType name="DSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <sequence minOccurs="0">
- *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <sequence minOccurs="0">
- *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <sequence minOccurs="0">
+ *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <sequence minOccurs="0">
+ *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodElement.java
index 5ca5253106..af7387af4e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DigestMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 129)
- * 
                    
  * 
                    - * <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
+ * <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodType.java
index b4e7a33fa6..396237c1a9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for DigestMethodType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 130)
- * 
                    
  * 
                    - * <complexType name="DigestMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestValueElement.java
index f700827f14..5af424126b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/DigestValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DigestValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 137)
- * 
                    
  * 
                    - * <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
+ * <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoElement.java
index 15ccf1eb2d..acedae37a9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyInfo element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 146)
- * 
                    
  * 
                    - * <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ * <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoType.java
index 5cb7b83ebc..905c56782d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for KeyInfoType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 147)
- * 
                    
  * 
                    - * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyNameElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyNameElement.java
index b9484a23f4..7ccfa90656 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyNameElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyName element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 162)
- * 
                    
  * 
                    - * <element name="KeyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="KeyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueElement.java
index f353fa1956..09f1690152 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 165)
- * 
                    
  * 
                    - * <element name="KeyValue" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType"/>
+ * <element name="KeyValue" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueType.java
index ec768f4b3d..3ee34f4282 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/KeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for KeyValueType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 166)
- * 
                    
  * 
                    - * <complexType name="KeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         <any/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
+ *         <any/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestElement.java
index 4c959672ea..dd7877e684 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Manifest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 255)
- * 
                    
  * 
                    - * <element name="Manifest" type="{http://www.w3.org/2000/09/xmldsig#}ManifestType"/>
+ * <element name="Manifest" type="{http://www.w3.org/2000/09/xmldsig#}ManifestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestType.java
index ff0f0aa732..9dba4a3aa7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ManifestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ManifestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 256)
- * 
                    
  * 
                    - * <complexType name="ManifestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/MgmtDataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/MgmtDataElement.java
index f848362b36..3ed2e52878 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/MgmtDataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/MgmtDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MgmtData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 163)
- * 
                    
  * 
                    - * <element name="MgmtData" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="MgmtData" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectElement.java
index 6ea9004ed2..dd598ec237 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Object element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 245)
- * 
                    
  * 
                    - * <element name="Object" type="{http://www.w3.org/2000/09/xmldsig#}ObjectType"/>
+ * <element name="Object" type="{http://www.w3.org/2000/09/xmldsig#}ObjectType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectFactory.java
index f841d99f46..52d2db0de5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -128,7 +129,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -147,7 +148,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -166,7 +167,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -178,7 +179,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of DigestMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestMethodElement createDigestMethodElement()
@@ -190,7 +191,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestMethodElement create
     /**
      * Create an instance of RetrievalMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.RetrievalMethodElement createRetrievalMethodElement()
@@ -202,7 +203,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.RetrievalMethodElement cre
     /**
      * Create an instance of X509DataTypeX509SubjectName
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SubjectName createX509DataTypeX509SubjectName()
@@ -214,7 +215,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SubjectNa
     /**
      * Create an instance of X509DataTypeX509SubjectName
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SubjectName createX509DataTypeX509SubjectName(java.lang.String value)
@@ -226,7 +227,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SubjectNa
     /**
      * Create an instance of ReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ReferenceType createReferenceType()
@@ -238,7 +239,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ReferenceType createRefere
     /**
      * Create an instance of SignatureType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureType createSignatureType()
@@ -250,7 +251,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureType createSignat
     /**
      * Create an instance of KeyInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyInfoElement createKeyInfoElement()
@@ -262,7 +263,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyInfoElement createKeyIn
     /**
      * Create an instance of X509DataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType createX509DataType()
@@ -274,7 +275,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType createX509Dat
     /**
      * Create an instance of DSAKeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DSAKeyValueType createDSAKeyValueType()
@@ -286,7 +287,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DSAKeyValueType createDSAK
     /**
      * Create an instance of TransformElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformElement createTransformElement()
@@ -298,7 +299,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformElement createTra
     /**
      * Create an instance of TransformsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformsElement createTransformsElement()
@@ -310,7 +311,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformsElement createTr
     /**
      * Create an instance of SignaturePropertyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertyElement createSignaturePropertyElement()
@@ -322,7 +323,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertyElement c
     /**
      * Create an instance of DSAKeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DSAKeyValueElement createDSAKeyValueElement()
@@ -334,7 +335,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DSAKeyValueElement createD
     /**
      * Create an instance of KeyInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyInfoType createKeyInfoType()
@@ -346,7 +347,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyInfoType createKeyInfoT
     /**
      * Create an instance of SPKIDataTypeSPKISexp
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTypeSPKISexp()
@@ -358,7 +359,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataType.SPKISexp crea
     /**
      * Create an instance of SPKIDataTypeSPKISexp
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTypeSPKISexp(byte[] value)
@@ -370,7 +371,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataType.SPKISexp crea
     /**
      * Create an instance of SignatureMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodElement createSignatureMethodElement()
@@ -382,7 +383,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodElement cre
     /**
      * Create an instance of SignaturePropertyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertyType createSignaturePropertyType()
@@ -394,7 +395,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertyType crea
     /**
      * Create an instance of SignatureValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureValueElement createSignatureValueElement()
@@ -406,7 +407,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureValueElement crea
     /**
      * Create an instance of ObjectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectElement createObjectElement()
@@ -418,7 +419,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectElement createObject
     /**
      * Create an instance of ManifestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ManifestType createManifestType()
@@ -430,7 +431,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ManifestType createManifes
     /**
      * Create an instance of SignatureMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodType createSignatureMethodType()
@@ -442,7 +443,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodType create
     /**
      * Create an instance of RSAKeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.RSAKeyValueElement createRSAKeyValueElement()
@@ -454,7 +455,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.RSAKeyValueElement createR
     /**
      * Create an instance of SPKIDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataElement createSPKIDataElement()
@@ -466,7 +467,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataElement createSPKI
     /**
      * Create an instance of X509DataTypeX509SKI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SKI createX509DataTypeX509SKI()
@@ -478,7 +479,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SKI creat
     /**
      * Create an instance of X509DataTypeX509SKI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SKI createX509DataTypeX509SKI(byte[] value)
@@ -490,7 +491,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509SKI creat
     /**
      * Create an instance of X509DataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataElement createX509DataElement()
@@ -502,7 +503,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataElement createX509
     /**
      * Create an instance of SignatureValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureValueType createSignatureValueType()
@@ -514,7 +515,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureValueType createS
     /**
      * Create an instance of CanonicalizationMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.CanonicalizationMethodElement createCanonicalizationMethodElement()
@@ -526,7 +527,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.CanonicalizationMethodElem
     /**
      * Create an instance of DigestValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestValueElement createDigestValueElement()
@@ -538,7 +539,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestValueElement createD
     /**
      * Create an instance of DigestValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestValueElement createDigestValueElement(byte[] value)
@@ -550,7 +551,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestValueElement createD
     /**
      * Create an instance of X509DataTypeX509Certificate
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509Certificate createX509DataTypeX509Certificate()
@@ -562,7 +563,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509Certifica
     /**
      * Create an instance of X509DataTypeX509Certificate
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509Certificate createX509DataTypeX509Certificate(byte[] value)
@@ -574,7 +575,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509Certifica
     /**
      * Create an instance of SignedInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignedInfoType createSignedInfoType()
@@ -586,7 +587,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignedInfoType createSigne
     /**
      * Create an instance of TransformsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformsType createTransformsType()
@@ -598,7 +599,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformsType createTrans
     /**
      * Create an instance of ObjectType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectType createObjectType()
@@ -610,7 +611,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ObjectType createObjectTyp
     /**
      * Create an instance of PGPDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.PGPDataElement createPGPDataElement()
@@ -622,7 +623,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.PGPDataElement createPGPDa
     /**
      * Create an instance of DigestMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestMethodType createDigestMethodType()
@@ -634,7 +635,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.DigestMethodType createDig
     /**
      * Create an instance of X509IssuerSerialType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509IssuerSerialType createX509IssuerSerialType()
@@ -646,7 +647,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509IssuerSerialType creat
     /**
      * Create an instance of RetrievalMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.RetrievalMethodType createRetrievalMethodType()
@@ -658,7 +659,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.RetrievalMethodType create
     /**
      * Create an instance of KeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyValueType createKeyValueType()
@@ -670,7 +671,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyValueType createKeyValu
     /**
      * Create an instance of TransformType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformType createTransformType()
@@ -682,7 +683,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformType createTransf
     /**
      * Create an instance of PGPDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.PGPDataType createPGPDataType()
@@ -694,7 +695,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.PGPDataType createPGPDataT
     /**
      * Create an instance of SPKIDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataType createSPKIDataType()
@@ -706,7 +707,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SPKIDataType createSPKIDat
     /**
      * Create an instance of CanonicalizationMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.CanonicalizationMethodType createCanonicalizationMethodType()
@@ -718,7 +719,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.CanonicalizationMethodType
     /**
      * Create an instance of TransformTypeXPath
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformType.XPath createTransformTypeXPath()
@@ -730,7 +731,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformType.XPath create
     /**
      * Create an instance of TransformTypeXPath
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformType.XPath createTransformTypeXPath(java.lang.String value)
@@ -742,7 +743,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.TransformType.XPath create
     /**
      * Create an instance of KeyNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyNameElement createKeyNameElement()
@@ -754,7 +755,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyNameElement createKeyNa
     /**
      * Create an instance of KeyNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyNameElement createKeyNameElement(java.lang.String value)
@@ -766,7 +767,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyNameElement createKeyNa
     /**
      * Create an instance of X509DataTypeX509IssuerSerial
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509IssuerSerial createX509DataTypeX509IssuerSerial()
@@ -778,7 +779,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509IssuerSer
     /**
      * Create an instance of SignedInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignedInfoElement createSignedInfoElement()
@@ -790,7 +791,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignedInfoElement createSi
     /**
      * Create an instance of ManifestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ManifestElement createManifestElement()
@@ -802,7 +803,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ManifestElement createMani
     /**
      * Create an instance of MgmtDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.MgmtDataElement createMgmtDataElement()
@@ -814,7 +815,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.MgmtDataElement createMgmt
     /**
      * Create an instance of MgmtDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.MgmtDataElement createMgmtDataElement(java.lang.String value)
@@ -826,7 +827,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.MgmtDataElement createMgmt
     /**
      * Create an instance of SignaturePropertiesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertiesElement createSignaturePropertiesElement()
@@ -838,7 +839,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertiesElement
     /**
      * Create an instance of KeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyValueElement createKeyValueElement()
@@ -850,7 +851,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.KeyValueElement createKeyV
     /**
      * Create an instance of SignatureMethodTypeHMACOutputLength
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodType.HMACOutputLength createSignatureMethodTypeHMACOutputLength()
@@ -862,7 +863,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodType.HMACOu
     /**
      * Create an instance of SignatureMethodTypeHMACOutputLength
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodType.HMACOutputLength createSignatureMethodTypeHMACOutputLength(java.math.BigInteger value)
@@ -874,7 +875,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureMethodType.HMACOu
     /**
      * Create an instance of SignaturePropertiesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertiesType createSignaturePropertiesType()
@@ -886,7 +887,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignaturePropertiesType cr
     /**
      * Create an instance of X509DataTypeX509CRL
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509CRL createX509DataTypeX509CRL()
@@ -898,7 +899,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509CRL creat
     /**
      * Create an instance of X509DataTypeX509CRL
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509CRL createX509DataTypeX509CRL(byte[] value)
@@ -910,7 +911,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.X509DataType.X509CRL creat
     /**
      * Create an instance of ReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ReferenceElement createReferenceElement()
@@ -922,7 +923,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.ReferenceElement createRef
     /**
      * Create an instance of SignatureElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureElement createSignatureElement()
@@ -934,7 +935,7 @@ public com.sun.identity.liberty.ws.common.jaxb.xmlsig.SignatureElement createSig
     /**
      * Create an instance of RSAKeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.common.jaxb.xmlsig.RSAKeyValueType createRSAKeyValueType()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectType.java
index 3079e3b3aa..1baa644203 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ObjectType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ObjectType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 246)
- * 
                    
  * 
                    - * <complexType name="ObjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </sequence>
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataElement.java
index 91a95f8dcf..3bff870deb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PGPData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 210)
- * 
                    
  * 
                    - * <element name="PGPData" type="{http://www.w3.org/2000/09/xmldsig#}PGPDataType"/>
+ * <element name="PGPData" type="{http://www.w3.org/2000/09/xmldsig#}PGPDataType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataType.java
index ffee012d61..fdfcb8d2e1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/PGPDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for PGPDataType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 211)
- * 
                    
  * 
                    - * <complexType name="PGPDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *           <any/>
- *         </sequence>
- *         <sequence>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PGPDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *           <any/>
+ *         </sequence>
+ *         <sequence>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </sequence>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueElement.java
index 700c90d4b6..1403e4489c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RSAKeyValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 308)
- * 
                    
  * 
                    - * <element name="RSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValueType"/>
+ * <element name="RSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValueType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueType.java
index 0edbcf8184..1e5d917761 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RSAKeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for RSAKeyValueType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 309)
- * 
                    
  * 
                    - * <complexType name="RSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceElement.java
index a47932d315..8042a0e7b1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Reference element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 98)
- * 
                    
  * 
                    - * <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
+ * <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceType.java
index c56636b106..3846221d84 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/ReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for ReferenceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 99)
- * 
                    
  * 
                    - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodElement.java
index 7a96af0f26..e7910953e1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RetrievalMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 174)
- * 
                    
  * 
                    - * <element name="RetrievalMethod" type="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethodType"/>
+ * <element name="RetrievalMethod" type="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethodType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodType.java
index 1d76a60cd2..9482c82862 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/RetrievalMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for RetrievalMethodType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 175)
- * 
                    
  * 
                    - * <complexType name="RetrievalMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RetrievalMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataElement.java
index 8ceee94abf..252456c437 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPKIData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 231)
- * 
                    
  * 
                    - * <element name="SPKIData" type="{http://www.w3.org/2000/09/xmldsig#}SPKIDataType"/>
+ * <element name="SPKIData" type="{http://www.w3.org/2000/09/xmldsig#}SPKIDataType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataType.java
index 39dfd024dd..4bd3702736 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SPKIDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SPKIDataType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 232)
- * 
                    
  * 
                    - * <complexType name="SPKIDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPKIDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -58,9 +58,8 @@ public interface SPKIDataType {
     /**
      * Java content class for SPKISexp element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 234)
-     * 
                    
      * 
                    -     * <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureElement.java
index d45b19ac1e..97eca20694 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Signature element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 45)
- * 
                    
  * 
                    - * <element name="Signature" type="{http://www.w3.org/2000/09/xmldsig#}SignatureType"/>
+ * <element name="Signature" type="{http://www.w3.org/2000/09/xmldsig#}SignatureType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodElement.java
index 5d55e2cb5f..a48a954220 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 86)
- * 
                    
  * 
                    - * <element name="SignatureMethod" type="{http://www.w3.org/2000/09/xmldsig#}SignatureMethodType"/>
+ * <element name="SignatureMethod" type="{http://www.w3.org/2000/09/xmldsig#}SignatureMethodType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodType.java
index 078cb5061d..d010bdcc58 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SignatureMethodType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 87)
- * 
                    
  * 
                    - * <complexType name="SignatureMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -78,9 +78,8 @@ public interface SignatureMethodType {
     /**
      * Java content class for HMACOutputLength element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 89)
-     * 
                    
      * 
                    -     * <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"/>
+     * <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesElement.java
index 15f92655ce..6d0dcd7890 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureProperties element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 263)
- * 
                    
  * 
                    - * <element name="SignatureProperties" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertiesType"/>
+ * <element name="SignatureProperties" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertiesType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesType.java
index 05348637aa..3c96e1bc1d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertiesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SignaturePropertiesType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 264)
- * 
                    
  * 
                    - * <complexType name="SignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyElement.java
index 28479d3168..3299bee719 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureProperty element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 271)
- * 
                    
  * 
                    - * <element name="SignatureProperty" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertyType"/>
+ * <element name="SignatureProperty" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyType.java
index 36495ae4f7..4e870d3567 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignaturePropertyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SignaturePropertyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 272)
- * 
                    
  * 
                    - * <complexType name="SignaturePropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureType.java
index 3015ca3e1f..36c9314ae7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for SignatureType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 46)
- * 
                    
  * 
                    - * <complexType name="SignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueElement.java
index eec5d101f2..831e72ffdd 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 56)
- * 
                    
  * 
                    - * <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
+ * <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueType.java
index 66dc156999..4ab75e030a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignatureValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for SignatureValueType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="SignatureValueType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="SignatureValueType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoElement.java
index 8e756e5ad2..94b01c8777 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignedInfo element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 67)
- * 
                    
  * 
                    - * <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
+ * <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoType.java
index 0d3e079905..7f5d7e2949 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/SignedInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for SignedInfoType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformElement.java
index 0a903f8935..33c202eff3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Transform element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 117)
- * 
                    
  * 
                    - * <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType"/>
+ * <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformType.java
index 31c4799b54..a398520d37 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for TransformType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 118)
- * 
                    
  * 
                    - * <complexType name="TransformType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </choice>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </choice>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -78,9 +78,8 @@ public interface TransformType {
     /**
      * Java content class for XPath element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 122)
-     * 
                    
      * 
                    -     * <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     * <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsElement.java
index f8b1fcef24..16cb4836d8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Transforms element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 110)
- * 
                    
  * 
                    - * <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
+ * <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsType.java
index 187b6de7c0..52c3213c84 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/TransformsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for TransformsType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 111)
- * 
                    
  * 
                    - * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataElement.java
index a06c92a684..095100e777 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for X509Data element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 185)
- * 
                    
  * 
                    - * <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
+ * <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataType.java
index 786ff51c24..4064f90bd1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509DataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for X509DataType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 186)
- * 
                    
  * 
                    - * <complexType name="X509DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <choice>
- *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509DataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <choice>
+ *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -68,9 +68,8 @@ public interface X509DataType {
     /**
      * Java content class for X509CRL element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 193)
-     * 
                    
      * 
                    -     * <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                    
      * 
      */
@@ -103,9 +102,8 @@ public interface X509CRL
     /**
      * Java content class for X509Certificate element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 192)
-     * 
                    
      * 
                    -     * <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                    
      * 
      */
@@ -138,9 +136,8 @@ public interface X509Certificate
     /**
      * Java content class for X509IssuerSerial element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 189)
-     * 
                    
      * 
                    -     * <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+     * <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
      * 
                    
      * 
      */
@@ -155,9 +152,8 @@ public interface X509IssuerSerial
     /**
      * Java content class for X509SKI element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 190)
-     * 
                    
      * 
                    -     * <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                    
      * 
      */
@@ -190,9 +186,8 @@ public interface X509SKI
     /**
      * Java content class for X509SubjectName element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 191)
-     * 
                    
      * 
                    -     * <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     * <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509IssuerSerialType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509IssuerSerialType.java
index 99d911cf52..c9c52c592d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509IssuerSerialType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/common/jaxb/xmlsig/X509IssuerSerialType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for X509IssuerSerialType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/xmldsig-core-schema.xsd line 199)
- * 
                    
  * 
                    - * <complexType name="X509IssuerSerialType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509IssuerSerialType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateRequesterElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateRequesterElement.java
index 77fe9c9e20..117ef3c7b8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateRequesterElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateRequesterElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthenticateRequester element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 178)
- * 
                    
  * 
                    - * <element name="AuthenticateRequester" type="{urn:liberty:disco:2003-08}DirectiveType"/>
+ * <element name="AuthenticateRequester" type="{urn:liberty:disco:2003-08}DirectiveType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateSessionContextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateSessionContextElement.java
index c2c2797686..4f6ae8cb02 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateSessionContextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthenticateSessionContextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthenticateSessionContext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 180)
- * 
                    
  * 
                    - * <element name="AuthenticateSessionContext" type="{urn:liberty:disco:2003-08}DirectiveType"/>
+ * <element name="AuthenticateSessionContext" type="{urn:liberty:disco:2003-08}DirectiveType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthorizeRequesterElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthorizeRequesterElement.java
index 3adf44fd6b..53d1e20499 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthorizeRequesterElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/AuthorizeRequesterElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthorizeRequester element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 179)
- * 
                    
  * 
                    - * <element name="AuthorizeRequester" type="{urn:liberty:disco:2003-08}DirectiveType"/>
+ * <element name="AuthorizeRequester" type="{urn:liberty:disco:2003-08}DirectiveType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DescriptionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DescriptionType.java
index d3d8e16cde..1858ad97b5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DescriptionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DescriptionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for DescriptionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 78)
- * 
                    
  * 
                    - * <complexType name="DescriptionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *         <element name="CredentialRef" type="{http://www.w3.org/2001/XMLSchema}IDREF" maxOccurs="unbounded" minOccurs="0"/>
- *         <choice>
- *           <group ref="{urn:liberty:disco:2003-08}WsdlRef"/>
- *           <group ref="{urn:liberty:disco:2003-08}BriefSoapHttpDescription"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DescriptionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *         <element name="CredentialRef" type="{http://www.w3.org/2001/XMLSchema}IDREF" maxOccurs="unbounded" minOccurs="0"/>
+ *         <choice>
+ *           <group ref="{urn:liberty:disco:2003-08}WsdlRef"/>
+ *           <group ref="{urn:liberty:disco:2003-08}BriefSoapHttpDescription"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DirectiveType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DirectiveType.java
index 252bcd7eda..6e4a1fb49b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DirectiveType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/DirectiveType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for DirectiveType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 175)
- * 
                    
  * 
                    - * <complexType name="DirectiveType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="descriptionIDRefs" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DirectiveType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="descriptionIDRefs" type="{http://www.w3.org/2001/XMLSchema}IDREFS" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EmptyType.java
index 600606a3a5..21963d5a78 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptResourceIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptResourceIDElement.java
index 617be2a89d..8e5fd71963 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptResourceIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptResourceIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptResourceID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 181)
- * 
                    
  * 
                    - * <element name="EncryptResourceID" type="{urn:liberty:disco:2003-08}DirectiveType"/>
+ * <element name="EncryptResourceID" type="{urn:liberty:disco:2003-08}DirectiveType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDElement.java
index 032b1ae244..1c0ef24bba 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedResourceID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 61)
- * 
                    
  * 
                    - * <element name="EncryptedResourceID" type="{urn:liberty:disco:2003-08}EncryptedResourceIDType"/>
+ * <element name="EncryptedResourceID" type="{urn:liberty:disco:2003-08}EncryptedResourceIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDType.java
index cd5e06cbea..3e113cdec6 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/EncryptedResourceIDType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for EncryptedResourceIDType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 53)
- * 
                    
  * 
                    - * <complexType name="EncryptedResourceIDType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedResourceIDType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionElement.java
index bfb3e5c6fb..4378b791ed 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:disco:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:disco:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionType.java
index 49993a8233..cddd1745d2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/InsertEntryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/InsertEntryType.java
index a3f42c8699..78e3682c04 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/InsertEntryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/InsertEntryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for InsertEntryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 155)
- * 
                    
  * 
                    - * <complexType name="InsertEntryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InsertEntryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyElement.java
index b6d269831d..a56acbe489 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Modify element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 166)
- * 
                    
  * 
                    - * <element name="Modify" type="{urn:liberty:disco:2003-08}ModifyType"/>
+ * <element name="Modify" type="{urn:liberty:disco:2003-08}ModifyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseElement.java
index 3d052e54f0..556577649a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ModifyResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 182)
- * 
                    
  * 
                    - * <element name="ModifyResponse" type="{urn:liberty:disco:2003-08}ModifyResponseType"/>
+ * <element name="ModifyResponse" type="{urn:liberty:disco:2003-08}ModifyResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseType.java
index 5afe9a208d..18c01278b0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for ModifyResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 183)
- * 
                    
  * 
                    - * <complexType name="ModifyResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}Status"/>
- *         <element ref="{urn:liberty:disco:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="newEntryIDs">
- *         <simpleType>
- *           <list itemType="{urn:liberty:disco:2003-08}IDReferenceType" />
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ModifyResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}Status"/>
+ *         <element ref="{urn:liberty:disco:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="newEntryIDs">
+ *         <simpleType>
+ *           <list itemType="{urn:liberty:disco:2003-08}IDReferenceType" />
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyType.java
index 9715e27ca9..97789addd5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ModifyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ModifyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 167)
- * 
                    
  * 
                    - * <complexType name="ModifyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
- *         <element name="InsertEntry" type="{urn:liberty:disco:2003-08}InsertEntryType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="RemoveEntry" type="{urn:liberty:disco:2003-08}RemoveEntryType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ModifyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
+ *         <element name="InsertEntry" type="{urn:liberty:disco:2003-08}InsertEntryType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="RemoveEntry" type="{urn:liberty:disco:2003-08}RemoveEntryType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ObjectFactory.java
index cd46e29ad0..1d4a5b626e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -98,7 +99,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -117,7 +118,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -136,7 +137,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -148,7 +149,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of ResourceOfferingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ResourceOfferingElement createResourceOfferingElement()
@@ -160,7 +161,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ResourceOfferingElement createReso
     /**
      * Create an instance of QueryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.QueryElement createQueryElement()
@@ -172,7 +173,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.QueryElement createQueryElement()
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.EmptyType createEmptyType()
@@ -184,7 +185,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.EmptyType createEmptyType()
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.StatusType createStatusType()
@@ -196,7 +197,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.StatusType createStatusType()
     /**
      * Create an instance of QueryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.QueryType createQueryType()
@@ -208,7 +209,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.QueryType createQueryType()
     /**
      * Create an instance of ModifyResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ModifyResponseElement createModifyResponseElement()
@@ -220,7 +221,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ModifyResponseElement createModify
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ExtensionElement createExtensionElement()
@@ -232,7 +233,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ExtensionElement createExtensionEl
     /**
      * Create an instance of OptionsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.OptionsType createOptionsType()
@@ -244,7 +245,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.OptionsType createOptionsType()
     /**
      * Create an instance of AuthenticateSessionContextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.AuthenticateSessionContextElement createAuthenticateSessionContextElement()
@@ -256,7 +257,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.AuthenticateSessionContextElement
     /**
      * Create an instance of ModifyResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ModifyResponseType createModifyResponseType()
@@ -268,7 +269,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ModifyResponseType createModifyRes
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ExtensionType createExtensionType()
@@ -280,7 +281,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ExtensionType createExtensionType(
     /**
      * Create an instance of ResourceIDType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ResourceIDType createResourceIDType()
@@ -292,7 +293,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ResourceIDType createResourceIDTyp
     /**
      * Create an instance of AuthenticateRequesterElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.AuthenticateRequesterElement createAuthenticateRequesterElement()
@@ -304,7 +305,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.AuthenticateRequesterElement creat
     /**
      * Create an instance of EncryptedResourceIDType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.EncryptedResourceIDType createEncryptedResourceIDType()
@@ -316,7 +317,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.EncryptedResourceIDType createEncr
     /**
      * Create an instance of RemoveEntryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.RemoveEntryType createRemoveEntryType()
@@ -328,7 +329,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.RemoveEntryType createRemoveEntryT
     /**
      * Create an instance of ServiceTypeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ServiceTypeElement createServiceTypeElement()
@@ -340,7 +341,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ServiceTypeElement createServiceTy
     /**
      * Create an instance of ServiceTypeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ServiceTypeElement createServiceTypeElement(java.lang.String value)
@@ -352,7 +353,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ServiceTypeElement createServiceTy
     /**
      * Create an instance of ResourceOfferingType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ResourceOfferingType createResourceOfferingType()
@@ -364,7 +365,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ResourceOfferingType createResourc
     /**
      * Create an instance of DescriptionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.DescriptionType createDescriptionType()
@@ -376,7 +377,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.DescriptionType createDescriptionT
     /**
      * Create an instance of EncryptedResourceIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.EncryptedResourceIDElement createEncryptedResourceIDElement()
@@ -388,7 +389,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.EncryptedResourceIDElement createE
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.StatusElement createStatusElement()
@@ -400,7 +401,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.StatusElement createStatusElement(
     /**
      * Create an instance of EncryptResourceIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.EncryptResourceIDElement createEncryptResourceIDElement()
@@ -412,7 +413,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.EncryptResourceIDElement createEnc
     /**
      * Create an instance of QueryTypeRequestedServiceTypeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.QueryType.RequestedServiceTypeType createQueryTypeRequestedServiceTypeType()
@@ -424,7 +425,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.QueryType.RequestedServiceTypeType
     /**
      * Create an instance of QueryResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.QueryResponseElement createQueryResponseElement()
@@ -436,7 +437,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.QueryResponseElement createQueryRe
     /**
      * Create an instance of QueryResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.QueryResponseType createQueryResponseType()
@@ -448,7 +449,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.QueryResponseType createQueryRespo
     /**
      * Create an instance of OptionsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.OptionsElement createOptionsElement()
@@ -460,7 +461,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.OptionsElement createOptionsElemen
     /**
      * Create an instance of ServiceInstanceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ServiceInstanceType createServiceInstanceType()
@@ -472,7 +473,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ServiceInstanceType createServiceI
     /**
      * Create an instance of QueryResponseTypeCredentialsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.QueryResponseType.CredentialsType createQueryResponseTypeCredentialsType()
@@ -484,7 +485,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.QueryResponseType.CredentialsType
     /**
      * Create an instance of DirectiveType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.DirectiveType createDirectiveType()
@@ -496,7 +497,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.DirectiveType createDirectiveType(
     /**
      * Create an instance of ModifyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ModifyType createModifyType()
@@ -508,7 +509,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ModifyType createModifyType()
     /**
      * Create an instance of ModifyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ModifyElement createModifyElement()
@@ -520,7 +521,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.ModifyElement createModifyElement(
     /**
      * Create an instance of InsertEntryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.InsertEntryType createInsertEntryType()
@@ -532,7 +533,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.InsertEntryType createInsertEntryT
     /**
      * Create an instance of AuthorizeRequesterElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.AuthorizeRequesterElement createAuthorizeRequesterElement()
@@ -544,7 +545,7 @@ public com.sun.identity.liberty.ws.disco.jaxb.AuthorizeRequesterElement createAu
     /**
      * Create an instance of ResourceIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb.ResourceIDElement createResourceIDElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsElement.java
index 71ff79d41a..7661026d15 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Options element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 119)
- * 
                    
  * 
                    - * <element name="Options" type="{urn:liberty:disco:2003-08}OptionsType"/>
+ * <element name="Options" type="{urn:liberty:disco:2003-08}OptionsType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsType.java
index 4916bb8007..fc5d51b702 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/OptionsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for OptionsType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 120)
- * 
                    
  * 
                    - * <complexType name="OptionsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Option" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OptionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Option" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryElement.java
index 83df96373c..2e9362c418 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Query element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 125)
- * 
                    
  * 
                    - * <element name="Query" type="{urn:liberty:disco:2003-08}QueryType"/>
+ * <element name="Query" type="{urn:liberty:disco:2003-08}QueryType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseElement.java
index f72ab16ffe..aa26a2f16c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for QueryResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 140)
- * 
                    
  * 
                    - * <element name="QueryResponse" type="{urn:liberty:disco:2003-08}QueryResponseType"/>
+ * <element name="QueryResponse" type="{urn:liberty:disco:2003-08}QueryResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseType.java
index 00efce5f34..320b2588e3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,30 +13,29 @@
 /**
  * Java content class for QueryResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 141)
- * 
                    
  * 
                    - * <complexType name="QueryResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}Status"/>
- *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Credentials" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}Status"/>
+ *         <element ref="{urn:liberty:disco:2003-08}ResourceOffering" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Credentials" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -126,17 +126,16 @@ public interface QueryResponseType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 146)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <any/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <any/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryType.java
index a14b3c11d8..7e10216fd2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/QueryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,30 +13,29 @@
 /**
  * Java content class for QueryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 126)
- * 
                    
  * 
                    - * <complexType name="QueryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
- *         <element name="RequestedServiceType" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
- *                   <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
+ *         <element name="RequestedServiceType" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
+ *                   <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -127,18 +127,17 @@ public interface QueryType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 130)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
-     *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
+     *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/RemoveEntryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/RemoveEntryType.java
index 49b5475b69..984f6bc4fd 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/RemoveEntryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/RemoveEntryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for RemoveEntryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 162)
- * 
                    
  * 
                    - * <complexType name="RemoveEntryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="entryID" use="required" type="{urn:liberty:disco:2003-08}IDReferenceType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RemoveEntryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="entryID" use="required" type="{urn:liberty:disco:2003-08}IDReferenceType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDElement.java
index e2ffbbb0a0..c0de398e5f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ResourceID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 60)
- * 
                    
  * 
                    - * <element name="ResourceID" type="{urn:liberty:disco:2003-08}ResourceIDType"/>
+ * <element name="ResourceID" type="{urn:liberty:disco:2003-08}ResourceIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDType.java
index d780cf4d6e..4e3df7079f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceIDType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for ResourceIDType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 45)
- * 
                    
  * 
                    - * <complexType name="ResourceIDType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ResourceIDType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingElement.java
index 7471dc4c70..84375abb98 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ResourceOffering element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 109)
- * 
                    
  * 
                    - * <element name="ResourceOffering" type="{urn:liberty:disco:2003-08}ResourceOfferingType"/>
+ * <element name="ResourceOffering" type="{urn:liberty:disco:2003-08}ResourceOfferingType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingType.java
index cd009063bb..b39e3f4dd9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ResourceOfferingType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for ResourceOfferingType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 110)
- * 
                    
  * 
                    - * <complexType name="ResourceOfferingType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
- *         <element name="ServiceInstance" type="{urn:liberty:disco:2003-08}ServiceInstanceType"/>
- *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
- *         <element name="Abstract" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="entryID" type="{urn:liberty:disco:2003-08}IDType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResourceOfferingType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:disco:2003-08}ResourceIDGroup"/>
+ *         <element name="ServiceInstance" type="{urn:liberty:disco:2003-08}ServiceInstanceType"/>
+ *         <element ref="{urn:liberty:disco:2003-08}Options" minOccurs="0"/>
+ *         <element name="Abstract" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="entryID" type="{urn:liberty:disco:2003-08}IDType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceInstanceType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceInstanceType.java
index ecdc720163..f5649894e1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceInstanceType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceInstanceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for ServiceInstanceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 90)
- * 
                    
  * 
                    - * <complexType name="ServiceInstanceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
- *         <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
- *         <element name="Description" type="{urn:liberty:disco:2003-08}DescriptionType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ServiceInstanceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}ServiceType"/>
+ *         <element name="ProviderID" type="{urn:liberty:metadata:2003-08}entityIDType"/>
+ *         <element name="Description" type="{urn:liberty:disco:2003-08}DescriptionType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceTypeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceTypeElement.java
index c0c4924197..4f0ee1911f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceTypeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/ServiceTypeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ServiceType element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-disco-svc.xsd line 43)
- * 
                    
  * 
                    - * <element name="ServiceType" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="ServiceType" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusElement.java
index 91dcebfc41..3bdb16a182 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:disco:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:disco:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusType.java
index e8ce2d7e70..945f0420e1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/EmptyType.java
index 1fc010c2d1..39ca0d46fd 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionElement.java
index f91165ba61..259accf757 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:disco:2004-04}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:disco:2004-04}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionType.java
index 383b50b934..5860913e1d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/GenerateBearerTokenElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/GenerateBearerTokenElement.java
index 11683ec328..4c7c808f4d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/GenerateBearerTokenElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/GenerateBearerTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for GenerateBearerToken element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-disco-svc-v1.1.xsd line 51)
- * 
                    
  * 
                    - * <element name="GenerateBearerToken" type="{urn:liberty:disco:2003-08}DirectiveType"/>
+ * <element name="GenerateBearerToken" type="{urn:liberty:disco:2003-08}DirectiveType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysElement.java
index 8a0ca03a31..b3febcde53 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Keys element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-disco-svc-v1.1.xsd line 44)
- * 
                    
  * 
                    - * <element name="Keys" type="{urn:liberty:disco:2004-04}KeysType"/>
+ * <element name="Keys" type="{urn:liberty:disco:2004-04}KeysType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysType.java
index 8bf7870023..69b44c6809 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/KeysType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for KeysType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-disco-svc-v1.1.xsd line 45)
- * 
                    
  * 
                    - * <complexType name="KeysType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:metadata:2003-08}KeyDescriptor" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeysType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:metadata:2003-08}KeyDescriptor" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ObjectFactory.java
index 1b47aa3d9e..7fced5a128 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -64,7 +65,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -83,7 +84,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -102,7 +103,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -114,7 +115,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of KeysType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.KeysType createKeysType()
@@ -126,7 +127,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.KeysType createKeysType()
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.ExtensionElement createExtensionElement()
@@ -138,7 +139,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.ExtensionElement createExtension
     /**
      * Create an instance of GenerateBearerTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.GenerateBearerTokenElement createGenerateBearerTokenElement()
@@ -150,7 +151,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.GenerateBearerTokenElement creat
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.ExtensionType createExtensionType()
@@ -162,7 +163,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.ExtensionType createExtensionTyp
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.EmptyType createEmptyType()
@@ -174,7 +175,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.EmptyType createEmptyType()
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.StatusElement createStatusElement()
@@ -186,7 +187,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.StatusElement createStatusElemen
     /**
      * Create an instance of KeysElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.KeysElement createKeysElement()
@@ -198,7 +199,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.KeysElement createKeysElement()
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.StatusType createStatusType()
@@ -210,7 +211,7 @@ public com.sun.identity.liberty.ws.disco.jaxb11.StatusType createStatusType()
     /**
      * Create an instance of SendSingleLogOutElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.jaxb11.SendSingleLogOutElement createSendSingleLogOutElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/SendSingleLogOutElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/SendSingleLogOutElement.java
index 325f5d853e..073d584da0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/SendSingleLogOutElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/SendSingleLogOutElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SendSingleLogOut element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-disco-svc-v1.1.xsd line 50)
- * 
                    
  * 
                    - * <element name="SendSingleLogOut" type="{urn:liberty:disco:2003-08}DirectiveType"/>
+ * <element name="SendSingleLogOut" type="{urn:liberty:disco:2003-08}DirectiveType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusElement.java
index 156e784fb2..5aa6a7e3dc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:disco:2004-04}StatusType"/>
+ * <element name="Status" type="{urn:liberty:disco:2004-04}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusType.java
index c0ae8be969..77c5d7e16e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/jaxb11/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:disco:2004-04}Status" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:disco:2004-04}Status" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/DiscoEntryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/DiscoEntryElement.java
index fc8b6ebbfc..6a43ab7b77 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/DiscoEntryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/DiscoEntryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DiscoEntry element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/discoentry.xsd line 39)
- * 
                    
  * 
                    - * <element name="DiscoEntry" type="{urn:liberty:disco:2003-08}InsertEntryType"/>
+ * <element name="DiscoEntry" type="{urn:liberty:disco:2003-08}InsertEntryType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/ObjectFactory.java
index 2c2c4ebfea..c37467fd1c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/disco/plugins/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -52,7 +53,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -71,7 +72,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -90,7 +91,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -102,7 +103,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of DiscoEntryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.disco.plugins.jaxb.DiscoEntryElement createDiscoEntryElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddrTypeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddrTypeElement.java
index 6d8916fe96..e710478d79 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddrTypeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddrTypeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AddrType element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 164)
- * 
                    
  * 
                    - * <element name="AddrType" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="AddrType" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardElement.java
index 002aca1a5d..82e93c90ec 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AddressCard element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 152)
- * 
                    
  * 
                    - * <element name="AddressCard" type="{urn:liberty:id-sis-pp:2003-08}AddressCardType"/>
+ * <element name="AddressCard" type="{urn:liberty:id-sis-pp:2003-08}AddressCardType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardType.java
index 604efe0f61..e77c2d00fc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressCardType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for AddressCardType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 153)
- * 
                    
  * 
                    - * <complexType name="AddressCardType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AddrType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Address" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Nick" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LNick" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LComment" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AddressCardType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AddrType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Address" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Nick" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LNick" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LComment" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressElement.java
index 37d059e97e..9f4c13e883 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Address element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 165)
- * 
                    
  * 
                    - * <element name="Address" type="{urn:liberty:id-sis-pp:2003-08}AddressType"/>
+ * <element name="Address" type="{urn:liberty:id-sis-pp:2003-08}AddressType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressType.java
index ed9e9ac518..3a3267d0ce 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AddressType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,26 +13,25 @@
 /**
  * Java content class for AddressType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 166)
- * 
                    
  * 
                    - * <complexType name="AddressType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}PostalAddress" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LPostalAddress" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}PostalCode" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}L" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LL" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}St" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LSt" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}C" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AddressType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}PostalAddress" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LPostalAddress" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}PostalCode" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}L" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LL" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}St" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LSt" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}C" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AgeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AgeElement.java
index 6103eb1dda..728be93c88 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AgeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AgeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Age element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 253)
- * 
                    
  * 
                    - * <element name="Age" type="{urn:liberty:id-sis-pp:2003-08}DSTInteger"/>
+ * <element name="Age" type="{urn:liberty:id-sis-pp:2003-08}DSTInteger"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltCNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltCNElement.java
index 917842f63c..e6f463b228 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltCNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltCNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AltCN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 67)
- * 
                    
  * 
                    - * <element name="AltCN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="AltCN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDElement.java
index 9ba6d5a041..b3f8ddd154 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AltID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 121)
- * 
                    
  * 
                    - * <element name="AltID" type="{urn:liberty:id-sis-pp:2003-08}AltIDType"/>
+ * <element name="AltID" type="{urn:liberty:id-sis-pp:2003-08}AltIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDType.java
index 0436f525cb..0632f56dd8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltIDType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for AltIDType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 122)
- * 
                    
  * 
                    - * <complexType name="AltIDType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDValue"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDType" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AltIDType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDValue"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDType" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltLOElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltLOElement.java
index b5c3da0469..958199cd86 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltLOElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltLOElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AltLO element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 151)
- * 
                    
  * 
                    - * <element name="AltLO" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="AltLO" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltOElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltOElement.java
index a942aabc6e..80f3c33c58 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltOElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AltOElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AltO element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 150)
- * 
                    
  * 
                    - * <element name="AltO" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="AltO" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameElement.java
index 577c42f568..78254be6df 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AnalyzedName element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 69)
- * 
                    
  * 
                    - * <element name="AnalyzedName" type="{urn:liberty:id-sis-pp:2003-08}AnalyzedNameType"/>
+ * <element name="AnalyzedName" type="{urn:liberty:id-sis-pp:2003-08}AnalyzedNameType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameType.java
index e49e5289ff..bb6dee2e9d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/AnalyzedNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for AnalyzedNameType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 70)
- * 
                    
  * 
                    - * <complexType name="AnalyzedNameType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}PersonalTitle" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LPersonalTitle" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}FN" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LFN" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}SN" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LSN" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MN" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LMN" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *       <attribute name="nameScheme" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnalyzedNameType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}PersonalTitle" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LPersonalTitle" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}FN" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LFN" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}SN" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LSN" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MN" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LMN" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *       <attribute name="nameScheme" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/BirthdayElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/BirthdayElement.java
index 1e28c2ae31..e81e6ff921 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/BirthdayElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/BirthdayElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Birthday element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 252)
- * 
                    
  * 
                    - * <element name="Birthday" type="{urn:liberty:id-sis-pp:2003-08}DSTMonthDay"/>
+ * <element name="Birthday" type="{urn:liberty:id-sis-pp:2003-08}DSTMonthDay"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CElement.java
index 4bae781b6f..e4cae4ec97 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for C element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 187)
- * 
                    
  * 
                    - * <element name="C" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="C" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CNElement.java
index 619aca0169..fb66de493e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 65)
- * 
                    
  * 
                    - * <element name="CN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="CN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameElement.java
index d4924aeaf6..07ebbab4c5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CommonName element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 53)
- * 
                    
  * 
                    - * <element name="CommonName" type="{urn:liberty:id-sis-pp:2003-08}CommonNameType"/>
+ * <element name="CommonName" type="{urn:liberty:id-sis-pp:2003-08}CommonNameType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameType.java
index c42a80cce4..b341b94e46 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/CommonNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for CommonNameType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 54)
- * 
                    
  * 
                    - * <complexType name="CommonNameType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}CN" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LCN" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltCN" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LAltCN" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AnalyzedName" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CommonNameType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}CN" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LCN" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltCN" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LAltCN" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AnalyzedName" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DOBElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DOBElement.java
index b9886df5ee..a6f3ae7470 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DOBElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DOBElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DOB element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 130)
- * 
                    
  * 
                    - * <element name="DOB" type="{urn:liberty:id-sis-pp:2003-08}DSTDate"/>
+ * <element name="DOB" type="{urn:liberty:id-sis-pp:2003-08}DSTDate"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTDate.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTDate.java
index a5fd82839d..b99cf88031 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTDate.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTDate.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for DSTDate complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst-dt.xsd line 100)
- * 
                    
  * 
                    - * <complexType name="DSTDate">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>date">
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DSTDate">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>date">
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTInteger.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTInteger.java
index f37e9a23ed..05e36dc619 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTInteger.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTInteger.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for DSTInteger complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst-dt.xsd line 86)
- * 
                    
  * 
                    - * <complexType name="DSTInteger">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>integer">
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DSTInteger">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>integer">
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTLocalizedString.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTLocalizedString.java
index b1716a9d3b..0c62e7d44f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTLocalizedString.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTLocalizedString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for DSTLocalizedString complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst-dt.xsd line 72)
- * 
                    
  * 
                    - * <complexType name="DSTLocalizedString">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}localizedLeafAttributes"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DSTLocalizedString">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}localizedLeafAttributes"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTMonthDay.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTMonthDay.java
index e018a071b0..17860171eb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTMonthDay.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTMonthDay.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for DSTMonthDay complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst-dt.xsd line 107)
- * 
                    
  * 
                    - * <complexType name="DSTMonthDay">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>gMonthDay">
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DSTMonthDay">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>gMonthDay">
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTString.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTString.java
index 1362751bf6..49ffa93b30 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTString.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for DSTString complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst-dt.xsd line 79)
- * 
                    
  * 
                    - * <complexType name="DSTString">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DSTString">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTURI.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTURI.java
index 0ffb54ff9a..e4d1ef40e7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTURI.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DSTURI.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for DSTURI complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst-dt.xsd line 93)
- * 
                    
  * 
                    - * <complexType name="DSTURI">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DSTURI">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}leafAttributes"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsElement.java
index 4ad43c2f5d..1a0ececfa7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Demographics element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 238)
- * 
                    
  * 
                    - * <element name="Demographics" type="{urn:liberty:id-sis-pp:2003-08}DemographicsType"/>
+ * <element name="Demographics" type="{urn:liberty:id-sis-pp:2003-08}DemographicsType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsType.java
index 5d17aecd13..a24c07f5c4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DemographicsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for DemographicsType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 239)
- * 
                    
  * 
                    - * <complexType name="DemographicsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}DisplayLanguage" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Language" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Birthday" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Age" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}TimeZone" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DemographicsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}DisplayLanguage" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Language" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Birthday" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Age" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}TimeZone" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DisplayLanguageElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DisplayLanguageElement.java
index 51e019ac1d..5b88041d08 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DisplayLanguageElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/DisplayLanguageElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DisplayLanguage element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 250)
- * 
                    
  * 
                    - * <element name="DisplayLanguage" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="DisplayLanguage" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmergencyContactElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmergencyContactElement.java
index 082b2cd7f0..6a5a2c86ae 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmergencyContactElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmergencyContactElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EmergencyContact element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 256)
- * 
                    
  * 
                    - * <element name="EmergencyContact" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="EmergencyContact" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityElement.java
index 0ae0dc177f..989811daea 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EmploymentIdentity element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 133)
- * 
                    
  * 
                    - * <element name="EmploymentIdentity" type="{urn:liberty:id-sis-pp:2003-08}EmploymentIdentityType"/>
+ * <element name="EmploymentIdentity" type="{urn:liberty:id-sis-pp:2003-08}EmploymentIdentityType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityType.java
index 3aec331495..4b498c7ce5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmploymentIdentityType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for EmploymentIdentityType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 134)
- * 
                    
  * 
                    - * <complexType name="EmploymentIdentityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}JobTitle" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LJobTitle" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}O" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LO" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltO" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltLO" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmploymentIdentityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}JobTitle" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LJobTitle" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}O" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LO" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltO" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltLO" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmptyType.java
index 033d04020d..18c3d9d413 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptKeyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptKeyElement.java
index 6471b2f9e6..731a761090 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptKeyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptKeyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptKey element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 255)
- * 
                    
  * 
                    - * <element name="EncryptKey" type="{urn:liberty:id-sis-pp:2003-08}KeyInfoType"/>
+ * <element name="EncryptKey" type="{urn:liberty:id-sis-pp:2003-08}KeyInfoType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptedResourceIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptedResourceIDElement.java
index 9abbb46ff8..6afc5e99ac 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptedResourceIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/EncryptedResourceIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedResourceID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 48)
- * 
                    
  * 
                    - * <element name="EncryptedResourceID" type="{urn:liberty:disco:2003-08}EncryptedResourceIDType"/>
+ * <element name="EncryptedResourceID" type="{urn:liberty:disco:2003-08}EncryptedResourceIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionElement.java
index dbeb246224..8d52023b6a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:id-sis-pp:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:id-sis-pp:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionType.java
index c9be4970a1..1804d08f35 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FNElement.java
index 4256241826..a86203642e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 87)
- * 
                    
  * 
                    - * <element name="FN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="FN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeElement.java
index 98bf217771..7e25ddfef9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Facade element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 221)
- * 
                    
  * 
                    - * <element name="Facade" type="{urn:liberty:id-sis-pp:2003-08}FacadeType"/>
+ * <element name="Facade" type="{urn:liberty:id-sis-pp:2003-08}FacadeType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeType.java
index b90e20025d..f2b1cb166c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/FacadeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for FacadeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 222)
- * 
                    
  * 
                    - * <complexType name="FacadeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MugShot" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}WebSite" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}NamePronounced" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}GreetSound" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}GreetMeSound" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FacadeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MugShot" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}WebSite" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}NamePronounced" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}GreetSound" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}GreetMeSound" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GenderElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GenderElement.java
index a512fbb04a..634e15f20e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GenderElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GenderElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Gender element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 131)
- * 
                    
  * 
                    - * <element name="Gender" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="Gender" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetMeSoundElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetMeSoundElement.java
index c0381bc058..f24692e10d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetMeSoundElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetMeSoundElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for GreetMeSound element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 237)
- * 
                    
  * 
                    - * <element name="GreetMeSound" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="GreetMeSound" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetSoundElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetSoundElement.java
index 0078ea663a..d3ae67fc7a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetSoundElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/GreetSoundElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for GreetSound element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 236)
- * 
                    
  * 
                    - * <element name="GreetSound" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="GreetSound" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDTypeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDTypeElement.java
index 0403a396f5..43a2d3dff1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDTypeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDTypeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDType element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 120)
- * 
                    
  * 
                    - * <element name="IDType" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="IDType" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDValueElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDValueElement.java
index 808130377d..c470275b21 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDValueElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/IDValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 119)
- * 
                    
  * 
                    - * <element name="IDValue" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="IDValue" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/InformalNameElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/InformalNameElement.java
index 8f445107d2..20540d0518 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/InformalNameElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/InformalNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for InformalName element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 51)
- * 
                    
  * 
                    - * <element name="InformalName" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="InformalName" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/JobTitleElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/JobTitleElement.java
index 79a3781549..797f968399 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/JobTitleElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/JobTitleElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for JobTitle element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 146)
- * 
                    
  * 
                    - * <element name="JobTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="JobTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/KeyInfoType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/KeyInfoType.java
index 4283864856..b96b0b7d24 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/KeyInfoType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/KeyInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for KeyInfoType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 18)
- * 
                    
  * 
                    - * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType">
- *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}ACC"/>
- *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}ACCTime"/>
- *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}modificationTime"/>
- *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}modifier"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyInfoType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType">
+ *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}ACC"/>
+ *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}ACCTime"/>
+ *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}modificationTime"/>
+ *       <attribute ref="{urn:liberty:id-sis-pp:2003-08}modifier"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LAltCNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LAltCNElement.java
index 1254892151..c33d292bb2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LAltCNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LAltCNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LAltCN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 68)
- * 
                    
  * 
                    - * <element name="LAltCN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LAltCN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCNElement.java
index 1323df6844..55f709b5be 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LCN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 66)
- * 
                    
  * 
                    - * <element name="LCN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LCN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCommentElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCommentElement.java
index 88b454e848..078b54c717 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCommentElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LCommentElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LComment element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 190)
- * 
                    
  * 
                    - * <element name="LComment" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="LComment" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LElement.java
index 69831c8aba..469109db01 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for L element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 183)
- * 
                    
  * 
                    - * <element name="L" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="L" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LEmergencyContactElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LEmergencyContactElement.java
index 5d5ddfe2cb..0ca1dabcde 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LEmergencyContactElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LEmergencyContactElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LEmergencyContact element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 257)
- * 
                    
  * 
                    - * <element name="LEmergencyContact" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LEmergencyContact" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LFNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LFNElement.java
index 12b691530e..f33d830793 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LFNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LFNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LFN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 88)
- * 
                    
  * 
                    - * <element name="LFN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LFN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LInformalNameElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LInformalNameElement.java
index b89918de19..057d7b0a70 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LInformalNameElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LInformalNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LInformalName element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 52)
- * 
                    
  * 
                    - * <element name="LInformalName" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LInformalName" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LJobTitleElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LJobTitleElement.java
index 335b856db1..6d41975c95 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LJobTitleElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LJobTitleElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LJobTitle element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 147)
- * 
                    
  * 
                    - * <element name="LJobTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LJobTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLElement.java
index faf8eaee27..0a2821b35a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LL element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 184)
- * 
                    
  * 
                    - * <element name="LL" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LL" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLegalNameElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLegalNameElement.java
index cbf7a89e0e..a5d9441f74 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLegalNameElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LLegalNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LLegalName element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 109)
- * 
                    
  * 
                    - * <element name="LLegalName" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LLegalName" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LMNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LMNElement.java
index 32bd8614ac..20cbf40fa8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LMNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LMNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LMN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 92)
- * 
                    
  * 
                    - * <element name="LMN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LMN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LNickElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LNickElement.java
index 5c4c69c20d..4ab55f559b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LNickElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LNickElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LNick element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 189)
- * 
                    
  * 
                    - * <element name="LNick" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LNick" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LOElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LOElement.java
index 3a533d7647..3feef07292 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LOElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LOElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LO element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 149)
- * 
                    
  * 
                    - * <element name="LO" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LO" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPersonalTitleElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPersonalTitleElement.java
index 1ce229d7d3..e14700bff8 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPersonalTitleElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPersonalTitleElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LPersonalTitle element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 86)
- * 
                    
  * 
                    - * <element name="LPersonalTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LPersonalTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPostalAddressElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPostalAddressElement.java
index b7bdf19db0..bf65b08c52 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPostalAddressElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LPostalAddressElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LPostalAddress element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 181)
- * 
                    
  * 
                    - * <element name="LPostalAddress" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LPostalAddress" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LSNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LSNElement.java
index 195c3a37f5..add115d407 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LSNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LSNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LSN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 90)
- * 
                    
  * 
                    - * <element name="LSN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LSN" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LStElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LStElement.java
index ef82d08894..de3d4e8933 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LStElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LStElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LSt element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 186)
- * 
                    
  * 
                    - * <element name="LSt" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
+ * <element name="LSt" type="{urn:liberty:id-sis-pp:2003-08}DSTLocalizedString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LanguageElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LanguageElement.java
index 565e368a8e..42186b5716 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LanguageElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LanguageElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Language element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 251)
- * 
                    
  * 
                    - * <element name="Language" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="Language" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityElement.java
index 3d8432e4db..18ca278f31 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LegalIdentity element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 93)
- * 
                    
  * 
                    - * <element name="LegalIdentity" type="{urn:liberty:id-sis-pp:2003-08}LegalIdentityType"/>
+ * <element name="LegalIdentity" type="{urn:liberty:id-sis-pp:2003-08}LegalIdentityType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityType.java
index d79f1f9402..e35100c6cf 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalIdentityType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,26 +13,25 @@
 /**
  * Java content class for LegalIdentityType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 94)
- * 
                    
  * 
                    - * <complexType name="LegalIdentityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LegalName" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LLegalName" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AnalyzedName" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}VAT" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltID" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}DOB" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Gender" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MaritalStatus" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="LegalIdentityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LegalName" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LLegalName" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AnalyzedName" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}VAT" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AltID" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}DOB" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Gender" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MaritalStatus" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalNameElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalNameElement.java
index 9df2a8ff32..ac7c42a77b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalNameElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/LegalNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for LegalName element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 108)
- * 
                    
  * 
                    - * <element name="LegalName" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="LegalName" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MNElement.java
index 80b8939d8e..f6f0d69318 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 91)
- * 
                    
  * 
                    - * <element name="MN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="MN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MaritalStatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MaritalStatusElement.java
index f9d4ab14e1..a641873420 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MaritalStatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MaritalStatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MaritalStatus element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 132)
- * 
                    
  * 
                    - * <element name="MaritalStatus" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="MaritalStatus" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyElement.java
index 6952b50b56..d0d5c0ced3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Modify element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 96)
- * 
                    
  * 
                    - * <element name="Modify" type="{urn:liberty:id-sis-pp:2003-08}ModifyType"/>
+ * <element name="Modify" type="{urn:liberty:id-sis-pp:2003-08}ModifyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyResponseElement.java
index 43950f96a8..72a07752e4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ModifyResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 122)
- * 
                    
  * 
                    - * <element name="ModifyResponse" type="{urn:liberty:id-sis-pp:2003-08}ResponseType"/>
+ * <element name="ModifyResponse" type="{urn:liberty:id-sis-pp:2003-08}ResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyType.java
index 248169e47b..9f287559b3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ModifyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,45 +13,44 @@
 /**
  * Java content class for ModifyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 97)
- * 
                    
  * 
                    - * <complexType name="ModifyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:id-sis-pp:2003-08}ResourceIDGroup" minOccurs="0"/>
- *         <element name="Modification" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
- *                   <element name="NewData" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <any/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *                 <attribute name="notChangedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *                 <attribute name="overrideAllowed" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ModifyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:id-sis-pp:2003-08}ResourceIDGroup" minOccurs="0"/>
+ *         <element name="Modification" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
+ *                   <element name="NewData" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <any/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *                 <attribute name="notChangedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *                 <attribute name="overrideAllowed" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -184,31 +184,30 @@ public interface ModifyType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 101)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
-     *         <element name="NewData" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <any/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *       <attribute name="notChangedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
-     *       <attribute name="overrideAllowed" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
+     *         <element name="NewData" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <any/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *       <attribute name="notChangedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+     *       <attribute name="overrideAllowed" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
@@ -303,17 +302,16 @@ public interface ModificationType {
         /**
          * Java content class for anonymous complex type.
          * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 105)
-         * 
                    
          * 
                    -         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <any/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <any/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
          * 
                    
          * 
          */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgAccountElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgAccountElement.java
index 99383c3435..6d3978e75a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgAccountElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgAccountElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MsgAccount element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 219)
- * 
                    
  * 
                    - * <element name="MsgAccount" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="MsgAccount" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactElement.java
index 63f7e7bb36..e66a4818a1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MsgContact element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 191)
- * 
                    
  * 
                    - * <element name="MsgContact" type="{urn:liberty:id-sis-pp:2003-08}MsgContactType"/>
+ * <element name="MsgContact" type="{urn:liberty:id-sis-pp:2003-08}MsgContactType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactType.java
index fd8232148e..b72d305329 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgContactType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for MsgContactType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 192)
- * 
                    
  * 
                    - * <complexType name="MsgContactType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Nick" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LNick" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LComment" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgMethod" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgTechnology" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgProvider" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgAccount" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgSubaccount" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MsgContactType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Nick" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LNick" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LComment" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgMethod" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgTechnology" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgProvider" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgAccount" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgSubaccount" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgMethodElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgMethodElement.java
index 080c9bfd79..3f4026cfae 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgMethodElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MsgMethod element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 208)
- * 
                    
  * 
                    - * <element name="MsgMethod" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="MsgMethod" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgProviderElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgProviderElement.java
index f0d6ed0939..2226ffa2e0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgProviderElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgProviderElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MsgProvider element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 218)
- * 
                    
  * 
                    - * <element name="MsgProvider" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="MsgProvider" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgSubaccountElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgSubaccountElement.java
index 54c4e1a4e7..ced28f954a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgSubaccountElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgSubaccountElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MsgSubaccount element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 220)
- * 
                    
  * 
                    - * <element name="MsgSubaccount" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="MsgSubaccount" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyElement.java
index 869e1e83b0..3f6d6cdf1b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for MsgTechnology element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 209)
- * 
                    
  * 
                    - * <element name="MsgTechnology">
- *   <complexType>
- *     <simpleContent>
- *       <extension base="<urn:liberty:id-sis-pp:2003-08>DSTURI">
- *         <attribute name="msgLimit" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       </extension>
- *     </simpleContent>
- *   </complexType>
- * </element>
+ * <element name="MsgTechnology">
+ *   <complexType>
+ *     <simpleContent>
+ *       <extension base="<urn:liberty:id-sis-pp:2003-08>DSTURI">
+ *         <attribute name="msgLimit" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       </extension>
+ *     </simpleContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyType.java
index 16c3b9eb70..c68dc98b2b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTechnologyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 210)
- * 
                    
  * 
                    - * <complexType>
- *   <simpleContent>
- *     <extension base="<urn:liberty:id-sis-pp:2003-08>DSTURI">
- *       <attribute name="msgLimit" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType>
+ *   <simpleContent>
+ *     <extension base="<urn:liberty:id-sis-pp:2003-08>DSTURI">
+ *       <attribute name="msgLimit" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTypeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTypeElement.java
index 072d8a7098..899d8b67cb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTypeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MsgTypeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MsgType element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 207)
- * 
                    
  * 
                    - * <element name="MsgType" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="MsgType" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MugShotElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MugShotElement.java
index d263bd24b6..7032368361 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MugShotElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/MugShotElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MugShot element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 233)
- * 
                    
  * 
                    - * <element name="MugShot" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="MugShot" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NamePronouncedElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NamePronouncedElement.java
index eac99c25c0..33650aadb3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NamePronouncedElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NamePronouncedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NamePronounced element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 235)
- * 
                    
  * 
                    - * <element name="NamePronounced" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="NamePronounced" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NickElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NickElement.java
index d4d06eb0bd..8eea6f6849 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NickElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/NickElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Nick element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 188)
- * 
                    
  * 
                    - * <element name="Nick" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="Nick" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/OElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/OElement.java
index 2a865b1f57..3ede05ba14 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/OElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/OElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for O element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 148)
- * 
                    
  * 
                    - * <element name="O" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="O" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ObjectFactory.java
index 7d98c6bad2..d2846dad9a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -239,7 +240,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -258,7 +259,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -277,7 +278,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -289,7 +290,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of GreetMeSoundElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.GreetMeSoundElement createGreetMeSoundElement()
@@ -301,7 +302,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.GreetMeSoundElement createGreetMeSo
     /**
      * Create an instance of IDValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.IDValueElement createIDValueElement()
@@ -313,7 +314,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.IDValueElement createIDValueElement
     /**
      * Create an instance of FNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.FNElement createFNElement()
@@ -325,7 +326,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.FNElement createFNElement()
     /**
      * Create an instance of VATElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.VATElement createVATElement()
@@ -337,7 +338,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.VATElement createVATElement()
     /**
      * Create an instance of CElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.CElement createCElement()
@@ -349,7 +350,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.CElement createCElement()
     /**
      * Create an instance of QueryResponseTypeDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.QueryResponseType.DataType createQueryResponseTypeDataType()
@@ -361,7 +362,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.QueryResponseType.DataType createQu
     /**
      * Create an instance of ResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ResponseType createResponseType()
@@ -373,7 +374,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ResponseType createResponseType()
     /**
      * Create an instance of LInformalNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LInformalNameElement createLInformalNameElement()
@@ -385,7 +386,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LInformalNameElement createLInforma
     /**
      * Create an instance of EmploymentIdentityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.EmploymentIdentityElement createEmploymentIdentityElement()
@@ -397,7 +398,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.EmploymentIdentityElement createEmp
     /**
      * Create an instance of MsgTechnologyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgTechnologyType createMsgTechnologyType()
@@ -409,7 +410,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgTechnologyType createMsgTechnolo
     /**
      * Create an instance of DSTDate
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DSTDate createDSTDate()
@@ -421,7 +422,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DSTDate createDSTDate()
     /**
      * Create an instance of AddressCardElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AddressCardElement createAddressCardElement()
@@ -433,7 +434,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AddressCardElement createAddressCar
     /**
      * Create an instance of AltCNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AltCNElement createAltCNElement()
@@ -445,7 +446,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AltCNElement createAltCNElement()
     /**
      * Create an instance of LOElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LOElement createLOElement()
@@ -457,7 +458,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LOElement createLOElement()
     /**
      * Create an instance of MsgProviderElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgProviderElement createMsgProviderElement()
@@ -469,7 +470,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgProviderElement createMsgProvide
     /**
      * Create an instance of LEmergencyContactElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LEmergencyContactElement createLEmergencyContactElement()
@@ -481,7 +482,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LEmergencyContactElement createLEme
     /**
      * Create an instance of DOBElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DOBElement createDOBElement()
@@ -493,7 +494,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DOBElement createDOBElement()
     /**
      * Create an instance of DSTURI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DSTURI createDSTURI()
@@ -505,7 +506,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DSTURI createDSTURI()
     /**
      * Create an instance of LSNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LSNElement createLSNElement()
@@ -517,7 +518,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LSNElement createLSNElement()
     /**
      * Create an instance of PostalAddressElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.PostalAddressElement createPostalAddressElement()
@@ -529,7 +530,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.PostalAddressElement createPostalAd
     /**
      * Create an instance of KeyInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.KeyInfoType createKeyInfoType()
@@ -541,7 +542,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.KeyInfoType createKeyInfoType()
     /**
      * Create an instance of LJobTitleElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LJobTitleElement createLJobTitleElement()
@@ -553,7 +554,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LJobTitleElement createLJobTitleEle
     /**
      * Create an instance of DisplayLanguageElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DisplayLanguageElement createDisplayLanguageElement()
@@ -565,7 +566,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DisplayLanguageElement createDispla
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.StatusElement createStatusElement()
@@ -577,7 +578,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.StatusElement createStatusElement()
     /**
      * Create an instance of ModifyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ModifyType createModifyType()
@@ -589,7 +590,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ModifyType createModifyType()
     /**
      * Create an instance of CNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.CNElement createCNElement()
@@ -601,7 +602,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.CNElement createCNElement()
     /**
      * Create an instance of LPostalAddressElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LPostalAddressElement createLPostalAddressElement()
@@ -613,7 +614,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LPostalAddressElement createLPostal
     /**
      * Create an instance of AltIDType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AltIDType createAltIDType()
@@ -625,7 +626,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AltIDType createAltIDType()
     /**
      * Create an instance of MsgMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgMethodElement createMsgMethodElement()
@@ -637,7 +638,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgMethodElement createMsgMethodEle
     /**
      * Create an instance of DemographicsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DemographicsElement createDemographicsElement()
@@ -649,7 +650,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DemographicsElement createDemograph
     /**
      * Create an instance of SignKeyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.SignKeyElement createSignKeyElement()
@@ -661,7 +662,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.SignKeyElement createSignKeyElement
     /**
      * Create an instance of MsgContactType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgContactType createMsgContactType()
@@ -673,7 +674,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgContactType createMsgContactType
     /**
      * Create an instance of AddressType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AddressType createAddressType()
@@ -685,7 +686,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AddressType createAddressType()
     /**
      * Create an instance of ModifyTypeModificationTypeNewDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ModifyType.ModificationType.NewDataType createModifyTypeModificationTypeNewDataType()
@@ -697,7 +698,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ModifyType.ModificationType.NewData
     /**
      * Create an instance of ModifyTypeModificationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ModifyType.ModificationType createModifyTypeModificationType()
@@ -709,7 +710,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ModifyType.ModificationType createM
     /**
      * Create an instance of FacadeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.FacadeElement createFacadeElement()
@@ -721,7 +722,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.FacadeElement createFacadeElement()
     /**
      * Create an instance of LNickElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LNickElement createLNickElement()
@@ -733,7 +734,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LNickElement createLNickElement()
     /**
      * Create an instance of PPElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.PPElement createPPElement()
@@ -745,7 +746,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.PPElement createPPElement()
     /**
      * Create an instance of AltIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AltIDElement createAltIDElement()
@@ -757,7 +758,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AltIDElement createAltIDElement()
     /**
      * Create an instance of LegalNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LegalNameElement createLegalNameElement()
@@ -769,7 +770,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LegalNameElement createLegalNameEle
     /**
      * Create an instance of JobTitleElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.JobTitleElement createJobTitleElement()
@@ -781,7 +782,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.JobTitleElement createJobTitleEleme
     /**
      * Create an instance of InformalNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.InformalNameElement createInformalNameElement()
@@ -793,7 +794,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.InformalNameElement createInformalN
     /**
      * Create an instance of PPType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.PPType createPPType()
@@ -805,7 +806,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.PPType createPPType()
     /**
      * Create an instance of QueryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.QueryType createQueryType()
@@ -817,7 +818,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.QueryType createQueryType()
     /**
      * Create an instance of LanguageElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LanguageElement createLanguageElement()
@@ -829,7 +830,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LanguageElement createLanguageEleme
     /**
      * Create an instance of PersonalTitleElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.PersonalTitleElement createPersonalTitleElement()
@@ -841,7 +842,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.PersonalTitleElement createPersonal
     /**
      * Create an instance of EmergencyContactElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.EmergencyContactElement createEmergencyContactElement()
@@ -853,7 +854,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.EmergencyContactElement createEmerg
     /**
      * Create an instance of GenderElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.GenderElement createGenderElement()
@@ -865,7 +866,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.GenderElement createGenderElement()
     /**
      * Create an instance of ModifyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ModifyElement createModifyElement()
@@ -877,7 +878,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ModifyElement createModifyElement()
     /**
      * Create an instance of LFNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LFNElement createLFNElement()
@@ -889,7 +890,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LFNElement createLFNElement()
     /**
      * Create an instance of ModifyResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ModifyResponseElement createModifyResponseElement()
@@ -901,7 +902,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ModifyResponseElement createModifyR
     /**
      * Create an instance of AddressElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AddressElement createAddressElement()
@@ -913,7 +914,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AddressElement createAddressElement
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ExtensionType createExtensionType()
@@ -925,7 +926,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ExtensionType createExtensionType()
     /**
      * Create an instance of MsgAccountElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgAccountElement createMsgAccountElement()
@@ -937,7 +938,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgAccountElement createMsgAccountE
     /**
      * Create an instance of CommonNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.CommonNameElement createCommonNameElement()
@@ -949,7 +950,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.CommonNameElement createCommonNameE
     /**
      * Create an instance of LElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LElement createLElement()
@@ -961,7 +962,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LElement createLElement()
     /**
      * Create an instance of QueryResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.QueryResponseType createQueryResponseType()
@@ -973,7 +974,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.QueryResponseType createQueryRespon
     /**
      * Create an instance of TimeZoneElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.TimeZoneElement createTimeZoneElement()
@@ -985,7 +986,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.TimeZoneElement createTimeZoneEleme
     /**
      * Create an instance of DSTMonthDay
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DSTMonthDay createDSTMonthDay()
@@ -997,7 +998,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DSTMonthDay createDSTMonthDay()
     /**
      * Create an instance of LLegalNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LLegalNameElement createLLegalNameElement()
@@ -1009,7 +1010,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LLegalNameElement createLLegalNameE
     /**
      * Create an instance of LCommentElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LCommentElement createLCommentElement()
@@ -1021,7 +1022,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LCommentElement createLCommentEleme
     /**
      * Create an instance of NamePronouncedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.NamePronouncedElement createNamePronouncedElement()
@@ -1033,7 +1034,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.NamePronouncedElement createNamePro
     /**
      * Create an instance of PostalCodeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.PostalCodeElement createPostalCodeElement()
@@ -1045,7 +1046,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.PostalCodeElement createPostalCodeE
     /**
      * Create an instance of LPersonalTitleElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LPersonalTitleElement createLPersonalTitleElement()
@@ -1057,7 +1058,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LPersonalTitleElement createLPerson
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ExtensionElement createExtensionElement()
@@ -1069,7 +1070,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ExtensionElement createExtensionEle
     /**
      * Create an instance of IDTypeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.IDTypeElement createIDTypeElement()
@@ -1081,7 +1082,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.IDTypeElement createIDTypeElement()
     /**
      * Create an instance of NickElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.NickElement createNickElement()
@@ -1093,7 +1094,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.NickElement createNickElement()
     /**
      * Create an instance of AddrTypeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AddrTypeElement createAddrTypeElement()
@@ -1105,7 +1106,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AddrTypeElement createAddrTypeEleme
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.EmptyType createEmptyType()
@@ -1117,7 +1118,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.EmptyType createEmptyType()
     /**
      * Create an instance of OElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.OElement createOElement()
@@ -1129,7 +1130,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.OElement createOElement()
     /**
      * Create an instance of LLElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LLElement createLLElement()
@@ -1141,7 +1142,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LLElement createLLElement()
     /**
      * Create an instance of BirthdayElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.BirthdayElement createBirthdayElement()
@@ -1153,7 +1154,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.BirthdayElement createBirthdayEleme
     /**
      * Create an instance of AnalyzedNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AnalyzedNameElement createAnalyzedNameElement()
@@ -1165,7 +1166,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AnalyzedNameElement createAnalyzedN
     /**
      * Create an instance of LAltCNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LAltCNElement createLAltCNElement()
@@ -1177,7 +1178,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LAltCNElement createLAltCNElement()
     /**
      * Create an instance of EncryptKeyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.EncryptKeyElement createEncryptKeyElement()
@@ -1189,7 +1190,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.EncryptKeyElement createEncryptKeyE
     /**
      * Create an instance of LStElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LStElement createLStElement()
@@ -1201,7 +1202,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LStElement createLStElement()
     /**
      * Create an instance of GreetSoundElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.GreetSoundElement createGreetSoundElement()
@@ -1213,7 +1214,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.GreetSoundElement createGreetSoundE
     /**
      * Create an instance of QueryResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.QueryResponseElement createQueryResponseElement()
@@ -1225,7 +1226,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.QueryResponseElement createQueryRes
     /**
      * Create an instance of LegalIdentityType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LegalIdentityType createLegalIdentityType()
@@ -1237,7 +1238,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LegalIdentityType createLegalIdenti
     /**
      * Create an instance of MugShotElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MugShotElement createMugShotElement()
@@ -1249,7 +1250,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MugShotElement createMugShotElement
     /**
      * Create an instance of FacadeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.FacadeType createFacadeType()
@@ -1261,7 +1262,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.FacadeType createFacadeType()
     /**
      * Create an instance of MaritalStatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MaritalStatusElement createMaritalStatusElement()
@@ -1273,7 +1274,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MaritalStatusElement createMaritalS
     /**
      * Create an instance of CommonNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.CommonNameType createCommonNameType()
@@ -1285,7 +1286,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.CommonNameType createCommonNameType
     /**
      * Create an instance of ResourceIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.ResourceIDElement createResourceIDElement()
@@ -1297,7 +1298,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.ResourceIDElement createResourceIDE
     /**
      * Create an instance of StElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.StElement createStElement()
@@ -1309,7 +1310,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.StElement createStElement()
     /**
      * Create an instance of LMNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LMNElement createLMNElement()
@@ -1321,7 +1322,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LMNElement createLMNElement()
     /**
      * Create an instance of MsgContactElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgContactElement createMsgContactElement()
@@ -1333,7 +1334,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgContactElement createMsgContactE
     /**
      * Create an instance of MsgTechnologyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgTechnologyElement createMsgTechnologyElement()
@@ -1345,7 +1346,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgTechnologyElement createMsgTechn
     /**
      * Create an instance of AltLOElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AltLOElement createAltLOElement()
@@ -1357,7 +1358,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AltLOElement createAltLOElement()
     /**
      * Create an instance of QueryTypeQueryItemType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.QueryType.QueryItemType createQueryTypeQueryItemType()
@@ -1369,7 +1370,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.QueryType.QueryItemType createQuery
     /**
      * Create an instance of DSTInteger
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DSTInteger createDSTInteger()
@@ -1381,7 +1382,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DSTInteger createDSTInteger()
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.StatusType createStatusType()
@@ -1393,7 +1394,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.StatusType createStatusType()
     /**
      * Create an instance of AltOElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AltOElement createAltOElement()
@@ -1405,7 +1406,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AltOElement createAltOElement()
     /**
      * Create an instance of MNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MNElement createMNElement()
@@ -1417,7 +1418,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MNElement createMNElement()
     /**
      * Create an instance of DSTLocalizedString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DSTLocalizedString createDSTLocalizedString()
@@ -1429,7 +1430,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DSTLocalizedString createDSTLocaliz
     /**
      * Create an instance of VATType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.VATType createVATType()
@@ -1441,7 +1442,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.VATType createVATType()
     /**
      * Create an instance of MsgTypeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgTypeElement createMsgTypeElement()
@@ -1453,7 +1454,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.MsgTypeElement createMsgTypeElement
     /**
      * Create an instance of EmploymentIdentityType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.EmploymentIdentityType createEmploymentIdentityType()
@@ -1465,7 +1466,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.EmploymentIdentityType createEmploy
     /**
      * Create an instance of WebSiteElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.WebSiteElement createWebSiteElement()
@@ -1477,7 +1478,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.WebSiteElement createWebSiteElement
     /**
      * Create an instance of EncryptedResourceIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.EncryptedResourceIDElement createEncryptedResourceIDElement()
@@ -1489,7 +1490,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.EncryptedResourceIDElement createEn
     /**
      * Create an instance of DSTString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DSTString createDSTString()
@@ -1501,7 +1502,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DSTString createDSTString()
     /**
      * Create an instance of AgeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AgeElement createAgeElement()
@@ -1513,7 +1514,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AgeElement createAgeElement()
     /**
      * Create an instance of DemographicsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.DemographicsType createDemographicsType()
@@ -1525,7 +1526,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.DemographicsType createDemographics
     /**
      * Create an instance of AddressCardType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AddressCardType createAddressCardType()
@@ -1537,7 +1538,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AddressCardType createAddressCardTy
     /**
      * Create an instance of LegalIdentityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LegalIdentityElement createLegalIdentityElement()
@@ -1549,7 +1550,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LegalIdentityElement createLegalIde
     /**
      * Create an instance of LCNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.LCNElement createLCNElement()
@@ -1561,7 +1562,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.LCNElement createLCNElement()
     /**
      * Create an instance of AnalyzedNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.AnalyzedNameType createAnalyzedNameType()
@@ -1573,7 +1574,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.AnalyzedNameType createAnalyzedName
     /**
      * Create an instance of SNElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.SNElement createSNElement()
@@ -1585,7 +1586,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.SNElement createSNElement()
     /**
      * Create an instance of QueryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.QueryElement createQueryElement()
@@ -1597,7 +1598,7 @@ public com.sun.identity.liberty.ws.idpp.jaxb.QueryElement createQueryElement()
     /**
      * Create an instance of MsgSubaccountElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.jaxb.MsgSubaccountElement createMsgSubaccountElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPElement.java
index b20f43ef0c..983706c83e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PP element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 31)
- * 
                    
  * 
                    - * <element name="PP" type="{urn:liberty:id-sis-pp:2003-08}PPType"/>
+ * <element name="PP" type="{urn:liberty:id-sis-pp:2003-08}PPType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPType.java
index 2d723a8e9a..7d31d88f9c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PPType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,31 +13,30 @@
 /**
  * Java content class for PPType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 32)
- * 
                    
  * 
                    - * <complexType name="PPType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}InformalName" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LInformalName" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}CommonName" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LegalIdentity" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}EmploymentIdentity" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}AddressCard" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgContact" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Facade" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Demographics" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}SignKey" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}EncryptKey" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}EmergencyContact" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}LEmergencyContact" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PPType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}InformalName" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LInformalName" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}CommonName" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LegalIdentity" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}EmploymentIdentity" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}AddressCard" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}MsgContact" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Facade" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Demographics" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}SignKey" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}EncryptKey" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}EmergencyContact" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}LEmergencyContact" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PersonalTitleElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PersonalTitleElement.java
index 787786c882..141d3d8a4e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PersonalTitleElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PersonalTitleElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PersonalTitle element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 85)
- * 
                    
  * 
                    - * <element name="PersonalTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="PersonalTitle" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalAddressElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalAddressElement.java
index 343eeb3b7b..3cc06a2458 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalAddressElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalAddressElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PostalAddress element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 180)
- * 
                    
  * 
                    - * <element name="PostalAddress" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="PostalAddress" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalCodeElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalCodeElement.java
index 82ac02ce52..0d82789dcb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalCodeElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/PostalCodeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PostalCode element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 182)
- * 
                    
  * 
                    - * <element name="PostalCode" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="PostalCode" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryElement.java
index e896693b93..f1593527da 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Query element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 56)
- * 
                    
  * 
                    - * <element name="Query" type="{urn:liberty:id-sis-pp:2003-08}QueryType"/>
+ * <element name="Query" type="{urn:liberty:id-sis-pp:2003-08}QueryType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseElement.java
index 19c815d4ce..9224389526 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for QueryResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 76)
- * 
                    
  * 
                    - * <element name="QueryResponse" type="{urn:liberty:id-sis-pp:2003-08}QueryResponseType"/>
+ * <element name="QueryResponse" type="{urn:liberty:id-sis-pp:2003-08}QueryResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseType.java
index e2d496f76f..57a19390ce 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,34 +13,33 @@
 /**
  * Java content class for QueryResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 77)
- * 
                    
  * 
                    - * <complexType name="QueryResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Status"/>
- *         <element name="Data" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *                 <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
- *       <attribute name="timeStamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Status"/>
+ *         <element name="Data" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *                 <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
+ *       <attribute name="timeStamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -171,19 +171,18 @@ public interface QueryResponseType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 81)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <any/>
-     *       </sequence>
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *       <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <any/>
+     *       </sequence>
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *       <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryType.java
index e9ed7a379a..4e10f5fed1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/QueryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,35 +13,34 @@
 /**
  * Java content class for QueryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="QueryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:id-sis-pp:2003-08}ResourceIDGroup" minOccurs="0"/>
- *         <element name="QueryItem" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
- *                 </sequence>
- *                 <attribute name="changedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *                 <attribute name="includeCommonAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
- *                 <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:id-sis-pp:2003-08}ResourceIDGroup" minOccurs="0"/>
+ *         <element name="QueryItem" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
+ *                 </sequence>
+ *                 <attribute name="changedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *                 <attribute name="includeCommonAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
+ *                 <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -174,21 +174,20 @@ public interface QueryType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 61)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
-     *       </sequence>
-     *       <attribute name="changedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *       <attribute name="includeCommonAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
-     *       <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="Select" type="{urn:liberty:id-sis-pp:2003-08}SelectType"/>
+     *       </sequence>
+     *       <attribute name="changedSince" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *       <attribute name="includeCommonAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
+     *       <attribute name="itemID" type="{urn:liberty:id-sis-pp:2003-08}IDType" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResourceIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResourceIDElement.java
index e1f5d3a33f..1d2e01015f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResourceIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResourceIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ResourceID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 47)
- * 
                    
  * 
                    - * <element name="ResourceID" type="{urn:liberty:disco:2003-08}ResourceIDType"/>
+ * <element name="ResourceID" type="{urn:liberty:disco:2003-08}ResourceIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResponseType.java
index e9e916c70d..26f135efe1 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/ResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for ResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-svc-dst.xsd line 123)
- * 
                    
  * 
                    - * <complexType name="ResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Status"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
- *       <attribute name="timeStamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Status"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="itemIDRef" type="{urn:liberty:id-sis-pp:2003-08}IDReferenceType" />
+ *       <attribute name="timeStamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SNElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SNElement.java
index fe25708b9c..4bb2738448 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SNElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SNElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SN element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 89)
- * 
                    
  * 
                    - * <element name="SN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="SN" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SignKeyElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SignKeyElement.java
index c1a06df86f..a8243cff38 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SignKeyElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/SignKeyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignKey element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 254)
- * 
                    
  * 
                    - * <element name="SignKey" type="{urn:liberty:id-sis-pp:2003-08}KeyInfoType"/>
+ * <element name="SignKey" type="{urn:liberty:id-sis-pp:2003-08}KeyInfoType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StElement.java
index 848c3d0675..e6f38b8158 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for St element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 185)
- * 
                    
  * 
                    - * <element name="St" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="St" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusElement.java
index 1403bb62a9..978c398e1d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:id-sis-pp:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:id-sis-pp:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusType.java
index 8c7ef644ec..2d32bf4c94 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/TimeZoneElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/TimeZoneElement.java
index f700e3790e..94426841de 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/TimeZoneElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/TimeZoneElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for TimeZone element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 253)
- * 
                    
  * 
                    - * <element name="TimeZone" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
+ * <element name="TimeZone" type="{urn:liberty:id-sis-pp:2003-08}DSTString"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATElement.java
index 598e71ad76..a74c163aa3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for VAT element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 110)
- * 
                    
  * 
                    - * <element name="VAT" type="{urn:liberty:id-sis-pp:2003-08}VATType"/>
+ * <element name="VAT" type="{urn:liberty:id-sis-pp:2003-08}VATType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATType.java
index 18b38c4625..4e69a8ad1a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/VATType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for VATType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 111)
- * 
                    
  * 
                    - * <complexType name="VATType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDValue"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDType" minOccurs="0"/>
- *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VATType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDValue"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}IDType" minOccurs="0"/>
+ *         <element ref="{urn:liberty:id-sis-pp:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attGroup ref="{urn:liberty:id-sis-pp:2003-08}commonAttributes"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/WebSiteElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/WebSiteElement.java
index 5f30a07afe..178b1cf4e7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/WebSiteElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/WebSiteElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for WebSite element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-id-sis-pp.xsd line 234)
- * 
                    
  * 
                    - * <element name="WebSite" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
+ * <element name="WebSite" type="{urn:liberty:id-sis-pp:2003-08}DSTURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/ObjectFactory.java
index e301edaa62..2d958c7e5e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -53,7 +54,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -72,7 +73,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -91,7 +92,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -103,7 +104,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of PPISExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.plugin.jaxb.PPISExtensionType createPPISExtensionType()
@@ -115,7 +116,7 @@ public com.sun.identity.liberty.ws.idpp.plugin.jaxb.PPISExtensionType createPPIS
     /**
      * Create an instance of PPISExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.idpp.plugin.jaxb.PPISExtensionElement createPPISExtensionElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionElement.java
index 2746a63f87..527efc7111 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for PPISExtension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/ppextension.xsd line 39)
- * 
                    
  * 
                    - * <element name="PPISExtension">
- *   <complexType>
- *     <simpleContent>
- *       <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       </extension>
- *     </simpleContent>
- *   </complexType>
- * </element>
+ * <element name="PPISExtension">
+ *   <complexType>
+ *     <simpleContent>
+ *       <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       </extension>
+ *     </simpleContent>
+ *   </complexType>
+ * </element>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionType.java
index cc58992643..0971ed8944 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/plugin/jaxb/PPISExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for anonymous complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/ppextension.xsd line 40)
- * 
                    
  * 
                    - * <complexType>
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType>
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EmptyType.java
index 773182fb3d..75658eb158 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EncryptedResourceIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EncryptedResourceIDElement.java
index 4272ff3246..e713370de6 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EncryptedResourceIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/EncryptedResourceIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedResourceID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 67)
- * 
                    
  * 
                    - * <element name="EncryptedResourceID" type="{urn:liberty:disco:2003-08}EncryptedResourceIDType"/>
+ * <element name="EncryptedResourceID" type="{urn:liberty:disco:2003-08}EncryptedResourceIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionElement.java
index cf8a60c49e..767b07f3f3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:is:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:is:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionType.java
index ed1bb4dd5c..00903a4a1c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpElement.java
index 84b880714c..238c6c68f7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Help element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 99)
- * 
                    
  * 
                    - * <element name="Help" type="{urn:liberty:is:2003-08}HelpType"/>
+ * <element name="Help" type="{urn:liberty:is:2003-08}HelpType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpType.java
index 83ee40d0d7..2fecbb2095 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HelpType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for HelpType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 100)
- * 
                    
  * 
                    - * <complexType name="HelpType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="link" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="moreLink" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="HelpType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="link" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="moreLink" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HintElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HintElement.java
index 247b354f9b..d102e5151f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HintElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/HintElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Hint element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 105)
- * 
                    
  * 
                    - * <element name="Hint" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="Hint" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElement.java
index c82e0ff597..53dbf542ad 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Inquiry element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 86)
- * 
                    
  * 
                    - * <element name="Inquiry" type="{urn:liberty:is:2003-08}InquiryType"/>
+ * <element name="Inquiry" type="{urn:liberty:is:2003-08}InquiryType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElementType.java
index 04d25935da..41e6479550 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryElementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for InquiryElementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 135)
- * 
                    
  * 
                    - * <complexType name="InquiryElementType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:is:2003-08}Help" minOccurs="0"/>
- *         <element ref="{urn:liberty:is:2003-08}Hint" minOccurs="0"/>
- *         <element name="Label" type="{http://www.w3.org/2001/XMLSchema}normalizedString" minOccurs="0"/>
- *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}normalizedString" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InquiryElementType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:is:2003-08}Help" minOccurs="0"/>
+ *         <element ref="{urn:liberty:is:2003-08}Hint" minOccurs="0"/>
+ *         <element name="Label" type="{http://www.w3.org/2001/XMLSchema}normalizedString" minOccurs="0"/>
+ *         <element name="Value" type="{http://www.w3.org/2001/XMLSchema}normalizedString" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryType.java
index 41b65027b2..89536c8474 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InquiryType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for InquiryType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 87)
- * 
                    
  * 
                    - * <complexType name="InquiryType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:is:2003-08}Help" minOccurs="0"/>
- *         <choice maxOccurs="unbounded">
- *           <element ref="{urn:liberty:is:2003-08}Select" maxOccurs="unbounded" minOccurs="0"/>
- *           <element name="Confirm" type="{urn:liberty:is:2003-08}InquiryElementType" maxOccurs="unbounded" minOccurs="0"/>
- *           <element ref="{urn:liberty:is:2003-08}Text" maxOccurs="unbounded" minOccurs="0"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InquiryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:is:2003-08}Help" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element ref="{urn:liberty:is:2003-08}Select" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="Confirm" type="{urn:liberty:is:2003-08}InquiryElementType" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element ref="{urn:liberty:is:2003-08}Text" maxOccurs="unbounded" minOccurs="0"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -121,9 +121,8 @@ public interface InquiryType {
     /**
      * Java content class for Confirm element declaration.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 92)
-     * 
                    
      * 
                    -     * <element name="Confirm" type="{urn:liberty:is:2003-08}InquiryElementType"/>
+     * <element name="Confirm" type="{urn:liberty:is:2003-08}InquiryElementType"/>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestElement.java
index df79358b61..b66d5c613b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for InteractionRequest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 74)
- * 
                    
  * 
                    - * <element name="InteractionRequest" type="{urn:liberty:is:2003-08}InteractionRequestType"/>
+ * <element name="InteractionRequest" type="{urn:liberty:is:2003-08}InteractionRequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestType.java
index 5af257d0db..fbb05c8bb0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionRequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for InteractionRequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 75)
- * 
                    
  * 
                    - * <complexType name="InteractionRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <group ref="{urn:liberty:is:2003-08}ResourceIDGroup" minOccurs="0"/>
- *         <element ref="{urn:liberty:is:2003-08}Inquiry" maxOccurs="unbounded"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="language" type="{http://www.w3.org/2001/XMLSchema}NMTOKENS" />
- *       <attribute name="maxInteractTime" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="signed" type="{http://www.w3.org/2001/XMLSchema}token" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InteractionRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <group ref="{urn:liberty:is:2003-08}ResourceIDGroup" minOccurs="0"/>
+ *         <element ref="{urn:liberty:is:2003-08}Inquiry" maxOccurs="unbounded"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="language" type="{http://www.w3.org/2001/XMLSchema}NMTOKENS" />
+ *       <attribute name="maxInteractTime" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="signed" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseElement.java
index 7baa3ca181..6dacf08767 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for InteractionResponse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 144)
- * 
                    
  * 
                    - * <element name="InteractionResponse" type="{urn:liberty:is:2003-08}InteractionResponseType"/>
+ * <element name="InteractionResponse" type="{urn:liberty:is:2003-08}InteractionResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseType.java
index 9792486c48..c74a9d58ac 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for InteractionResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 145)
- * 
                    
  * 
                    - * <complexType name="InteractionResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:is:2003-08}Status"/>
- *         <choice>
- *           <element name="InteractionStatement" type="{urn:liberty:is:2003-08}InteractionStatementType" maxOccurs="unbounded" minOccurs="0"/>
- *           <element name="Parameter" type="{urn:liberty:is:2003-08}ParameterType" maxOccurs="unbounded" minOccurs="0"/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InteractionResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:is:2003-08}Status"/>
+ *         <choice>
+ *           <element name="InteractionStatement" type="{urn:liberty:is:2003-08}InteractionStatementType" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="Parameter" type="{urn:liberty:is:2003-08}ParameterType" maxOccurs="unbounded" minOccurs="0"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionStatementType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionStatementType.java
index 4c2add4bae..84a0e497e0 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionStatementType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/InteractionStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for InteractionStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 154)
- * 
                    
  * 
                    - * <complexType name="InteractionStatementType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:is:2003-08}Inquiry"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InteractionStatementType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:is:2003-08}Inquiry"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ObjectFactory.java
index fe48725423..47b299e6b7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -92,7 +93,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -111,7 +112,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -130,7 +131,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -142,7 +143,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of InteractionRequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InteractionRequestType createInteractionRequestType()
@@ -154,7 +155,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InteractionRequestType creat
     /**
      * Create an instance of EncryptedResourceIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.EncryptedResourceIDElement createEncryptedResourceIDElement()
@@ -166,7 +167,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.EncryptedResourceIDElement c
     /**
      * Create an instance of InquiryTypeConfirm
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InquiryType.Confirm createInquiryTypeConfirm()
@@ -178,7 +179,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InquiryType.Confirm createIn
     /**
      * Create an instance of HintElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.HintElement createHintElement()
@@ -190,7 +191,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.HintElement createHintElemen
     /**
      * Create an instance of HintElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.HintElement createHintElement(java.lang.String value)
@@ -202,7 +203,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.HintElement createHintElemen
     /**
      * Create an instance of SelectType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.SelectType createSelectType()
@@ -214,7 +215,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.SelectType createSelectType(
     /**
      * Create an instance of InquiryElementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InquiryElementType createInquiryElementType()
@@ -226,7 +227,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InquiryElementType createInq
     /**
      * Create an instance of InquiryElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InquiryElement createInquiryElement()
@@ -238,7 +239,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InquiryElement createInquiry
     /**
      * Create an instance of ParameterType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.ParameterType createParameterType()
@@ -250,7 +251,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.ParameterType createParamete
     /**
      * Create an instance of InquiryType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InquiryType createInquiryType()
@@ -262,7 +263,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InquiryType createInquiryTyp
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.ExtensionElement createExtensionElement()
@@ -274,7 +275,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.ExtensionElement createExten
     /**
      * Create an instance of SelectTypeItemType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.SelectType.ItemType createSelectTypeItemType()
@@ -286,7 +287,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.SelectType.ItemType createSe
     /**
      * Create an instance of TextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.TextType createTextType()
@@ -298,7 +299,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.TextType createTextType()
     /**
      * Create an instance of InteractionResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InteractionResponseElement createInteractionResponseElement()
@@ -310,7 +311,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InteractionResponseElement c
     /**
      * Create an instance of HelpElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.HelpElement createHelpElement()
@@ -322,7 +323,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.HelpElement createHelpElemen
     /**
      * Create an instance of TextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.TextElement createTextElement()
@@ -334,7 +335,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.TextElement createTextElemen
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.StatusElement createStatusElement()
@@ -346,7 +347,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.StatusElement createStatusEl
     /**
      * Create an instance of InteractionStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InteractionStatementType createInteractionStatementType()
@@ -358,7 +359,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InteractionStatementType cre
     /**
      * Create an instance of InteractionRequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InteractionRequestElement createInteractionRequestElement()
@@ -370,7 +371,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InteractionRequestElement cr
     /**
      * Create an instance of ResourceIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.ResourceIDElement createResourceIDElement()
@@ -382,7 +383,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.ResourceIDElement createReso
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.ExtensionType createExtensionType()
@@ -394,7 +395,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.ExtensionType createExtensio
     /**
      * Create an instance of UserInteractionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.UserInteractionElement createUserInteractionElement()
@@ -406,7 +407,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.UserInteractionElement creat
     /**
      * Create an instance of UserInteractionHeaderType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.UserInteractionHeaderType createUserInteractionHeaderType()
@@ -418,7 +419,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.UserInteractionHeaderType cr
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.EmptyType createEmptyType()
@@ -430,7 +431,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.EmptyType createEmptyType()
     /**
      * Create an instance of InteractionResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.InteractionResponseType createInteractionResponseType()
@@ -442,7 +443,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.InteractionResponseType crea
     /**
      * Create an instance of RedirectRequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.RedirectRequestElement createRedirectRequestElement()
@@ -454,7 +455,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.RedirectRequestElement creat
     /**
      * Create an instance of RedirectRequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.RedirectRequestType createRedirectRequestType()
@@ -466,7 +467,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.RedirectRequestType createRe
     /**
      * Create an instance of HelpType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.HelpType createHelpType()
@@ -478,7 +479,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.HelpType createHelpType()
     /**
      * Create an instance of SelectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.SelectElement createSelectElement()
@@ -490,7 +491,7 @@ public com.sun.identity.liberty.ws.interaction.jaxb.SelectElement createSelectEl
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.interaction.jaxb.StatusType createStatusType()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ParameterType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ParameterType.java
index d12a7a63f9..4498183ceb 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ParameterType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ParameterType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for ParameterType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 160)
- * 
                    
  * 
                    - * <complexType name="ParameterType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ParameterType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestElement.java
index b4f4fd1710..bcc593b20d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RedirectRequest element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 62)
- * 
                    
  * 
                    - * <element name="RedirectRequest" type="{urn:liberty:is:2003-08}RedirectRequestType"/>
+ * <element name="RedirectRequest" type="{urn:liberty:is:2003-08}RedirectRequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestType.java
index 4b63c7ad16..6d972d7b23 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/RedirectRequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for RedirectRequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 63)
- * 
                    
  * 
                    - * <complexType name="RedirectRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="redirectURL" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RedirectRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="redirectURL" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ResourceIDElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ResourceIDElement.java
index 11d005aae7..a45ea943e5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ResourceIDElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/ResourceIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ResourceID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 66)
- * 
                    
  * 
                    - * <element name="ResourceID" type="{urn:liberty:disco:2003-08}ResourceIDType"/>
+ * <element name="ResourceID" type="{urn:liberty:disco:2003-08}ResourceIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectElement.java
index f592f19a32..bf0b0499a3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Select element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 106)
- * 
                    
  * 
                    - * <element name="Select" type="{urn:liberty:is:2003-08}SelectType"/>
+ * <element name="Select" type="{urn:liberty:is:2003-08}SelectType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectType.java
index 6e2de54778..e3db4683ba 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/SelectType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,30 +13,29 @@
 /**
  * Java content class for SelectType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 107)
- * 
                    
  * 
                    - * <complexType name="SelectType">
- *   <complexContent>
- *     <extension base="{urn:liberty:is:2003-08}InquiryElementType">
- *       <sequence>
- *         <element name="Item" maxOccurs="unbounded" minOccurs="2">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element ref="{urn:liberty:is:2003-08}Hint" minOccurs="0"/>
- *                 </sequence>
- *                 <attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="multiple" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SelectType">
+ *   <complexContent>
+ *     <extension base="{urn:liberty:is:2003-08}InquiryElementType">
+ *       <sequence>
+ *         <element name="Item" maxOccurs="unbounded" minOccurs="2">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element ref="{urn:liberty:is:2003-08}Hint" minOccurs="0"/>
+ *                 </sequence>
+ *                 <attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="multiple" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -83,19 +83,18 @@ public interface SelectType
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 112)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element ref="{urn:liberty:is:2003-08}Hint" minOccurs="0"/>
-     *       </sequence>
-     *       <attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element ref="{urn:liberty:is:2003-08}Hint" minOccurs="0"/>
+     *       </sequence>
+     *       <attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusElement.java
index 970075b86c..b6f367763a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:is:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:is:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusType.java
index 32c3709f97..e471aaf665 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:is:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:is:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextElement.java
index 82543df187..5a3474e9be 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Text element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 125)
- * 
                    
  * 
                    - * <element name="Text" type="{urn:liberty:is:2003-08}TextType"/>
+ * <element name="Text" type="{urn:liberty:is:2003-08}TextType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextType.java
index 277f7bf66d..444118ffdd 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/TextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for TextType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 126)
- * 
                    
  * 
                    - * <complexType name="TextType">
- *   <complexContent>
- *     <extension base="{urn:liberty:is:2003-08}InquiryElementType">
- *       <attribute name="format" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="maxChars" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="minChars" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TextType">
+ *   <complexContent>
+ *     <extension base="{urn:liberty:is:2003-08}InquiryElementType">
+ *       <attribute name="format" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="maxChars" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="minChars" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionElement.java
index 6f5bcc9de5..eac10f6c5c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for UserInteraction element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 49)
- * 
                    
  * 
                    - * <element name="UserInteraction" type="{urn:liberty:is:2003-08}UserInteractionHeaderType"/>
+ * <element name="UserInteraction" type="{urn:liberty:is:2003-08}UserInteractionHeaderType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionHeaderType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionHeaderType.java
index bd9d570206..a75671c33e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionHeaderType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/UserInteractionHeaderType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for UserInteractionHeaderType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-interact-svc.xsd line 50)
- * 
                    
  * 
                    - * <complexType name="UserInteractionHeaderType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="InteractionService" type="{urn:liberty:disco:2003-08}ResourceOfferingType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="interact" type="{http://www.w3.org/2001/XMLSchema}QName" default="is:interactIfNeeded" />
- *       <attribute name="language" type="{http://www.w3.org/2001/XMLSchema}NMTOKENS" />
- *       <attribute name="maxInteractTime" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="redirect" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UserInteractionHeaderType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="InteractionService" type="{urn:liberty:disco:2003-08}ResourceOfferingType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="interact" type="{http://www.w3.org/2001/XMLSchema}QName" default="is:interactIfNeeded" />
+ *       <attribute name="language" type="{http://www.w3.org/2001/XMLSchema}NMTOKENS" />
+ *       <attribute name="maxInteractTime" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="redirect" type="{http://www.w3.org/2001/XMLSchema}boolean" default="0" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AdditionalMetadataLocationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AdditionalMetadataLocationType.java
index 5a9c3955a7..41e22a76dc 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AdditionalMetadataLocationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AdditionalMetadataLocationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for additionalMetadataLocationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 60)
- * 
                    
  * 
                    - * <complexType name="additionalMetadataLocationType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="namespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="additionalMetadataLocationType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="namespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AffiliationDescriptorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AffiliationDescriptorType.java
index b5b180b8c5..10673100ff 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AffiliationDescriptorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/AffiliationDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for affiliationDescriptorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 222)
- * 
                    
  * 
                    - * <complexType name="affiliationDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="AffiliateMember" type="{urn:liberty:metadata:2003-08}entityIDType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
- *         <element ref="{urn:liberty:metadata:2003-08}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="affiliationID" use="required" type="{urn:liberty:metadata:2003-08}entityIDType" />
- *       <attribute name="affiliationOwnerID" use="required" type="{urn:liberty:metadata:2003-08}entityIDType" />
- *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="affiliationDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="AffiliateMember" type="{urn:liberty:metadata:2003-08}entityIDType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
+ *         <element ref="{urn:liberty:metadata:2003-08}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="affiliationID" use="required" type="{urn:liberty:metadata:2003-08}entityIDType" />
+ *       <attribute name="affiliationOwnerID" use="required" type="{urn:liberty:metadata:2003-08}entityIDType" />
+ *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ContactType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ContactType.java
index 7aaf406596..2f02e22f5c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ContactType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ContactType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for contactType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 96)
- * 
                    
  * 
                    - * <complexType name="contactType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Company" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="SurName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="EmailAddress" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="TelephoneNumber" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="contactType" use="required" type="{urn:liberty:metadata:2003-08}attr.contactType" />
- *       <attribute name="libertyPrincipalIdentifier" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="contactType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Company" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="SurName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="EmailAddress" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="TelephoneNumber" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="contactType" use="required" type="{urn:liberty:metadata:2003-08}attr.contactType" />
+ *       <attribute name="libertyPrincipalIdentifier" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EmptyType.java
index 31b3cfc35c..5aece457f4 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type can be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 69)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorElement.java
index 0409db3084..f887d6e78a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EntitiesDescriptor element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 216)
- * 
                    
  * 
                    - * <element name="EntitiesDescriptor" type="{urn:liberty:metadata:2003-08}entitiesDescriptorType"/>
+ * <element name="EntitiesDescriptor" type="{urn:liberty:metadata:2003-08}entitiesDescriptorType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorType.java
index 012e4eaa4f..1c8f77b6c9 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntitiesDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for entitiesDescriptorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 217)
- * 
                    
  * 
                    - * <complexType name="entitiesDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:metadata:2003-08}EntityDescriptor" maxOccurs="unbounded" minOccurs="2"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="entitiesDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:metadata:2003-08}EntityDescriptor" maxOccurs="unbounded" minOccurs="2"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorElement.java
index dd9754b627..6c3d3b0ba6 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EntityDescriptor element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 161)
- * 
                    
  * 
                    - * <element name="EntityDescriptor" type="{urn:liberty:metadata:2003-08}entityDescriptorType"/>
+ * <element name="EntityDescriptor" type="{urn:liberty:metadata:2003-08}entityDescriptorType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorType.java
index b8991269f1..261cb2cb47 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/EntityDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,28 +13,27 @@
 /**
  * Java content class for entityDescriptorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 168)
- * 
                    
  * 
                    - * <complexType name="entityDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <group ref="{urn:liberty:metadata:2003-08}providerGroup"/>
- *           <element name="AffiliationDescriptor" type="{urn:liberty:metadata:2003-08}affiliationDescriptorType"/>
- *         </choice>
- *         <element name="ContactPerson" type="{urn:liberty:metadata:2003-08}contactType" minOccurs="0"/>
- *         <element name="Organization" type="{urn:liberty:metadata:2003-08}organizationType" minOccurs="0"/>
- *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="providerID" use="required" type="{urn:liberty:metadata:2003-08}entityIDType" />
- *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="entityDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <group ref="{urn:liberty:metadata:2003-08}providerGroup"/>
+ *           <element name="AffiliationDescriptor" type="{urn:liberty:metadata:2003-08}affiliationDescriptorType"/>
+ *         </choice>
+ *         <element name="ContactPerson" type="{urn:liberty:metadata:2003-08}contactType" minOccurs="0"/>
+ *         <element name="Organization" type="{urn:liberty:metadata:2003-08}organizationType" minOccurs="0"/>
+ *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="providerID" use="required" type="{urn:liberty:metadata:2003-08}entityIDType" />
+ *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionElement.java
index c3d060ad75..567df4a050 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * For arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 77)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:metadata:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:metadata:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionType.java
index 72ca558cf1..25004bf5af 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * For arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 82)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorElement.java
index 1a8ee19923..3fd46c7768 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDPDescriptor element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 203)
- * 
                    
  * 
                    - * <element name="IDPDescriptor" type="{urn:liberty:metadata:2003-08}IDPDescriptorType"/>
+ * <element name="IDPDescriptor" type="{urn:liberty:metadata:2003-08}IDPDescriptorType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorType.java
index 069270acbc..3f2ac37df7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/IDPDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for IDPDescriptorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 205)
- * 
                    
  * 
                    - * <complexType name="IDPDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:liberty:metadata:2003-08}providerDescriptorType">
- *       <sequence>
- *         <element name="SingleSignOnServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <element name="SingleSignOnProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *         <element name="AuthnServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IDPDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:liberty:metadata:2003-08}providerDescriptorType">
+ *       <sequence>
+ *         <element name="SingleSignOnServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element name="SingleSignOnProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *         <element name="AuthnServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorElement.java
index 37e1d59292..b176db8537 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyDescriptor element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 150)
- * 
                    
  * 
                    - * <element name="KeyDescriptor" type="{urn:liberty:metadata:2003-08}keyDescriptorType"/>
+ * <element name="KeyDescriptor" type="{urn:liberty:metadata:2003-08}keyDescriptorType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorType.java
index 19c423ef17..4d9b491e25 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/KeyDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for keyDescriptorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 151)
- * 
                    
  * 
                    - * <complexType name="keyDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncryptionMethod" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="KeySize" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="use" type="{urn:liberty:metadata:2003-08}keyTypes" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="keyDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncryptionMethod" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="KeySize" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="use" type="{urn:liberty:metadata:2003-08}keyTypes" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/LocalizedURIType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/LocalizedURIType.java
index ff070bf138..42fd18f4e2 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/LocalizedURIType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/LocalizedURIType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for localizedURIType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 89)
- * 
                    
  * 
                    - * <complexType name="localizedURIType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="localizedURIType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ObjectFactory.java
index b6016d7df1..8918d141e7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -81,7 +82,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -100,7 +101,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -119,7 +120,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -131,7 +132,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of SPDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType createSPDescriptorType()
@@ -143,7 +144,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType createSPDescriptor
     /**
      * Create an instance of AffiliationDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.AffiliationDescriptorType createAffiliationDescriptorType()
@@ -155,7 +156,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.AffiliationDescriptorType createAff
     /**
      * Create an instance of OrganizationDisplayNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.OrganizationDisplayNameType createOrganizationDisplayNameType()
@@ -167,7 +168,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.OrganizationDisplayNameType createO
     /**
      * Create an instance of LocalizedURIType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.LocalizedURIType createLocalizedURIType()
@@ -179,7 +180,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.LocalizedURIType createLocalizedURI
     /**
      * Create an instance of AdditionalMetadataLocationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.AdditionalMetadataLocationType createAdditionalMetadataLocationType()
@@ -191,7 +192,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.AdditionalMetadataLocationType crea
     /**
      * Create an instance of EntityDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.EntityDescriptorElement createEntityDescriptorElement()
@@ -203,7 +204,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.EntityDescriptorElement createEntit
     /**
      * Create an instance of OrganizationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.OrganizationType createOrganizationType()
@@ -215,7 +216,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.OrganizationType createOrganization
     /**
      * Create an instance of EntityDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.EntityDescriptorType createEntityDescriptorType()
@@ -227,7 +228,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.EntityDescriptorType createEntityDe
     /**
      * Create an instance of KeyDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.KeyDescriptorElement createKeyDescriptorElement()
@@ -239,7 +240,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.KeyDescriptorElement createKeyDescr
     /**
      * Create an instance of OrganizationNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.OrganizationNameType createOrganizationNameType()
@@ -251,7 +252,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.OrganizationNameType createOrganiza
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.StatusType createStatusType()
@@ -263,7 +264,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.StatusType createStatusType()
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.EmptyType createEmptyType()
@@ -275,7 +276,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.EmptyType createEmptyType()
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.ExtensionElement createExtensionElement()
@@ -287,7 +288,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.ExtensionElement createExtensionEle
     /**
      * Create an instance of KeyDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.KeyDescriptorType createKeyDescriptorType()
@@ -299,7 +300,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.KeyDescriptorType createKeyDescript
     /**
      * Create an instance of EntitiesDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.EntitiesDescriptorType createEntitiesDescriptorType()
@@ -311,7 +312,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.EntitiesDescriptorType createEntiti
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.StatusElement createStatusElement()
@@ -323,7 +324,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.StatusElement createStatusElement()
     /**
      * Create an instance of ContactType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.ContactType createContactType()
@@ -335,7 +336,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.ContactType createContactType()
     /**
      * Create an instance of IDPDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.IDPDescriptorType createIDPDescriptorType()
@@ -347,7 +348,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.IDPDescriptorType createIDPDescript
     /**
      * Create an instance of IDPDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.IDPDescriptorElement createIDPDescriptorElement()
@@ -359,7 +360,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.IDPDescriptorElement createIDPDescr
     /**
      * Create an instance of ProviderDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.ProviderDescriptorType createProviderDescriptorType()
@@ -371,7 +372,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.ProviderDescriptorType createProvid
     /**
      * Create an instance of SPDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorElement createSPDescriptorElement()
@@ -383,7 +384,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorElement createSPDescrip
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.ExtensionType createExtensionType()
@@ -395,7 +396,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.ExtensionType createExtensionType()
     /**
      * Create an instance of SPDescriptorTypeAssertionConsumerServiceURLType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerServiceURLType createSPDescriptorTypeAssertionConsumerServiceURLType()
@@ -407,7 +408,7 @@ public com.sun.identity.liberty.ws.meta.jaxb.SPDescriptorType.AssertionConsumerS
     /**
      * Create an instance of EntitiesDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.meta.jaxb.EntitiesDescriptorElement createEntitiesDescriptorElement()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationDisplayNameType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationDisplayNameType.java
index bc1ca43042..81213a6c1b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationDisplayNameType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationDisplayNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for organizationDisplayNameType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 82)
- * 
                    
  * 
                    - * <complexType name="organizationDisplayNameType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="organizationDisplayNameType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationNameType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationNameType.java
index 4eaade3fa2..3b4013345f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationNameType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for organizationNameType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 75)
- * 
                    
  * 
                    - * <complexType name="organizationNameType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="organizationNameType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationType.java
index 57232b158a..990492fb29 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/OrganizationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for organizationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 67)
- * 
                    
  * 
                    - * <complexType name="organizationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OrganizationName" type="{urn:liberty:metadata:2003-08}organizationNameType" maxOccurs="unbounded"/>
- *         <element name="OrganizationDisplayName" type="{urn:liberty:metadata:2003-08}organizationDisplayNameType" maxOccurs="unbounded"/>
- *         <element name="OrganizationURL" type="{urn:liberty:metadata:2003-08}localizedURIType" maxOccurs="unbounded"/>
- *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="organizationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OrganizationName" type="{urn:liberty:metadata:2003-08}organizationNameType" maxOccurs="unbounded"/>
+ *         <element name="OrganizationDisplayName" type="{urn:liberty:metadata:2003-08}organizationDisplayNameType" maxOccurs="unbounded"/>
+ *         <element name="OrganizationURL" type="{urn:liberty:metadata:2003-08}localizedURIType" maxOccurs="unbounded"/>
+ *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ProviderDescriptorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ProviderDescriptorType.java
index ab7e2ac5b4..2ecab50501 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ProviderDescriptorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/ProviderDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,38 +13,37 @@
 /**
  * Java content class for providerDescriptorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 122)
- * 
                    
  * 
                    - * <complexType name="providerDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:metadata:2003-08}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="SoapEndpoint" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="SingleLogoutServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="SingleLogoutServiceReturnURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="FederationTerminationServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="FederationTerminationServiceReturnURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="FederationTerminationNotificationProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="SingleLogoutProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="RegisterNameIdentifierProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="RegisterNameIdentifierServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="RegisterNameIdentifierServiceReturnURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="NameIdentifierMappingProtocolProfile" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBindingType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="NameIdentifierMappingEncryptionProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Organization" type="{urn:liberty:metadata:2003-08}organizationType" minOccurs="0"/>
- *         <element name="ContactPerson" type="{urn:liberty:metadata:2003-08}contactType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="AdditionalMetaLocation" type="{urn:liberty:metadata:2003-08}additionalMetadataLocationType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="protocolSupportEnumeration" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKENS" />
- *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="providerDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:metadata:2003-08}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="SoapEndpoint" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="SingleLogoutServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="SingleLogoutServiceReturnURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="FederationTerminationServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="FederationTerminationServiceReturnURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="FederationTerminationNotificationProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="SingleLogoutProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="RegisterNameIdentifierProtocolProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="RegisterNameIdentifierServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="RegisterNameIdentifierServiceReturnURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="NameIdentifierMappingProtocolProfile" type="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBindingType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="NameIdentifierMappingEncryptionProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Organization" type="{urn:liberty:metadata:2003-08}organizationType" minOccurs="0"/>
+ *         <element name="ContactPerson" type="{urn:liberty:metadata:2003-08}contactType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="AdditionalMetaLocation" type="{urn:liberty:metadata:2003-08}additionalMetadataLocationType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:liberty:metadata:2003-08}Extension" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="protocolSupportEnumeration" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKENS" />
+ *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorElement.java
index 3cb6075cf0..1fb340761b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPDescriptor element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 204)
- * 
                    
  * 
                    - * <element name="SPDescriptor" type="{urn:liberty:metadata:2003-08}SPDescriptorType"/>
+ * <element name="SPDescriptor" type="{urn:liberty:metadata:2003-08}SPDescriptorType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorType.java
index 6e4c1fa201..b52a176530 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/SPDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for SPDescriptorType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 184)
- * 
                    
  * 
                    - * <complexType name="SPDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:liberty:metadata:2003-08}providerDescriptorType">
- *       <sequence>
- *         <element name="AssertionConsumerServiceURL" maxOccurs="unbounded">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *                 <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element name="AuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:liberty:metadata:2003-08}providerDescriptorType">
+ *       <sequence>
+ *         <element name="AssertionConsumerServiceURL" maxOccurs="unbounded">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *                 <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="AuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -80,16 +80,15 @@ public interface SPDescriptorType
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-metadata.xsd line 189)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
-     *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *       <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+     *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *       <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusElement.java
index bd4a29ae01..cab1e2548a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 53)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:metadata:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:metadata:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusType.java
index fe12252d46..1c6fa8531a 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that can be used for status codes
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 58)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:metadata:2003-08}Status" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:metadata:2003-08}Status" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/EmptyType.java
index 195367a42f..c9f7ae1ea5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type can be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 69)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionElement.java
index 3b968d4c81..a3b7e8cd49 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * For arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 77)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:paos:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:paos:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionType.java
index 184821cd2f..accb161a56 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * For arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 82)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ObjectFactory.java
index f9402c1570..e665d71782 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -63,7 +64,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -82,7 +83,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -101,7 +102,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -113,7 +114,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of ResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.ResponseElement createResponseElement()
@@ -125,7 +126,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.ResponseElement createResponseEleme
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.EmptyType createEmptyType()
@@ -137,7 +138,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.EmptyType createEmptyType()
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.ExtensionElement createExtensionElement()
@@ -149,7 +150,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.ExtensionElement createExtensionEle
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.StatusType createStatusType()
@@ -161,7 +162,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.StatusType createStatusType()
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.ExtensionType createExtensionType()
@@ -173,7 +174,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.ExtensionType createExtensionType()
     /**
      * Create an instance of RequestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.RequestElement createRequestElement()
@@ -185,7 +186,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.RequestElement createRequestElement
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.StatusElement createStatusElement()
@@ -197,7 +198,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.StatusElement createStatusElement()
     /**
      * Create an instance of ResponseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.ResponseType createResponseType()
@@ -209,7 +210,7 @@ public com.sun.identity.liberty.ws.paos.jaxb.ResponseType createResponseType()
     /**
      * Create an instance of RequestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.paos.jaxb.RequestType createRequestType()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestElement.java
index 1d94bd1130..1f0414b53c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Request element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-paos.xsd line 46)
- * 
                    
  * 
                    - * <element name="Request" type="{urn:liberty:paos:2003-08}RequestType"/>
+ * <element name="Request" type="{urn:liberty:paos:2003-08}RequestType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestType.java
index 1e863274a7..a78402cb51 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/RequestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for RequestType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-paos.xsd line 47)
- * 
                    
  * 
                    - * <complexType name="RequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="messageID" type="{urn:liberty:paos:2003-08}IDType" />
- *       <attribute name="responseConsumerURL" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="service" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor use="required""/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand use="required""/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="messageID" type="{urn:liberty:paos:2003-08}IDType" />
+ *       <attribute name="responseConsumerURL" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="service" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor use="required""/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand use="required""/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseElement.java
index d7bc41e96d..ab8c984802 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Response element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-paos.xsd line 54)
- * 
                    
  * 
                    - * <element name="Response" type="{urn:liberty:paos:2003-08}ResponseType"/>
+ * <element name="Response" type="{urn:liberty:paos:2003-08}ResponseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseType.java
index 096666e74b..85203bd6e3 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/ResponseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for ResponseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-paos.xsd line 55)
- * 
                    
  * 
                    - * <complexType name="ResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="refToMessageID" type="{urn:liberty:paos:2003-08}IDType" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor use="required""/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand use="required""/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="refToMessageID" type="{urn:liberty:paos:2003-08}IDType" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor use="required""/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand use="required""/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusElement.java
index f26c141daa..6f98d0a621 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 53)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:paos:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:paos:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusType.java
index 73df0d92fc..c9c69aec60 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/paos/jaxb/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that can be used for status codes
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-utility.xsd line 58)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:paos:2003-08}Status" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:paos:2003-08}Status" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentElement.java
index 61cf0cfe73..8ccb800b61 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Consent element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 118)
- * 
                    
  * 
                    - * <element name="Consent" type="{urn:liberty:sb:2003-08}ConsentType"/>
+ * <element name="Consent" type="{urn:liberty:sb:2003-08}ConsentType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentType.java
index 8f534362c9..66a32d6606 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ConsentType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for ConsentType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 110)
- * 
                    
  * 
                    - * <complexType name="ConsentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="uri" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConsentType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="uri" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationElement.java
index a104da440e..b3b44c4667 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Correlation element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 80)
- * 
                    
  * 
                    - * <element name="Correlation" type="{urn:liberty:sb:2003-08}CorrelationType"/>
+ * <element name="Correlation" type="{urn:liberty:sb:2003-08}CorrelationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationType.java
index 1f3e536f00..2bb6f28136 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/CorrelationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for CorrelationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 71)
- * 
                    
  * 
                    - * <complexType name="CorrelationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="messageID" use="required" type="{urn:liberty:sb:2003-08}IDType" />
- *       <attribute name="refToMessageID" type="{urn:liberty:sb:2003-08}IDType" />
- *       <attribute name="timestamp" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CorrelationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="messageID" use="required" type="{urn:liberty:sb:2003-08}IDType" />
+ *       <attribute name="refToMessageID" type="{urn:liberty:sb:2003-08}IDType" />
+ *       <attribute name="timestamp" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/EmptyType.java
index 79c3ec4f3f..8b1cb240c7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionElement.java
index 6b00bd3cc0..6c885da9de 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:sb:2003-08}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:sb:2003-08}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionType.java
index ac97d840ca..bcb6eed667 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ObjectFactory.java
index cb234809d8..78f8c084d5 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -72,7 +73,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -91,7 +92,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -110,7 +111,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -122,7 +123,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of ProcessingContextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ProcessingContextElement createProcessingContextElement()
@@ -134,7 +135,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.ProcessingContextElement cre
     /**
      * Create an instance of ProviderType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ProviderType createProviderType()
@@ -146,7 +147,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.ProviderType createProviderT
     /**
      * Create an instance of UsageDirectiveType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.UsageDirectiveType createUsageDirectiveType()
@@ -158,7 +159,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.UsageDirectiveType createUsa
     /**
      * Create an instance of ProcessingContextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ProcessingContextType createProcessingContextType()
@@ -170,7 +171,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.ProcessingContextType create
     /**
      * Create an instance of CorrelationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.CorrelationElement createCorrelationElement()
@@ -182,7 +183,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.CorrelationElement createCor
     /**
      * Create an instance of ConsentElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ConsentElement createConsentElement()
@@ -194,7 +195,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.ConsentElement createConsent
     /**
      * Create an instance of ProviderElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ProviderElement createProviderElement()
@@ -206,7 +207,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.ProviderElement createProvid
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.StatusType createStatusType()
@@ -218,7 +219,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.StatusType createStatusType(
     /**
      * Create an instance of UsageDirectiveElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.UsageDirectiveElement createUsageDirectiveElement()
@@ -230,7 +231,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.UsageDirectiveElement create
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ExtensionElement createExtensionElement()
@@ -242,7 +243,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.ExtensionElement createExten
     /**
      * Create an instance of CorrelationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.CorrelationType createCorrelationType()
@@ -254,7 +255,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.CorrelationType createCorrel
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.EmptyType createEmptyType()
@@ -266,7 +267,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.EmptyType createEmptyType()
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.StatusElement createStatusElement()
@@ -278,7 +279,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.StatusElement createStatusEl
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ExtensionType createExtensionType()
@@ -290,7 +291,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb.ExtensionType createExtensio
     /**
      * Create an instance of ConsentType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb.ConsentType createConsentType()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextElement.java
index 57fba7521c..58af035558 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProcessingContext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 106)
- * 
                    
  * 
                    - * <element name="ProcessingContext" type="{urn:liberty:sb:2003-08}ProcessingContextType"/>
+ * <element name="ProcessingContext" type="{urn:liberty:sb:2003-08}ProcessingContextType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextType.java
index 4d9699f781..4982514ce7 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProcessingContextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for ProcessingContextType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 96)
- * 
                    
  * 
                    - * <complexType name="ProcessingContextType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ProcessingContextType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderElement.java
index 600ae68250..78f8218eef 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Provider element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 92)
- * 
                    
  * 
                    - * <element name="Provider" type="{urn:liberty:sb:2003-08}ProviderType"/>
+ * <element name="Provider" type="{urn:liberty:sb:2003-08}ProviderType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderType.java
index 6ba70580ba..aaafb8ca43 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/ProviderType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for ProviderType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 84)
- * 
                    
  * 
                    - * <complexType name="ProviderType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="affiliationID" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="providerID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ProviderType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="affiliationID" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="providerID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusElement.java
index 52f7789613..f0aed0cb77 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:sb:2003-08}StatusType"/>
+ * <element name="Status" type="{urn:liberty:sb:2003-08}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusType.java
index bcfd48bf1a..264f83829e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:sb:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:sb:2003-08}Status" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveElement.java
index 5b58db0127..9778d01e67 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for UsageDirective element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 133)
- * 
                    
  * 
                    - * <element name="UsageDirective" type="{urn:liberty:sb:2003-08}UsageDirectiveType"/>
+ * <element name="UsageDirective" type="{urn:liberty:sb:2003-08}UsageDirectiveType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveType.java
index 626767a01d..bde0b72b90 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb/UsageDirectiveType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for UsageDirectiveType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-soap-binding.xsd line 122)
- * 
                    
  * 
                    - * <complexType name="UsageDirectiveType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="ref" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UsageDirectiveType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="ref" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextElement.java
index 6a9871b3e6..3320bf57ed 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CredentialsContext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-soap-binding-v1.1.xsd line 81)
- * 
                    
  * 
                    - * <element name="CredentialsContext" type="{urn:liberty:sb:2004-04}CredentialsContextType"/>
+ * <element name="CredentialsContext" type="{urn:liberty:sb:2004-04}CredentialsContextType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextType.java
index cba9000b8f..bb4b1d2c82 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/CredentialsContextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for CredentialsContextType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-soap-binding-v1.1.xsd line 71)
- * 
                    
  * 
                    - * <complexType name="CredentialsContextType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
- *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CredentialsContextType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:iff:2003-08}RequestAuthnContext" minOccurs="0"/>
+ *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/EmptyType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/EmptyType.java
index 7f9e07fbe9..416f76a24d 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/EmptyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,14 +14,13 @@
  * This type may be used to create an empty element
  * Java content class for EmptyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 68)
- * 
                    
  * 
                    - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionElement.java
index c2e051839e..f224208165 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * An element that contains arbitrary content extensions from other namespaces
  * Java content class for Extension element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 76)
- * 
                    
  * 
                    - * <element name="Extension" type="{urn:liberty:sb:2004-04}extensionType"/>
+ * <element name="Extension" type="{urn:liberty:sb:2004-04}extensionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionType.java
index c3ffd8f652..dc91c91516 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ExtensionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,17 +14,16 @@
  * A type for arbitrary content extensions from other namespaces
  * Java content class for extensionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 81)
- * 
                    
  * 
                    - * <complexType name="extensionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="extensionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ObjectFactory.java
index 6589ada232..8982c7ac7e 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -67,7 +68,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -86,7 +87,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -105,7 +106,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -117,7 +118,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of StatusType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.StatusType createStatusType()
@@ -129,7 +130,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.StatusType createStatusTyp
     /**
      * Create an instance of ServiceInstanceUpdateTypeCredentialType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.ServiceInstanceUpdateType.CredentialType createServiceInstanceUpdateTypeCredentialType()
@@ -141,7 +142,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.ServiceInstanceUpdateType.
     /**
      * Create an instance of CredentialsContextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.CredentialsContextType createCredentialsContextType()
@@ -153,7 +154,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.CredentialsContextType cre
     /**
      * Create an instance of StatusElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.StatusElement createStatusElement()
@@ -165,7 +166,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.StatusElement createStatus
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.EmptyType createEmptyType()
@@ -177,7 +178,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.EmptyType createEmptyType(
     /**
      * Create an instance of TimeoutType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.TimeoutType createTimeoutType()
@@ -189,7 +190,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.TimeoutType createTimeoutT
     /**
      * Create an instance of ExtensionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.ExtensionElement createExtensionElement()
@@ -201,7 +202,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.ExtensionElement createExt
     /**
      * Create an instance of CredentialsContextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.CredentialsContextElement createCredentialsContextElement()
@@ -213,7 +214,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.CredentialsContextElement
     /**
      * Create an instance of TimeoutElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.TimeoutElement createTimeoutElement()
@@ -225,7 +226,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.TimeoutElement createTimeo
     /**
      * Create an instance of ServiceInstanceUpdateType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.ServiceInstanceUpdateType createServiceInstanceUpdateType()
@@ -237,7 +238,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.ServiceInstanceUpdateType
     /**
      * Create an instance of ServiceInstanceUpdateElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.ServiceInstanceUpdateElement createServiceInstanceUpdateElement()
@@ -249,7 +250,7 @@ public com.sun.identity.liberty.ws.soapbinding.jaxb11.ServiceInstanceUpdateEleme
     /**
      * Create an instance of ExtensionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.liberty.ws.soapbinding.jaxb11.ExtensionType createExtensionType()
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateElement.java
index afa6ebd868..ea22476696 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ServiceInstanceUpdate element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-soap-binding-v1.1.xsd line 101)
- * 
                    
  * 
                    - * <element name="ServiceInstanceUpdate" type="{urn:liberty:sb:2004-04}ServiceInstanceUpdateType"/>
+ * <element name="ServiceInstanceUpdate" type="{urn:liberty:sb:2004-04}ServiceInstanceUpdateType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateType.java
index 1791830255..31d353292c 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/ServiceInstanceUpdateType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,33 +13,32 @@
 /**
  * Java content class for ServiceInstanceUpdateType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-soap-binding-v1.1.xsd line 83)
- * 
                    
  * 
                    - * <complexType name="ServiceInstanceUpdateType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Credential" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
- *                 <attribute name="notOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Endpoint" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ServiceInstanceUpdateType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SecurityMechID" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Credential" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
+ *                 <attribute name="notOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="Endpoint" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -161,18 +161,17 @@ public interface ServiceInstanceUpdateType {
     /**
      * Java content class for anonymous complex type.
      * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-soap-binding-v1.1.xsd line 87)
-     * 
                    
      * 
                    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <any/>
-     *       </sequence>
-     *       <attribute name="notOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <any/>
+     *       </sequence>
+     *       <attribute name="notOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
                    
      * 
      */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusElement.java
index c573db291a..16e94851ff 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,9 +14,8 @@
  * A standard Status type
  * Java content class for Status element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 52)
- * 
                    
  * 
                    - * <element name="Status" type="{urn:liberty:sb:2004-04}StatusType"/>
+ * <element name="Status" type="{urn:liberty:sb:2004-04}StatusType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusType.java
index 3e7d59dc06..236f6a592b 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/StatusType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -13,20 +14,19 @@
  * A type that may be used for status codes.
  * Java content class for StatusType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/lib-arch-iwsf-utility.xsd line 57)
- * 
                    
  * 
                    - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:liberty:sb:2004-04}Status" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:liberty:sb:2004-04}Status" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="code" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="ref" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutElement.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutElement.java
index 1c6ab3c847..4c9b64b543 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutElement.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Timeout element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-soap-binding-v1.1.xsd line 110)
- * 
                    
  * 
                    - * <element name="Timeout" type="{urn:liberty:sb:2004-04}TimeoutType"/>
+ * <element name="Timeout" type="{urn:liberty:sb:2004-04}TimeoutType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutType.java b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutType.java
index 21c0b8522f..8a332aa04f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/soapbinding/jaxb11/TimeoutType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:33:54 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for TimeoutType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/liberty/liberty-idwsf-soap-binding-v1.1.xsd line 103)
- * 
                    
  * 
                    - * <complexType name="TimeoutType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="maxProcessingTime" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
- *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TimeoutType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="maxProcessingTime" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}actor"/>
+ *       <attribute ref="{http://schemas.xmlsoap.org/soap/envelope/}mustUnderstand"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/AnyType.java b/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/AnyType.java
index d89a5a40ff..14d277af68 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/AnyType.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/AnyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.05 at 02:55:46 PM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anyType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at  line unknown)
- * 
                    
  * 
                    - * <complexType name="anyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="anyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/ObjectFactory.java b/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/ObjectFactory.java
index f488fa4496..5880e57d9f 100644
--- a/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/ObjectFactory.java
+++ b/openam-schema/openam-liberty-schema/src/main/java/org/w3/_2001/xmlschema/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.05 at 02:55:46 PM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC.
 //
 
 
@@ -51,7 +52,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public Object newInstance(Class javaContentInterface)
@@ -70,7 +71,7 @@ public Object newInstance(Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public Object getProperty(String name)
@@ -89,7 +90,7 @@ public Object getProperty(String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(String name, Object value)
@@ -101,7 +102,7 @@ public void setProperty(String name, Object value)
     /**
      * Create an instance of AnyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public AnyType createAnyType()
diff --git a/openam-schema/openam-mib-schema/src/main/resources/mib/FORGEROCK-OPENAM-CTS.mib b/openam-schema/openam-mib-schema/src/main/resources/mib/FORGEROCK-OPENAM-CTS.mib
index 26face84a7..43c1a1c28c 100644
--- a/openam-schema/openam-mib-schema/src/main/resources/mib/FORGEROCK-OPENAM-CTS.mib
+++ b/openam-schema/openam-mib-schema/src/main/resources/mib/FORGEROCK-OPENAM-CTS.mib
@@ -11,6 +11,7 @@
 --  information: "Portions copyright [year] [name of copyright owner]".
 --
 --  Copyright 2013-2016 ForgeRock AS.
+--  Portions Copyrighted 2026 3A Systems, LLC
 --
 
 --
@@ -264,7 +265,7 @@ ctsCRUDOperationsPerTokenTypeEntry     OBJECT-TYPE
     SYNTAX			CTSCRUDOperationsPerTokenTypeEntry
     MAX-ACCESS		not-accessible
     STATUS			current
-    DESCRIPTION     "Rate information for a token & operation combination"
+    DESCRIPTION     "Rate information for a token and operation combination"
     INDEX		    { tokenTableIndex, operationTableIndex }
     ::= { ctsCRUDOperationsPerTokenTypeTable 1 }
 
diff --git a/openam-schema/openam-mib-schema/src/main/resources/mib/SUN-OPENSSO-SERVER.mib b/openam-schema/openam-mib-schema/src/main/resources/mib/SUN-OPENSSO-SERVER.mib
index 71e97b2304..db0dcf7150 100644
--- a/openam-schema/openam-mib-schema/src/main/resources/mib/SUN-OPENSSO-SERVER.mib
+++ b/openam-schema/openam-mib-schema/src/main/resources/mib/SUN-OPENSSO-SERVER.mib
@@ -5,6 +5,7 @@
 
 --
 -- Portions Copyrighted 2011-2016 ForgeRock AS
+-- Portions Copyrighted 2026 3A Systems, LLC
 --
 
 SUN-OPENSSO-SERVER-MIB DEFINITIONS ::= BEGIN
@@ -117,7 +118,7 @@ ssoServerServerTable OBJECT-TYPE
     MAX-ACCESS  not-accessible
     STATUS      current
     DESCRIPTION
-            "Server topology : all servers known to this server & their state"
+            "Server topology : all servers known to this server and their state"
     ::= { ssoServerTopology 1 } 
 
 ssoServerServerEntry  OBJECT-TYPE
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionElement.java
index e843021707..eb6d75d476 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Action element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 272)
- * 
                    
  * 
                    - * <element name="Action" type="{urn:oasis:names:tc:SAML:2.0:assertion}ActionType"/>
+ * <element name="Action" type="{urn:oasis:names:tc:SAML:2.0:assertion}ActionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionType.java
index de7dcca2d9..75d6a1260b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ActionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for ActionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 273)
- * 
                    
  * 
                    - * <complexType name="ActionType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="Namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ActionType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="Namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceElement.java
index ec6a96e756..a05deba970 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Advice element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 197)
- * 
                    
  * 
                    - * <element name="Advice" type="{urn:oasis:names:tc:SAML:2.0:assertion}AdviceType"/>
+ * <element name="Advice" type="{urn:oasis:names:tc:SAML:2.0:assertion}AdviceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceType.java
index d7bd506547..608a722152 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AdviceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for AdviceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 198)
- * 
                    
  * 
                    - * <complexType name="AdviceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
- *         <any/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AdviceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
+ *         <any/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionElement.java
index ccbcdce116..4cc393f8f8 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Assertion element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 86)
- * 
                    
  * 
                    - * <element name="Assertion" type="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionType"/>
+ * <element name="Assertion" type="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionIDRefElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionIDRefElement.java
index 70422103b7..bf04ea34be 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionIDRefElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionIDRefElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AssertionIDRef element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 84)
- * 
                    
  * 
                    - * <element name="AssertionIDRef" type="{http://www.w3.org/2001/XMLSchema}NCName"/>
+ * <element name="AssertionIDRef" type="{http://www.w3.org/2001/XMLSchema}NCName"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionType.java
index c51fb6acb2..69a02179d9 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,30 +13,29 @@
 /**
  * Java content class for AssertionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 87)
- * 
                    
  * 
                    - * <complexType name="AssertionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Conditions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Advice" minOccurs="0"/>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Statement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthzDecisionStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeStatement"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AssertionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Conditions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Advice" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Statement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthzDecisionStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeStatement"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionURIRefElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionURIRefElement.java
index 3b877f7fef..5dc4ba60f2 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionURIRefElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AssertionURIRefElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AssertionURIRef element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 85)
- * 
                    
  * 
                    - * <element name="AssertionURIRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="AssertionURIRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeElement.java
index 01fd351317..9680bfbb5b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Attribute element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 300)
- * 
                    
  * 
                    - * <element name="Attribute" type="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeType"/>
+ * <element name="Attribute" type="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementElement.java
index e221e40813..965efa70ae 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 289)
- * 
                    
  * 
                    - * <element name="AttributeStatement" type="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeStatementType"/>
+ * <element name="AttributeStatement" type="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementType.java
index 59dde63652..c9ea8c57fd 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for AttributeStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 290)
- * 
                    
  * 
                    - * <complexType name="AttributeStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAttribute"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAttribute"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeType.java
index 944feb1287..9e01861a63 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for AttributeType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 301)
- * 
                    
  * 
                    - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="NameFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="NameFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
@@ -106,7 +106,7 @@ public interface AttributeType {
      * Objects of the following type(s) are allowed in the list
      * {@link com.sun.identity.saml2.jaxb.schema.AnyType}
      * {@link com.sun.identity.saml2.jaxb.assertion.AttributeValueElement}
-     * {@link null}
+     * {@code null}
      * 
      */
     java.util.List getAttributeValue();
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeValueElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeValueElement.java
index 3fc2381126..fb2e9368df 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeValueElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AttributeValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeValue element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 310)
- * 
                    
  * 
                    - * <element name="AttributeValue" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ * <element name="AttributeValue" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
  * 
                    
  * 
  */
@@ -25,14 +25,14 @@ public interface AttributeValueElement
 
     /**
      * This property is used to control the xsi:nil feature of W3C XML Schema. 
-     * Setting this property to true will cause the output to be <{0} xsi:nil="true" /> regardless of the values of the other properties.
+     * Setting this property to true will cause the output to be <{0} xsi:nil="true" /> regardless of the values of the other properties.
      * 
      */
     boolean isNil();
 
     /**
      * Passing true will generate xsi:nil in the XML outputThis property is used to control the xsi:nil feature of W3C XML Schema. 
-     * Setting this property to true will cause the output to be <{0} xsi:nil="true" /> regardless of the values of the other properties.
+     * Setting this property to true will cause the output to be <{0} xsi:nil="true" /> regardless of the values of the other properties.
      * 
      */
     void setNil(boolean value);
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceElement.java
index 8c933bb294..3463ecd458 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Audience element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 179)
- * 
                    
  * 
                    - * <element name="Audience" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="Audience" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionElement.java
index 6bdc23de16..5ee7c53a65 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AudienceRestriction element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 169)
- * 
                    
  * 
                    - * <element name="AudienceRestriction" type="{urn:oasis:names:tc:SAML:2.0:assertion}AudienceRestrictionType"/>
+ * <element name="AudienceRestriction" type="{urn:oasis:names:tc:SAML:2.0:assertion}AudienceRestrictionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionType.java
index a775e1fcf9..b24455fccb 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AudienceRestrictionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AudienceRestrictionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 170)
- * 
                    
  * 
                    - * <complexType name="AudienceRestrictionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AudienceRestrictionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthenticatingAuthorityElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthenticatingAuthorityElement.java
index 14737fc546..0750e94f04 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthenticatingAuthorityElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthenticatingAuthorityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthenticatingAuthority element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 251)
- * 
                    
  * 
                    - * <element name="AuthenticatingAuthority" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="AuthenticatingAuthority" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextClassRefElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextClassRefElement.java
index 0a1788b444..de762dd77e 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextClassRefElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextClassRefElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnContextClassRef element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 248)
- * 
                    
  * 
                    - * <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="AuthnContextClassRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclElement.java
index 69c77539ef..a721a7b44d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnContextDecl element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 250)
- * 
                    
  * 
                    - * <element name="AuthnContextDecl" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ * <element name="AuthnContextDecl" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclRefElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclRefElement.java
index 1eaa23ad8b..ec1f44c6ee 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclRefElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextDeclRefElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnContextDeclRef element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 249)
- * 
                    
  * 
                    - * <element name="AuthnContextDeclRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="AuthnContextDeclRef" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextElement.java
index 07c86a871f..49093fe101 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnContext element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 229)
- * 
                    
  * 
                    - * <element name="AuthnContext" type="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextType"/>
+ * <element name="AuthnContext" type="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextType.java
index b7fc4312b6..c2f7494856 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnContextType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,30 +13,29 @@
 /**
  * Java content class for AuthnContextType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 230)
- * 
                    
  * 
                    - * <complexType name="AuthnContextType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <sequence>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef"/>
- *             <choice minOccurs="0">
- *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/>
- *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/>
- *             </choice>
- *           </sequence>
- *           <choice>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/>
- *           </choice>
- *         </choice>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnContextType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <sequence>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef"/>
+ *             <choice minOccurs="0">
+ *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/>
+ *               <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/>
+ *             </choice>
+ *           </sequence>
+ *           <choice>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/>
+ *           </choice>
+ *         </choice>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementElement.java
index 8e4f034b1d..f114738a02 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 210)
- * 
                    
  * 
                    - * <element name="AuthnStatement" type="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnStatementType"/>
+ * <element name="AuthnStatement" type="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementType.java
index fd89d820a5..b2baf01c05 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthnStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for AuthnStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 211)
- * 
                    
  * 
                    - * <complexType name="AuthnStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectLocality" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContext"/>
- *       </sequence>
- *       <attribute name="AuthnInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="SessionNotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectLocality" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContext"/>
+ *       </sequence>
+ *       <attribute name="AuthnInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="SessionNotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementElement.java
index 6f392af58a..96a4c450f3 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthzDecisionStatement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 252)
- * 
                    
  * 
                    - * <element name="AuthzDecisionStatement" type="{urn:oasis:names:tc:SAML:2.0:assertion}AuthzDecisionStatementType"/>
+ * <element name="AuthzDecisionStatement" type="{urn:oasis:names:tc:SAML:2.0:assertion}AuthzDecisionStatementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementType.java
index 1c8723d578..c280992d78 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/AuthzDecisionStatementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for AuthzDecisionStatementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 253)
- * 
                    
  * 
                    - * <complexType name="AuthzDecisionStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:2.0:assertion}DecisionType" />
- *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthzDecisionStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:2.0:assertion}DecisionType" />
+ *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDAbstractType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDAbstractType.java
index 12db7c5b24..ffff0799a3 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDAbstractType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for BaseIDAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 63)
- * 
                    
  * 
                    - * <complexType name="BaseIDAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attGroup ref="{urn:oasis:names:tc:SAML:2.0:assertion}IDNameQualifiers"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BaseIDAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{urn:oasis:names:tc:SAML:2.0:assertion}IDNameQualifiers"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDElement.java
index bfa5426b67..810d9a9e23 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/BaseIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for BaseID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 62)
- * 
                    
  * 
                    - * <element name="BaseID" type="{urn:oasis:names:tc:SAML:2.0:assertion}BaseIDAbstractType"/>
+ * <element name="BaseID" type="{urn:oasis:names:tc:SAML:2.0:assertion}BaseIDAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionAbstractType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionAbstractType.java
index 97dcfa5dae..af99e64098 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionAbstractType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for ConditionAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 168)
- * 
                    
  * 
                    - * <complexType name="ConditionAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConditionAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionElement.java
index ecf1117d7f..e9dabbad37 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Condition element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 167)
- * 
                    
  * 
                    - * <element name="Condition" type="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"/>
+ * <element name="Condition" type="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsElement.java
index 4dc20e001f..62845e8b15 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Conditions element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 156)
- * 
                    
  * 
                    - * <element name="Conditions" type="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionsType"/>
+ * <element name="Conditions" type="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionsType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsType.java
index 36bfb066f0..a7f71b1d26 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ConditionsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for ConditionsType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 157)
- * 
                    
  * 
                    - * <complexType name="ConditionsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Condition"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AudienceRestriction"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}OneTimeUse"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}ProxyRestriction"/>
- *       </choice>
- *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConditionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Condition"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AudienceRestriction"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}OneTimeUse"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}ProxyRestriction"/>
+ *       </choice>
+ *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAssertionElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAssertionElement.java
index c4b66330f3..2de7e3230b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAssertionElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAssertionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedAssertion element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 207)
- * 
                    
  * 
                    - * <element name="EncryptedAssertion" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ * <element name="EncryptedAssertion" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAttributeElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAttributeElement.java
index 133ce5d115..f13cb732db 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAttributeElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedAttributeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedAttribute element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 311)
- * 
                    
  * 
                    - * <element name="EncryptedAttribute" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ * <element name="EncryptedAttribute" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedElementType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedElementType.java
index 03d43f0d77..85981d08b5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedElementType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedElementType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for EncryptedElementType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 76)
- * 
                    
  * 
                    - * <complexType name="EncryptedElementType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedElementType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedData"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptedKey" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedIDElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedIDElement.java
index 46924a3b97..0c596ace1d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedIDElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EncryptedIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 82)
- * 
                    
  * 
                    - * <element name="EncryptedID" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
+ * <element name="EncryptedID" type="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedElementType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceElement.java
index d22b6b0985..67215aab71 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Evidence element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 280)
- * 
                    
  * 
                    - * <element name="Evidence" type="{urn:oasis:names:tc:SAML:2.0:assertion}EvidenceType"/>
+ * <element name="Evidence" type="{urn:oasis:names:tc:SAML:2.0:assertion}EvidenceType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceType.java
index 7489733183..00d80443f6 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/EvidenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for EvidenceType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 281)
- * 
                    
  * 
                    - * <complexType name="EvidenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EvidenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/IssuerElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/IssuerElement.java
index 6c9a4f0e0c..5624edb90c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/IssuerElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/IssuerElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Issuer element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 83)
- * 
                    
  * 
                    - * <element name="Issuer" type="{urn:oasis:names:tc:SAML:2.0:assertion}NameIDType"/>
+ * <element name="Issuer" type="{urn:oasis:names:tc:SAML:2.0:assertion}NameIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/KeyInfoConfirmationDataType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/KeyInfoConfirmationDataType.java
index d3182d856b..251a5d0f51 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/KeyInfoConfirmationDataType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/KeyInfoConfirmationDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for KeyInfoConfirmationDataType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 147)
- * 
                    
  * 
                    - * <complexType name="KeyInfoConfirmationDataType">
- *   <complexContent>
- *     <restriction base="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationDataType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyInfoConfirmationDataType">
+ *   <complexContent>
+ *     <restriction base="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationDataType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDElement.java
index 76fe2f0514..7a38466098 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NameID element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 66)
- * 
                    
  * 
                    - * <element name="NameID" type="{urn:oasis:names:tc:SAML:2.0:assertion}NameIDType"/>
+ * <element name="NameID" type="{urn:oasis:names:tc:SAML:2.0:assertion}NameIDType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDType.java
index 9fbc2997a9..bba336275d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/NameIDType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for NameIDType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 67)
- * 
                    
  * 
                    - * <complexType name="NameIDType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attGroup ref="{urn:oasis:names:tc:SAML:2.0:assertion}IDNameQualifiers"/>
- *       <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="SPProvidedID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="NameIDType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attGroup ref="{urn:oasis:names:tc:SAML:2.0:assertion}IDNameQualifiers"/>
+ *       <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="SPProvidedID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ObjectFactory.java
index 170c1002b9..6bec2fdc64 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -139,7 +140,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -158,7 +159,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -177,7 +178,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -189,7 +190,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of SubjectConfirmationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationElement createSubjectConfirmationElement()
@@ -201,7 +202,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationElement createSu
     /**
      * Create an instance of BaseIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.BaseIDElement createBaseIDElement()
@@ -213,7 +214,7 @@ public com.sun.identity.saml2.jaxb.assertion.BaseIDElement createBaseIDElement()
     /**
      * Create an instance of AssertionURIRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AssertionURIRefElement createAssertionURIRefElement()
@@ -225,7 +226,7 @@ public com.sun.identity.saml2.jaxb.assertion.AssertionURIRefElement createAssert
     /**
      * Create an instance of AssertionURIRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AssertionURIRefElement createAssertionURIRefElement(java.lang.String value)
@@ -237,7 +238,7 @@ public com.sun.identity.saml2.jaxb.assertion.AssertionURIRefElement createAssert
     /**
      * Create an instance of SubjectLocalityType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectLocalityType createSubjectLocalityType()
@@ -249,7 +250,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectLocalityType createSubjectLo
     /**
      * Create an instance of ActionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ActionElement createActionElement()
@@ -261,7 +262,7 @@ public com.sun.identity.saml2.jaxb.assertion.ActionElement createActionElement()
     /**
      * Create an instance of AdviceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AdviceElement createAdviceElement()
@@ -273,7 +274,7 @@ public com.sun.identity.saml2.jaxb.assertion.AdviceElement createAdviceElement()
     /**
      * Create an instance of AttributeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AttributeElement createAttributeElement()
@@ -285,7 +286,7 @@ public com.sun.identity.saml2.jaxb.assertion.AttributeElement createAttributeEle
     /**
      * Create an instance of ConditionsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ConditionsElement createConditionsElement()
@@ -297,7 +298,7 @@ public com.sun.identity.saml2.jaxb.assertion.ConditionsElement createConditionsE
     /**
      * Create an instance of NameIDType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.NameIDType createNameIDType()
@@ -309,7 +310,7 @@ public com.sun.identity.saml2.jaxb.assertion.NameIDType createNameIDType()
     /**
      * Create an instance of AudienceRestrictionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AudienceRestrictionElement createAudienceRestrictionElement()
@@ -321,7 +322,7 @@ public com.sun.identity.saml2.jaxb.assertion.AudienceRestrictionElement createAu
     /**
      * Create an instance of SubjectConfirmationDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationDataElement createSubjectConfirmationDataElement()
@@ -333,7 +334,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationDataElement crea
     /**
      * Create an instance of ConditionAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ConditionAbstractType createConditionAbstractType()
@@ -345,7 +346,7 @@ public com.sun.identity.saml2.jaxb.assertion.ConditionAbstractType createConditi
     /**
      * Create an instance of SubjectConfirmationDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationDataType createSubjectConfirmationDataType()
@@ -357,7 +358,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationDataType createS
     /**
      * Create an instance of AuthzDecisionStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthzDecisionStatementType createAuthzDecisionStatementType()
@@ -369,7 +370,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthzDecisionStatementType createAu
     /**
      * Create an instance of EncryptedAssertionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.EncryptedAssertionElement createEncryptedAssertionElement()
@@ -381,7 +382,7 @@ public com.sun.identity.saml2.jaxb.assertion.EncryptedAssertionElement createEnc
     /**
      * Create an instance of StatementAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.StatementAbstractType createStatementAbstractType()
@@ -393,7 +394,7 @@ public com.sun.identity.saml2.jaxb.assertion.StatementAbstractType createStateme
     /**
      * Create an instance of AttributeStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AttributeStatementElement createAttributeStatementElement()
@@ -405,7 +406,7 @@ public com.sun.identity.saml2.jaxb.assertion.AttributeStatementElement createAtt
     /**
      * Create an instance of AuthnContextElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnContextElement createAuthnContextElement()
@@ -417,7 +418,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnContextElement createAuthnCont
     /**
      * Create an instance of KeyInfoConfirmationDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.KeyInfoConfirmationDataType createKeyInfoConfirmationDataType()
@@ -429,7 +430,7 @@ public com.sun.identity.saml2.jaxb.assertion.KeyInfoConfirmationDataType createK
     /**
      * Create an instance of EncryptedIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.EncryptedIDElement createEncryptedIDElement()
@@ -441,7 +442,7 @@ public com.sun.identity.saml2.jaxb.assertion.EncryptedIDElement createEncryptedI
     /**
      * Create an instance of ProxyRestrictionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ProxyRestrictionElement createProxyRestrictionElement()
@@ -453,7 +454,7 @@ public com.sun.identity.saml2.jaxb.assertion.ProxyRestrictionElement createProxy
     /**
      * Create an instance of NameIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.NameIDElement createNameIDElement()
@@ -465,7 +466,7 @@ public com.sun.identity.saml2.jaxb.assertion.NameIDElement createNameIDElement()
     /**
      * Create an instance of OneTimeUseType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.OneTimeUseType createOneTimeUseType()
@@ -477,7 +478,7 @@ public com.sun.identity.saml2.jaxb.assertion.OneTimeUseType createOneTimeUseType
     /**
      * Create an instance of AttributeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AttributeType createAttributeType()
@@ -489,7 +490,7 @@ public com.sun.identity.saml2.jaxb.assertion.AttributeType createAttributeType()
     /**
      * Create an instance of ConditionsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ConditionsType createConditionsType()
@@ -501,7 +502,7 @@ public com.sun.identity.saml2.jaxb.assertion.ConditionsType createConditionsType
     /**
      * Create an instance of BaseIDAbstractType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.BaseIDAbstractType createBaseIDAbstractType()
@@ -513,7 +514,7 @@ public com.sun.identity.saml2.jaxb.assertion.BaseIDAbstractType createBaseIDAbst
     /**
      * Create an instance of EncryptedAttributeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.EncryptedAttributeElement createEncryptedAttributeElement()
@@ -525,7 +526,7 @@ public com.sun.identity.saml2.jaxb.assertion.EncryptedAttributeElement createEnc
     /**
      * Create an instance of ConditionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ConditionElement createConditionElement()
@@ -537,7 +538,7 @@ public com.sun.identity.saml2.jaxb.assertion.ConditionElement createConditionEle
     /**
      * Create an instance of AuthnContextDeclElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnContextDeclElement createAuthnContextDeclElement()
@@ -549,7 +550,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnContextDeclElement createAuthn
     /**
      * Create an instance of EvidenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.EvidenceType createEvidenceType()
@@ -561,7 +562,7 @@ public com.sun.identity.saml2.jaxb.assertion.EvidenceType createEvidenceType()
     /**
      * Create an instance of SubjectType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectType createSubjectType()
@@ -573,7 +574,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectType createSubjectType()
     /**
      * Create an instance of EncryptedElementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.EncryptedElementType createEncryptedElementType()
@@ -585,7 +586,7 @@ public com.sun.identity.saml2.jaxb.assertion.EncryptedElementType createEncrypte
     /**
      * Create an instance of AuthnStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnStatementType createAuthnStatementType()
@@ -597,7 +598,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnStatementType createAuthnState
     /**
      * Create an instance of SubjectConfirmationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationType createSubjectConfirmationType()
@@ -609,7 +610,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectConfirmationType createSubje
     /**
      * Create an instance of SubjectLocalityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectLocalityElement createSubjectLocalityElement()
@@ -621,7 +622,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectLocalityElement createSubjec
     /**
      * Create an instance of ProxyRestrictionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ProxyRestrictionType createProxyRestrictionType()
@@ -633,7 +634,7 @@ public com.sun.identity.saml2.jaxb.assertion.ProxyRestrictionType createProxyRes
     /**
      * Create an instance of AuthzDecisionStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthzDecisionStatementElement createAuthzDecisionStatementElement()
@@ -645,7 +646,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthzDecisionStatementElement creat
     /**
      * Create an instance of AuthnContextClassRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnContextClassRefElement createAuthnContextClassRefElement()
@@ -657,7 +658,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnContextClassRefElement createA
     /**
      * Create an instance of AuthnContextClassRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnContextClassRefElement createAuthnContextClassRefElement(java.lang.String value)
@@ -669,7 +670,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnContextClassRefElement createA
     /**
      * Create an instance of AssertionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AssertionElement createAssertionElement()
@@ -681,7 +682,7 @@ public com.sun.identity.saml2.jaxb.assertion.AssertionElement createAssertionEle
     /**
      * Create an instance of AdviceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AdviceType createAdviceType()
@@ -693,7 +694,7 @@ public com.sun.identity.saml2.jaxb.assertion.AdviceType createAdviceType()
     /**
      * Create an instance of SubjectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.SubjectElement createSubjectElement()
@@ -705,7 +706,7 @@ public com.sun.identity.saml2.jaxb.assertion.SubjectElement createSubjectElement
     /**
      * Create an instance of AssertionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AssertionType createAssertionType()
@@ -717,7 +718,7 @@ public com.sun.identity.saml2.jaxb.assertion.AssertionType createAssertionType()
     /**
      * Create an instance of StatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.StatementElement createStatementElement()
@@ -729,7 +730,7 @@ public com.sun.identity.saml2.jaxb.assertion.StatementElement createStatementEle
     /**
      * Create an instance of AssertionIDRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AssertionIDRefElement createAssertionIDRefElement()
@@ -741,7 +742,7 @@ public com.sun.identity.saml2.jaxb.assertion.AssertionIDRefElement createAsserti
     /**
      * Create an instance of AssertionIDRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AssertionIDRefElement createAssertionIDRefElement(java.lang.String value)
@@ -753,7 +754,7 @@ public com.sun.identity.saml2.jaxb.assertion.AssertionIDRefElement createAsserti
     /**
      * Create an instance of AuthnContextType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnContextType createAuthnContextType()
@@ -765,7 +766,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnContextType createAuthnContext
     /**
      * Create an instance of ActionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.ActionType createActionType()
@@ -777,7 +778,7 @@ public com.sun.identity.saml2.jaxb.assertion.ActionType createActionType()
     /**
      * Create an instance of AuthenticatingAuthorityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthenticatingAuthorityElement createAuthenticatingAuthorityElement()
@@ -789,7 +790,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthenticatingAuthorityElement crea
     /**
      * Create an instance of AuthenticatingAuthorityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthenticatingAuthorityElement createAuthenticatingAuthorityElement(java.lang.String value)
@@ -801,7 +802,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthenticatingAuthorityElement crea
     /**
      * Create an instance of AuthnStatementElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnStatementElement createAuthnStatementElement()
@@ -813,7 +814,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnStatementElement createAuthnSt
     /**
      * Create an instance of AttributeValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AttributeValueElement createAttributeValueElement()
@@ -825,7 +826,7 @@ public com.sun.identity.saml2.jaxb.assertion.AttributeValueElement createAttribu
     /**
      * Create an instance of EvidenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.EvidenceElement createEvidenceElement()
@@ -837,7 +838,7 @@ public com.sun.identity.saml2.jaxb.assertion.EvidenceElement createEvidenceEleme
     /**
      * Create an instance of AudienceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AudienceElement createAudienceElement()
@@ -849,7 +850,7 @@ public com.sun.identity.saml2.jaxb.assertion.AudienceElement createAudienceEleme
     /**
      * Create an instance of AudienceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AudienceElement createAudienceElement(java.lang.String value)
@@ -861,7 +862,7 @@ public com.sun.identity.saml2.jaxb.assertion.AudienceElement createAudienceEleme
     /**
      * Create an instance of OneTimeUseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.OneTimeUseElement createOneTimeUseElement()
@@ -873,7 +874,7 @@ public com.sun.identity.saml2.jaxb.assertion.OneTimeUseElement createOneTimeUseE
     /**
      * Create an instance of IssuerElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.IssuerElement createIssuerElement()
@@ -885,7 +886,7 @@ public com.sun.identity.saml2.jaxb.assertion.IssuerElement createIssuerElement()
     /**
      * Create an instance of AttributeStatementType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AttributeStatementType createAttributeStatementType()
@@ -897,7 +898,7 @@ public com.sun.identity.saml2.jaxb.assertion.AttributeStatementType createAttrib
     /**
      * Create an instance of AudienceRestrictionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AudienceRestrictionType createAudienceRestrictionType()
@@ -909,7 +910,7 @@ public com.sun.identity.saml2.jaxb.assertion.AudienceRestrictionType createAudie
     /**
      * Create an instance of AuthnContextDeclRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnContextDeclRefElement createAuthnContextDeclRefElement()
@@ -921,7 +922,7 @@ public com.sun.identity.saml2.jaxb.assertion.AuthnContextDeclRefElement createAu
     /**
      * Create an instance of AuthnContextDeclRefElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.assertion.AuthnContextDeclRefElement createAuthnContextDeclRefElement(java.lang.String value)
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseElement.java
index 2a1a987c8f..9465ff0123 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for OneTimeUse element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 180)
- * 
                    
  * 
                    - * <element name="OneTimeUse" type="{urn:oasis:names:tc:SAML:2.0:assertion}OneTimeUseType"/>
+ * <element name="OneTimeUse" type="{urn:oasis:names:tc:SAML:2.0:assertion}OneTimeUseType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseType.java
index 3d48b4441a..a5e7113cc5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/OneTimeUseType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for OneTimeUseType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 181)
- * 
                    
  * 
                    - * <complexType name="OneTimeUseType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OneTimeUseType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionElement.java
index 3c75577ab7..d41a13df0b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProxyRestriction element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 186)
- * 
                    
  * 
                    - * <element name="ProxyRestriction" type="{urn:oasis:names:tc:SAML:2.0:assertion}ProxyRestrictionType"/>
+ * <element name="ProxyRestriction" type="{urn:oasis:names:tc:SAML:2.0:assertion}ProxyRestrictionType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionType.java
index 6962fa7bc4..0baafa2406 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/ProxyRestrictionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ProxyRestrictionType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 187)
- * 
                    
  * 
                    - * <complexType name="ProxyRestrictionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Count" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ProxyRestrictionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Count" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementAbstractType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementAbstractType.java
index 9313d98fc7..df859d3f96 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementAbstractType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementAbstractType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for StatementAbstractType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 209)
- * 
                    
  * 
                    - * <complexType name="StatementAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatementAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementElement.java
index c401173814..9295bad6cd 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/StatementElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Statement element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 208)
- * 
                    
  * 
                    - * <element name="Statement" type="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"/>
+ * <element name="Statement" type="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataElement.java
index bbda901440..7d1be60df3 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectConfirmationData element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 131)
- * 
                    
  * 
                    - * <element name="SubjectConfirmationData" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationDataType"/>
+ * <element name="SubjectConfirmationData" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationDataType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataType.java
index 5df9a51913..d2da73482f 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for SubjectConfirmationDataType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 132)
- * 
                    
  * 
                    - * <complexType name="SubjectConfirmationDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectConfirmationDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationElement.java
index 0c2819d16c..149d0b57ce 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectConfirmation element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 119)
- * 
                    
  * 
                    - * <element name="SubjectConfirmation" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationType"/>
+ * <element name="SubjectConfirmation" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationType.java
index 7e842abf2f..8ef66e1173 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectConfirmationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for SubjectConfirmationType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 120)
- * 
                    
  * 
                    - * <complexType name="SubjectConfirmationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice minOccurs="0">
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         </choice>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationData" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Method" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectConfirmationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice minOccurs="0">
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
+ *         </choice>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationData" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Method" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectElement.java
index 1edfcb649c..8d6d9be4ca 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Subject element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 105)
- * 
                    
  * 
                    - * <element name="Subject" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectType"/>
+ * <element name="Subject" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityElement.java
index 67840a596f..1117e74b84 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SubjectLocality element declaration.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 224)
- * 
                    
  * 
                    - * <element name="SubjectLocality" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectLocalityType"/>
+ * <element name="SubjectLocality" type="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectLocalityType"/>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityType.java
index 91b97c83b0..d4f625820c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectLocalityType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for SubjectLocalityType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 225)
- * 
                    
  * 
                    - * <complexType name="SubjectLocalityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="DNSName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectLocalityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="DNSName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectType.java
index e89782fd5f..70c8e34e65 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/SubjectType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for SubjectType complex type.
  * 
                    The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-assertion-2.0.xsd line 106)
- * 
                    
  * 
                    - * <complexType name="SubjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <choice>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *           </choice>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <choice>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
+ *           </choice>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                    
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/DefaultJAXBContextImpl.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/DefaultJAXBContextImpl.java
index f61212aba3..6582775c75 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/DefaultJAXBContextImpl.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/DefaultJAXBContextImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -89,7 +90,7 @@ public synchronized com.sun.msv.grammar.Grammar getGrammar() throws JAXBExceptio
      * java content-tree into XML data.
      *
      * @return a Marshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Marshaller object
      */
     public Marshaller createMarshaller() throws JAXBException {
@@ -101,7 +102,7 @@ public Marshaller createMarshaller() throws JAXBException {
      * data into a java content-tree.
      *
      * @return an Unmarshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Unmarshaller object
      */
     public Unmarshaller createUnmarshaller() throws JAXBException {
@@ -113,7 +114,7 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
      * java content-tree.
      *
      * @return an Unmarshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Validator object
      */
     public Validator createValidator() throws JAXBException {
@@ -127,7 +128,7 @@ public Validator createValidator() throws JAXBException {
      *
      * @param javaContentInterface the Class object 
      * @return an instance of the Java content interface
-     * @exception JAXBException
+     * @exception JAXBException if an error occurs
      */
     public Object newInstance( Class javaContentInterface ) 
         throws JAXBException {
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoFacade.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoFacade.java
index ed39d6bc17..9837e391ee 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoFacade.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoFacade.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -260,7 +261,7 @@ public com.sun.msv.grammar.Expression getTopLevel() {
 
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)
+     * See {@code com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)}.
      */
     public XMLSerializable castToXMLSerializable(Object o) {
         XMLSerializable result = null;
@@ -274,7 +275,7 @@ public XMLSerializable castToXMLSerializable(Object o) {
     }
 
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)
+     * See {@code com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)}.
      */
     public ValidatableObject castToValidatableObject(Object o) {
         ValidatableObject result = null;
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoImpl.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoImpl.java
index 335e6b223f..57aa931bad 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoImpl.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/GrammarInfoImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -160,7 +161,7 @@ public final com.sun.msv.grammar.Grammar getGrammar() throws JAXBException {
     }
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)
+     * See {@code com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)}.
      */
     public XMLSerializable castToXMLSerializable(Object o) {
         if( o instanceof XMLSerializable ) {
@@ -171,7 +172,7 @@ public XMLSerializable castToXMLSerializable(Object o) {
     }
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)
+     * See {@code com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)}.
      */
     public ValidatableObject castToValidatableObject(Object o) {
         if( o instanceof ValidatableObject ) {
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/InterleaveDispatcher.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/InterleaveDispatcher.java
index a5bd22569e..de859e7568 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/InterleaveDispatcher.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/InterleaveDispatcher.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -20,12 +21,11 @@
 
 /**
  * Splits the unmarshalling events to bracnhes to support
- * XML Schema's <all> and RELAX NG's <interleave>
+ * XML Schema's <all> and RELAX NG's <interleave>
  * 
  * 
                    
  * This class will be extended by the generated code.
  * 
- * @optionalRuntime
  * 
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/MarshallerImpl.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/MarshallerImpl.java
index fd08167394..0b37394ba8 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/MarshallerImpl.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/MarshallerImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -48,7 +49,7 @@
 import com.sun.identity.shared.xml.XMLUtils;
 
 /**
- * Implementation of {@link Marshaller} interface for JAXB RI.
+ * Implementation of {@link javax.xml.bind.Marshaller} interface for JAXB RI.
  * 
  * @author Kohsuke Kawaguchi
  * @author Vivek Pandey
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/NamespaceContext2.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/NamespaceContext2.java
index 2dcbcbe823..010fe24c36 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/NamespaceContext2.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/NamespaceContext2.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -10,7 +11,7 @@
 import javax.xml.namespace.NamespaceContext;
 
 /**
- * Maintains namespace<->prefix bindings.
+ * Maintains namespace<->prefix bindings.
  * 
  * 
                    
  * This interface extends {@link NamespaceContext} and provides
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXMarshaller.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXMarshaller.java
index 5319636e08..f0dd295950 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXMarshaller.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXMarshaller.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -263,7 +264,7 @@ public void endElement() throws SAXException {
      * c.endElement();
      * 
      * 
-     * will generate <foo>abc def<bar/>ghi</foo>.
+     * will generate <foo>abc def<bar/>ghi</foo>.
      */
     public void text( String text, String fieldName ) throws SAXException {
         // If the assertion fails, it must be a bug of xjc.
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandler.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandler.java
index c91a0210c1..d0bbee902b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandler.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandler.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -17,7 +18,7 @@
  * both the SAX events and error events.
  * 
  * 
                    
- * This interface refines {@link ContentHandler} as follows:
+ * This interface refines {@link org.xml.sax.ContentHandler} as follows:
  * 
                      
  *  
                    1. element names and attribute names must be {@link String#intern()}ed.
  *  
                    2. namespace prefix and uris must be {@link String#intern()}ed.
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandlerImpl.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandlerImpl.java
index bc411de9bb..1b0cde3db5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandlerImpl.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandlerImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -31,7 +32,7 @@
 import com.sun.xml.bind.util.AttributesImpl;
 
 /**
- * Implementation of {@link UnmarshallerHandler}.
+ * Implementation of {@link javax.xml.bind.UnmarshallerHandler}.
  * 
  * This object converts SAX events into unmarshaller events and
  * cooridnates the entire unmarshalling process.
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallingContext.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallingContext.java
index fa1b2b0018..cca3de17f5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallingContext.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/UnmarshallingContext.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -25,7 +26,7 @@
  *
  * 
                      
  * Errors detected by the AbstractUnmarshallingEventHandlerImpl-derived classes should
- * be either thrown as {@link UnrepotedException} or reported through
+ * be either thrown as {@code UnrepotedException} or reported through
  * the handleEvent method of this interface.
  *
  * @author
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/XMLSerializer.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/XMLSerializer.java
index 7e2537d1ad..211953b6a4 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/XMLSerializer.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/XMLSerializer.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.saml2.jaxb.assertion.impl.runtime;
@@ -127,7 +128,7 @@ public interface XMLSerializer
      * c.endElement();
      * 
      * 
-     * will generate <foo>abc def<bar/>ghi</foo>.
+     * will generate <foo>abc def<bar/>ghi</foo>.
      */
     void text( String text, String fieldName ) throws SAXException;
     
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AffiliationConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AffiliationConfigElement.java
index fbf17a38a9..76b6fac6ea 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AffiliationConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AffiliationConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AffiliationConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 72)
- * 
                      
  * 
                      - * <element name="AffiliationConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="AffiliationConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeAuthorityConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeAuthorityConfigElement.java
index 3ca83dacc7..963d0d0c16 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeAuthorityConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeAuthorityConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeAuthorityConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 67)
- * 
                      
  * 
                      - * <element name="AttributeAuthorityConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="AttributeAuthorityConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeElement.java
index 0041d8f392..f8fdfe69e2 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Attribute element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 79)
- * 
                      
  * 
                      - * <element name="Attribute" type="{urn:sun:fm:SAML:2.0:entityconfig}AttributeType"/>
+ * <element name="Attribute" type="{urn:sun:fm:SAML:2.0:entityconfig}AttributeType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeQueryConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeQueryConfigElement.java
index 19ffb97005..de2c4a076d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeQueryConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeQueryConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeQueryConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 68)
- * 
                      
  * 
                      - * <element name="AttributeQueryConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="AttributeQueryConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeType.java
index f180e87775..73ddcf2970 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AttributeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for AttributeType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 80)
- * 
                      
  * 
                      - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:sun:fm:SAML:2.0:entityconfig}Value" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:sun:fm:SAML:2.0:entityconfig}Value" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AuthnAuthorityConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AuthnAuthorityConfigElement.java
index ff735aa01d..2b64e94cae 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AuthnAuthorityConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/AuthnAuthorityConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnAuthorityConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 66)
- * 
                      
  * 
                      - * <element name="AuthnAuthorityConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="AuthnAuthorityConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/BaseConfigType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/BaseConfigType.java
index e42390433a..af158f2e67 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/BaseConfigType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/BaseConfigType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for BaseConfigType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 73)
- * 
                      
  * 
                      - * <complexType name="BaseConfigType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:sun:fm:SAML:2.0:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="metaAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BaseConfigType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:sun:fm:SAML:2.0:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="metaAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigElement.java
index cfee0e28ee..2f8aa2c9b2 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EntityConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 41)
- * 
                      
  * 
                      - * <element name="EntityConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}EntityConfigType"/>
+ * <element name="EntityConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}EntityConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigType.java
index 7710ccc659..8b23f7d0ae 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/EntityConfigType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,34 +13,33 @@
 /**
  * Java content class for EntityConfigType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 42)
- * 
                      
  * 
                      - * <complexType name="EntityConfigType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:sun:fm:SAML:2.0:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *         <choice>
- *           <choice maxOccurs="unbounded">
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}IDPSSOConfig"/>
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}SPSSOConfig"/>
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AuthnAuthorityConfig"/>
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AttributeAuthorityConfig"/>
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AttributeQueryConfig"/>
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}PDPConfig"/>
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}XACMLPDPConfig"/>
- *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}XACMLAuthzDecisionQueryConfig"/>
- *           </choice>
- *           <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AffiliationConfig"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="entityID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="hosted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EntityConfigType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:sun:fm:SAML:2.0:entityconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *         <choice>
+ *           <choice maxOccurs="unbounded">
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}IDPSSOConfig"/>
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}SPSSOConfig"/>
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AuthnAuthorityConfig"/>
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AttributeAuthorityConfig"/>
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AttributeQueryConfig"/>
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}PDPConfig"/>
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}XACMLPDPConfig"/>
+ *             <element ref="{urn:sun:fm:SAML:2.0:entityconfig}XACMLAuthzDecisionQueryConfig"/>
+ *           </choice>
+ *           <element ref="{urn:sun:fm:SAML:2.0:entityconfig}AffiliationConfig"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="entityID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="hosted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/IDPSSOConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/IDPSSOConfigElement.java
index 0d415cf956..fb3ebc00ca 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/IDPSSOConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/IDPSSOConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDPSSOConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 64)
- * 
                      
  * 
                      - * <element name="IDPSSOConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="IDPSSOConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ObjectFactory.java
index 74e0638109..68e0b775ad 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -77,7 +78,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -96,7 +97,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -115,7 +116,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -127,7 +128,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of AttributeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.AttributeType createAttributeType()
@@ -139,7 +140,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.AttributeType createAttributeTyp
     /**
      * Create an instance of AuthnAuthorityConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.AuthnAuthorityConfigElement createAuthnAuthorityConfigElement()
@@ -151,7 +152,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.AuthnAuthorityConfigElement crea
     /**
      * Create an instance of ValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.ValueElement createValueElement()
@@ -163,7 +164,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.ValueElement createValueElement(
     /**
      * Create an instance of ValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.ValueElement createValueElement(java.lang.String value)
@@ -175,7 +176,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.ValueElement createValueElement(
     /**
      * Create an instance of EntityConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.EntityConfigElement createEntityConfigElement()
@@ -187,7 +188,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.EntityConfigElement createEntity
     /**
      * Create an instance of PDPConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.PDPConfigElement createPDPConfigElement()
@@ -199,7 +200,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.PDPConfigElement createPDPConfig
     /**
      * Create an instance of AttributeQueryConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.AttributeQueryConfigElement createAttributeQueryConfigElement()
@@ -211,7 +212,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.AttributeQueryConfigElement crea
     /**
      * Create an instance of EntityConfigType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.EntityConfigType createEntityConfigType()
@@ -223,7 +224,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.EntityConfigType createEntityCon
     /**
      * Create an instance of AttributeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.AttributeElement createAttributeElement()
@@ -235,7 +236,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.AttributeElement createAttribute
     /**
      * Create an instance of XACMLAuthzDecisionQueryConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.XACMLAuthzDecisionQueryConfigElement createXACMLAuthzDecisionQueryConfigElement()
@@ -247,7 +248,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.XACMLAuthzDecisionQueryConfigEle
     /**
      * Create an instance of IDPSSOConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.IDPSSOConfigElement createIDPSSOConfigElement()
@@ -259,7 +260,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.IDPSSOConfigElement createIDPSSO
     /**
      * Create an instance of BaseConfigType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.BaseConfigType createBaseConfigType()
@@ -271,7 +272,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.BaseConfigType createBaseConfigT
     /**
      * Create an instance of AttributeAuthorityConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.AttributeAuthorityConfigElement createAttributeAuthorityConfigElement()
@@ -283,7 +284,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.AttributeAuthorityConfigElement
     /**
      * Create an instance of XACMLPDPConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.XACMLPDPConfigElement createXACMLPDPConfigElement()
@@ -295,7 +296,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.XACMLPDPConfigElement createXACM
     /**
      * Create an instance of AffiliationConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.AffiliationConfigElement createAffiliationConfigElement()
@@ -307,7 +308,7 @@ public com.sun.identity.saml2.jaxb.entityconfig.AffiliationConfigElement createA
     /**
      * Create an instance of SPSSOConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.entityconfig.SPSSOConfigElement createSPSSOConfigElement()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/PDPConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/PDPConfigElement.java
index 92793e0d31..3a3049a99a 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/PDPConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/PDPConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PDPConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 69)
- * 
                      
  * 
                      - * <element name="PDPConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="PDPConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/SPSSOConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/SPSSOConfigElement.java
index 237dca75fd..cf80e73520 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/SPSSOConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/SPSSOConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPSSOConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 65)
- * 
                      
  * 
                      - * <element name="SPSSOConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="SPSSOConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ValueElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ValueElement.java
index 2bc3dbdaff..7c392a4194 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ValueElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/ValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Value element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 86)
- * 
                      
  * 
                      - * <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLAuthzDecisionQueryConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLAuthzDecisionQueryConfigElement.java
index 7efa30e00c..78f7d6ce87 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLAuthzDecisionQueryConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLAuthzDecisionQueryConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for XACMLAuthzDecisionQueryConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 71)
- * 
                      
  * 
                      - * <element name="XACMLAuthzDecisionQueryConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="XACMLAuthzDecisionQueryConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLPDPConfigElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLPDPConfigElement.java
index aed8ab1991..095ee7cb3f 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLPDPConfigElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/entityconfig/XACMLPDPConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for XACMLPDPConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/entity-config-schema.xsd line 70)
- * 
                      
  * 
                      - * <element name="XACMLPDPConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
+ * <element name="XACMLPDPConfig" type="{urn:sun:fm:SAML:2.0:entityconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationElement.java
index 9633c4cf51..8a260619da 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AdditionalMetadataLocation element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 200)
- * 
                      
  * 
                      - * <element name="AdditionalMetadataLocation" type="{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocationType"/>
+ * <element name="AdditionalMetadataLocation" type="{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocationType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationType.java
index c8608b4ec1..14d173683c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AdditionalMetadataLocationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for AdditionalMetadataLocationType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 201)
- * 
                      
  * 
                      - * <complexType name="AdditionalMetadataLocationType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AdditionalMetadataLocationType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliateMemberElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliateMemberElement.java
index 7ed1320870..0c0767b40b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliateMemberElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliateMemberElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AffiliateMember element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 395)
- * 
                      
  * 
                      - * <element name="AffiliateMember" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType"/>
+ * <element name="AffiliateMember" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorElement.java
index f18ae7cc44..6da05a8626 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AffiliationDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 381)
- * 
                      
  * 
                      - * <element name="AffiliationDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptorType"/>
+ * <element name="AffiliationDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorType.java
index f326146999..0abcc6b447 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AffiliationDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for AffiliationDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 382)
- * 
                      
  * 
                      - * <complexType name="AffiliationDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliateMember" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="affiliationOwnerID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" />
- *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AffiliationDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliateMember" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="affiliationOwnerID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" />
+ *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
+ *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ArtifactResolutionServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ArtifactResolutionServiceElement.java
index bed12c774d..dc1ec384f5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ArtifactResolutionServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ArtifactResolutionServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ArtifactResolutionService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 257)
- * 
                      
  * 
                      - * <element name="ArtifactResolutionService" type="{urn:oasis:names:tc:SAML:2.0:metadata}IndexedEndpointType"/>
+ * <element name="ArtifactResolutionService" type="{urn:oasis:names:tc:SAML:2.0:metadata}IndexedEndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionConsumerServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionConsumerServiceElement.java
index d740d84a12..0b0ede75bc 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionConsumerServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionConsumerServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AssertionConsumerService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 295)
- * 
                      
  * 
                      - * <element name="AssertionConsumerService" type="{urn:oasis:names:tc:SAML:2.0:metadata}IndexedEndpointType"/>
+ * <element name="AssertionConsumerService" type="{urn:oasis:names:tc:SAML:2.0:metadata}IndexedEndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionIDRequestServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionIDRequestServiceElement.java
index c827327832..9f4a92f060 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionIDRequestServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AssertionIDRequestServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AssertionIDRequestService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 279)
- * 
                      
  * 
                      - * <element name="AssertionIDRequestService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="AssertionIDRequestService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorElement.java
index 66751ad88c..c2ce5db8cc 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeAuthorityDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 357)
- * 
                      
  * 
                      - * <element name="AttributeAuthorityDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptorType"/>
+ * <element name="AttributeAuthorityDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorType.java
index af0398ad4d..d24f5d69f4 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeAuthorityDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for AttributeAuthorityDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 358)
- * 
                      
  * 
                      - * <complexType name="AttributeAuthorityDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeService" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeAuthorityDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeService" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceElement.java
index b6b19ba637..54cdf24bd6 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeConsumingService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 296)
- * 
                      
  * 
                      - * <element name="AttributeConsumingService" type="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingServiceType"/>
+ * <element name="AttributeConsumingService" type="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingServiceType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceType.java
index b6b58f7411..030883876c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeConsumingServiceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for AttributeConsumingServiceType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 297)
- * 
                      
  * 
                      - * <complexType name="AttributeConsumingServiceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceName" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceDescription" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RequestedAttribute" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeConsumingServiceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceName" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceDescription" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RequestedAttribute" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
+ *       <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeProfileElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeProfileElement.java
index 378a3cba4b..244600413c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeProfileElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeProfileElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeProfile element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 280)
- * 
                      
  * 
                      - * <element name="AttributeProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="AttributeProfile" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceElement.java
index fffb4eae6e..8ff041d175 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 371)
- * 
                      
  * 
                      - * <element name="AttributeService" type="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeServiceType"/>
+ * <element name="AttributeService" type="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeServiceType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceType.java
index 4d372cc2a7..0d89134f54 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AttributeServiceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for AttributeServiceType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 372)
- * 
                      
  * 
                      - * <complexType name="AttributeServiceType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType">
- *       <attribute ref="{urn:oasis:names:tc:SAML:metadata:X509:query}supportsX509Query"/>
- *       <attribute ref="{urn:oasis:names:tc:SAML:metadata:X509:query}supportsX509SelfQuery"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeServiceType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType">
+ *       <attribute ref="{urn:oasis:names:tc:SAML:metadata:X509:query}supportsX509Query"/>
+ *       <attribute ref="{urn:oasis:names:tc:SAML:metadata:X509:query}supportsX509SelfQuery"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorElement.java
index e216424d31..ce430b5380 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnAuthorityDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 317)
- * 
                      
  * 
                      - * <element name="AuthnAuthorityDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptorType"/>
+ * <element name="AuthnAuthorityDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorType.java
index a7e796aa70..c0789a1d05 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnAuthorityDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for AuthnAuthorityDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 318)
- * 
                      
  * 
                      - * <complexType name="AuthnAuthorityDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnQueryService" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnAuthorityDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnQueryService" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnQueryServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnQueryServiceElement.java
index 4981be9ec6..1b30c347bf 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnQueryServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthnQueryServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthnQueryService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 329)
- * 
                      
  * 
                      - * <element name="AuthnQueryService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="AuthnQueryService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthzServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthzServiceElement.java
index 5204de31f9..451370576d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthzServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/AuthzServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthzService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 343)
- * 
                      
  * 
                      - * <element name="AuthzService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="AuthzService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/CompanyElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/CompanyElement.java
index e03e07d493..b4e05553a3 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/CompanyElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/CompanyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Company element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 185)
- * 
                      
  * 
                      - * <element name="Company" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="Company" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactPersonElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactPersonElement.java
index d9ca2d9ab3..1dc82625d4 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactPersonElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactPersonElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ContactPerson element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 172)
- * 
                      
  * 
                      - * <element name="ContactPerson" type="{urn:oasis:names:tc:SAML:2.0:metadata}ContactType"/>
+ * <element name="ContactPerson" type="{urn:oasis:names:tc:SAML:2.0:metadata}ContactType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactType.java
index f9cc00cd50..a1cdb78274 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ContactType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for ContactType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 173)
- * 
                      
  * 
                      - * <complexType name="ContactType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Company" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}GivenName" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SurName" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EmailAddress" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}TelephoneNumber" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="contactType" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}ContactTypeType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ContactType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Company" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}GivenName" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SurName" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EmailAddress" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}TelephoneNumber" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="contactType" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}ContactTypeType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EmailAddressElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EmailAddressElement.java
index 9ad0ad8537..7a5bfc1760 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EmailAddressElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EmailAddressElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EmailAddress element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 188)
- * 
                      
  * 
                      - * <element name="EmailAddress" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="EmailAddress" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EncryptionMethodElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EncryptionMethodElement.java
index 81d41c9df2..4d51359e46 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EncryptionMethodElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EncryptionMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptionMethod element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 243)
- * 
                      
  * 
                      - * <element name="EncryptionMethod" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionMethodType"/>
+ * <element name="EncryptionMethod" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionMethodType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EndpointType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EndpointType.java
index ae37225bf2..426e0a23ee 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EndpointType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EndpointType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for EndpointType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 93)
- * 
                      
  * 
                      - * <complexType name="EndpointType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="ResponseLocation" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EndpointType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ResponseLocation" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorElement.java
index 746509a430..c022195e89 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EntitiesDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 112)
- * 
                      
  * 
                      - * <element name="EntitiesDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptorType"/>
+ * <element name="EntitiesDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorType.java
index 22f1546ccf..ae5de00bcf 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntitiesDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,26 +13,25 @@
 /**
  * Java content class for EntitiesDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 113)
- * 
                      
  * 
                      - * <complexType name="EntitiesDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         <choice maxOccurs="unbounded">
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptor"/>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EntitiesDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptor"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
+ *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorElement.java
index dee7a4ec14..eff888a9fe 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EntityDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 128)
- * 
                      
  * 
                      - * <element name="EntityDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptorType"/>
+ * <element name="EntityDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorType.java
index 409f0bdb3d..e9a98b85b6 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/EntityDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,40 +13,39 @@
 /**
  * Java content class for EntityDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 129)
- * 
                      
  * 
                      - * <complexType name="EntityDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         <choice>
- *           <choice maxOccurs="unbounded">
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SPSSODescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}PDPDescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLPDPDescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}QueryDescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLAuthzDecisionQueryDescriptor"/>
- *             <element ref="{urn:oasis:names:tc:SAML:metadata:ext:query}AttributeQueryDescriptor"/>
- *           </choice>
- *           <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptor"/>
- *         </choice>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocation" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       <attribute name="entityID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" />
- *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EntityDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
+ *         <choice>
+ *           <choice maxOccurs="unbounded">
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SPSSODescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}PDPDescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLPDPDescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}QueryDescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLAuthzDecisionQueryDescriptor"/>
+ *             <element ref="{urn:oasis:names:tc:SAML:metadata:ext:query}AttributeQueryDescriptor"/>
+ *           </choice>
+ *           <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptor"/>
+ *         </choice>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocation" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
+ *       <attribute name="entityID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" />
+ *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsElement.java
index f868dbadba..198be51517 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Extensions element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 86)
- * 
                      
  * 
                      - * <element name="Extensions" type="{urn:oasis:names:tc:SAML:2.0:metadata}ExtensionsType"/>
+ * <element name="Extensions" type="{urn:oasis:names:tc:SAML:2.0:metadata}ExtensionsType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsType.java
index 730d4de818..098de1c5e5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ExtensionsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for ExtensionsType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 87)
- * 
                      
  * 
                      - * <complexType name="ExtensionsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ExtensionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/GivenNameElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/GivenNameElement.java
index e821a3c51e..33b05c482d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/GivenNameElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/GivenNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for GivenName element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 186)
- * 
                      
  * 
                      - * <element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorElement.java
index c2e45e708b..350cade01c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDPSSODescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 262)
- * 
                      
  * 
                      - * <element name="IDPSSODescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptorType"/>
+ * <element name="IDPSSODescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorType.java
index b165009084..bdaac7c4a8 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IDPSSODescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for IDPSSODescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 263)
- * 
                      
  * 
                      - * <complexType name="IDPSSODescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDMappingService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="WantAuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IDPSSODescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDMappingService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="WantAuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IndexedEndpointType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IndexedEndpointType.java
index a331044905..9bb26446f7 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IndexedEndpointType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/IndexedEndpointType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for IndexedEndpointType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 103)
- * 
                      
  * 
                      - * <complexType name="IndexedEndpointType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType">
- *       <attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IndexedEndpointType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType">
+ *       <attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
+ *       <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorElement.java
index e182d115e6..9000481610 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 229)
- * 
                      
  * 
                      - * <element name="KeyDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptorType"/>
+ * <element name="KeyDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorType.java
index ba243335fd..db227d5c4a 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/KeyDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for KeyDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 230)
- * 
                      
  * 
                      - * <complexType name="KeyDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EncryptionMethod" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="use" type="{urn:oasis:names:tc:SAML:2.0:metadata}KeyTypes" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EncryptionMethod" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="use" type="{urn:oasis:names:tc:SAML:2.0:metadata}KeyTypes" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedNameType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedNameType.java
index 8180e777fd..2661144386 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedNameType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for localizedNameType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 71)
- * 
                      
  * 
                      - * <complexType name="localizedNameType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="localizedNameType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedURIType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedURIType.java
index 05990a72e3..9936c2d1eb 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedURIType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/LocalizedURIType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for localizedURIType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 78)
- * 
                      
  * 
                      - * <complexType name="localizedURIType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="localizedURIType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ManageNameIDServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ManageNameIDServiceElement.java
index a9e403ace1..bf0fa54692 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ManageNameIDServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ManageNameIDServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ManageNameIDService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 259)
- * 
                      
  * 
                      - * <element name="ManageNameIDService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="ManageNameIDService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDFormatElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDFormatElement.java
index cf836239b4..444675c61f 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDFormatElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDFormatElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NameIDFormat element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 260)
- * 
                      
  * 
                      - * <element name="NameIDFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="NameIDFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDMappingServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDMappingServiceElement.java
index 51882e17cb..ceb4eaaafa 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDMappingServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/NameIDMappingServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for NameIDMappingService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 278)
- * 
                      
  * 
                      - * <element name="NameIDMappingService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="NameIDMappingService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ObjectFactory.java
index 5b9a2a2597..0e7baaab56 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -163,7 +164,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -182,7 +183,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -201,7 +202,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -213,7 +214,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of EmailAddressElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EmailAddressElement createEmailAddressElement()
@@ -225,7 +226,7 @@ public com.sun.identity.saml2.jaxb.metadata.EmailAddressElement createEmailAddre
     /**
      * Create an instance of EmailAddressElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EmailAddressElement createEmailAddressElement(java.lang.String value)
@@ -237,7 +238,7 @@ public com.sun.identity.saml2.jaxb.metadata.EmailAddressElement createEmailAddre
     /**
      * Create an instance of KeyDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.KeyDescriptorType createKeyDescriptorType()
@@ -249,7 +250,7 @@ public com.sun.identity.saml2.jaxb.metadata.KeyDescriptorType createKeyDescripto
     /**
      * Create an instance of OrganizationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.OrganizationElement createOrganizationElement()
@@ -261,7 +262,7 @@ public com.sun.identity.saml2.jaxb.metadata.OrganizationElement createOrganizati
     /**
      * Create an instance of RoleDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.RoleDescriptorElement createRoleDescriptorElement()
@@ -273,7 +274,7 @@ public com.sun.identity.saml2.jaxb.metadata.RoleDescriptorElement createRoleDesc
     /**
      * Create an instance of EntitiesDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EntitiesDescriptorType createEntitiesDescriptorType()
@@ -285,7 +286,7 @@ public com.sun.identity.saml2.jaxb.metadata.EntitiesDescriptorType createEntitie
     /**
      * Create an instance of AssertionIDRequestServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AssertionIDRequestServiceElement createAssertionIDRequestServiceElement()
@@ -297,7 +298,7 @@ public com.sun.identity.saml2.jaxb.metadata.AssertionIDRequestServiceElement cre
     /**
      * Create an instance of AdditionalMetadataLocationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AdditionalMetadataLocationType createAdditionalMetadataLocationType()
@@ -309,7 +310,7 @@ public com.sun.identity.saml2.jaxb.metadata.AdditionalMetadataLocationType creat
     /**
      * Create an instance of SSODescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.SSODescriptorType createSSODescriptorType()
@@ -321,7 +322,7 @@ public com.sun.identity.saml2.jaxb.metadata.SSODescriptorType createSSODescripto
     /**
      * Create an instance of ArtifactResolutionServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ArtifactResolutionServiceElement createArtifactResolutionServiceElement()
@@ -333,7 +334,7 @@ public com.sun.identity.saml2.jaxb.metadata.ArtifactResolutionServiceElement cre
     /**
      * Create an instance of EntitiesDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EntitiesDescriptorElement createEntitiesDescriptorElement()
@@ -345,7 +346,7 @@ public com.sun.identity.saml2.jaxb.metadata.EntitiesDescriptorElement createEnti
     /**
      * Create an instance of XACMLPDPDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.XACMLPDPDescriptorType createXACMLPDPDescriptorType()
@@ -357,7 +358,7 @@ public com.sun.identity.saml2.jaxb.metadata.XACMLPDPDescriptorType createXACMLPD
     /**
      * Create an instance of XACMLAuthzDecisionQueryDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.XACMLAuthzDecisionQueryDescriptorElement createXACMLAuthzDecisionQueryDescriptorElement()
@@ -369,7 +370,7 @@ public com.sun.identity.saml2.jaxb.metadata.XACMLAuthzDecisionQueryDescriptorEle
     /**
      * Create an instance of ExtensionsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ExtensionsElement createExtensionsElement()
@@ -381,7 +382,7 @@ public com.sun.identity.saml2.jaxb.metadata.ExtensionsElement createExtensionsEl
     /**
      * Create an instance of AttributeAuthorityDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeAuthorityDescriptorElement createAttributeAuthorityDescriptorElement()
@@ -393,7 +394,7 @@ public com.sun.identity.saml2.jaxb.metadata.AttributeAuthorityDescriptorElement
     /**
      * Create an instance of AuthzServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AuthzServiceElement createAuthzServiceElement()
@@ -405,7 +406,7 @@ public com.sun.identity.saml2.jaxb.metadata.AuthzServiceElement createAuthzServi
     /**
      * Create an instance of GivenNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.GivenNameElement createGivenNameElement()
@@ -417,7 +418,7 @@ public com.sun.identity.saml2.jaxb.metadata.GivenNameElement createGivenNameElem
     /**
      * Create an instance of GivenNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.GivenNameElement createGivenNameElement(java.lang.String value)
@@ -429,7 +430,7 @@ public com.sun.identity.saml2.jaxb.metadata.GivenNameElement createGivenNameElem
     /**
      * Create an instance of RoleDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.RoleDescriptorType createRoleDescriptorType()
@@ -441,7 +442,7 @@ public com.sun.identity.saml2.jaxb.metadata.RoleDescriptorType createRoleDescrip
     /**
      * Create an instance of AuthnAuthorityDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AuthnAuthorityDescriptorElement createAuthnAuthorityDescriptorElement()
@@ -453,7 +454,7 @@ public com.sun.identity.saml2.jaxb.metadata.AuthnAuthorityDescriptorElement crea
     /**
      * Create an instance of LocalizedURIType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.LocalizedURIType createLocalizedURIType()
@@ -465,7 +466,7 @@ public com.sun.identity.saml2.jaxb.metadata.LocalizedURIType createLocalizedURIT
     /**
      * Create an instance of OrganizationDisplayNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.OrganizationDisplayNameElement createOrganizationDisplayNameElement()
@@ -477,7 +478,7 @@ public com.sun.identity.saml2.jaxb.metadata.OrganizationDisplayNameElement creat
     /**
      * Create an instance of TelephoneNumberElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.TelephoneNumberElement createTelephoneNumberElement()
@@ -489,7 +490,7 @@ public com.sun.identity.saml2.jaxb.metadata.TelephoneNumberElement createTelepho
     /**
      * Create an instance of TelephoneNumberElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.TelephoneNumberElement createTelephoneNumberElement(java.lang.String value)
@@ -501,7 +502,7 @@ public com.sun.identity.saml2.jaxb.metadata.TelephoneNumberElement createTelepho
     /**
      * Create an instance of PDPDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.PDPDescriptorType createPDPDescriptorType()
@@ -513,7 +514,7 @@ public com.sun.identity.saml2.jaxb.metadata.PDPDescriptorType createPDPDescripto
     /**
      * Create an instance of OrganizationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.OrganizationType createOrganizationType()
@@ -525,7 +526,7 @@ public com.sun.identity.saml2.jaxb.metadata.OrganizationType createOrganizationT
     /**
      * Create an instance of AttributeServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeServiceElement createAttributeServiceElement()
@@ -537,7 +538,7 @@ public com.sun.identity.saml2.jaxb.metadata.AttributeServiceElement createAttrib
     /**
      * Create an instance of XACMLPDPDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.XACMLPDPDescriptorElement createXACMLPDPDescriptorElement()
@@ -549,7 +550,7 @@ public com.sun.identity.saml2.jaxb.metadata.XACMLPDPDescriptorElement createXACM
     /**
      * Create an instance of AffiliationDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AffiliationDescriptorElement createAffiliationDescriptorElement()
@@ -561,7 +562,7 @@ public com.sun.identity.saml2.jaxb.metadata.AffiliationDescriptorElement createA
     /**
      * Create an instance of EntityDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EntityDescriptorElement createEntityDescriptorElement()
@@ -573,7 +574,7 @@ public com.sun.identity.saml2.jaxb.metadata.EntityDescriptorElement createEntity
     /**
      * Create an instance of EncryptionMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EncryptionMethodElement createEncryptionMethodElement()
@@ -585,7 +586,7 @@ public com.sun.identity.saml2.jaxb.metadata.EncryptionMethodElement createEncryp
     /**
      * Create an instance of XACMLAuthzDecisionQueryDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.XACMLAuthzDecisionQueryDescriptorType createXACMLAuthzDecisionQueryDescriptorType()
@@ -597,7 +598,7 @@ public com.sun.identity.saml2.jaxb.metadata.XACMLAuthzDecisionQueryDescriptorTyp
     /**
      * Create an instance of AssertionConsumerServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AssertionConsumerServiceElement createAssertionConsumerServiceElement()
@@ -609,7 +610,7 @@ public com.sun.identity.saml2.jaxb.metadata.AssertionConsumerServiceElement crea
     /**
      * Create an instance of IDPSSODescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.IDPSSODescriptorElement createIDPSSODescriptorElement()
@@ -621,7 +622,7 @@ public com.sun.identity.saml2.jaxb.metadata.IDPSSODescriptorElement createIDPSSO
     /**
      * Create an instance of QueryDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.QueryDescriptorElement createQueryDescriptorElement()
@@ -633,7 +634,7 @@ public com.sun.identity.saml2.jaxb.metadata.QueryDescriptorElement createQueryDe
     /**
      * Create an instance of AuthnQueryServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AuthnQueryServiceElement createAuthnQueryServiceElement()
@@ -645,7 +646,7 @@ public com.sun.identity.saml2.jaxb.metadata.AuthnQueryServiceElement createAuthn
     /**
      * Create an instance of RequestedAttributeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.RequestedAttributeType createRequestedAttributeType()
@@ -657,7 +658,7 @@ public com.sun.identity.saml2.jaxb.metadata.RequestedAttributeType createRequest
     /**
      * Create an instance of AttributeAuthorityDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeAuthorityDescriptorType createAttributeAuthorityDescriptorType()
@@ -669,7 +670,7 @@ public com.sun.identity.saml2.jaxb.metadata.AttributeAuthorityDescriptorType cre
     /**
      * Create an instance of XACMLAuthzServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.XACMLAuthzServiceElement createXACMLAuthzServiceElement()
@@ -681,7 +682,7 @@ public com.sun.identity.saml2.jaxb.metadata.XACMLAuthzServiceElement createXACML
     /**
      * Create an instance of AuthnAuthorityDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AuthnAuthorityDescriptorType createAuthnAuthorityDescriptorType()
@@ -693,7 +694,7 @@ public com.sun.identity.saml2.jaxb.metadata.AuthnAuthorityDescriptorType createA
     /**
      * Create an instance of OrganizationURLElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.OrganizationURLElement createOrganizationURLElement()
@@ -705,7 +706,7 @@ public com.sun.identity.saml2.jaxb.metadata.OrganizationURLElement createOrganiz
     /**
      * Create an instance of AttributeConsumingServiceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeConsumingServiceType createAttributeConsumingServiceType()
@@ -717,7 +718,7 @@ public com.sun.identity.saml2.jaxb.metadata.AttributeConsumingServiceType create
     /**
      * Create an instance of SurNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.SurNameElement createSurNameElement()
@@ -729,7 +730,7 @@ public com.sun.identity.saml2.jaxb.metadata.SurNameElement createSurNameElement(
     /**
      * Create an instance of SurNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.SurNameElement createSurNameElement(java.lang.String value)
@@ -741,7 +742,7 @@ public com.sun.identity.saml2.jaxb.metadata.SurNameElement createSurNameElement(
     /**
      * Create an instance of AdditionalMetadataLocationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AdditionalMetadataLocationElement createAdditionalMetadataLocationElement()
@@ -753,7 +754,7 @@ public com.sun.identity.saml2.jaxb.metadata.AdditionalMetadataLocationElement cr
     /**
      * Create an instance of NameIDFormatElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.NameIDFormatElement createNameIDFormatElement()
@@ -765,7 +766,7 @@ public com.sun.identity.saml2.jaxb.metadata.NameIDFormatElement createNameIDForm
     /**
      * Create an instance of NameIDFormatElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.NameIDFormatElement createNameIDFormatElement(java.lang.String value)
@@ -777,7 +778,7 @@ public com.sun.identity.saml2.jaxb.metadata.NameIDFormatElement createNameIDForm
     /**
      * Create an instance of EndpointType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EndpointType createEndpointType()
@@ -789,7 +790,7 @@ public com.sun.identity.saml2.jaxb.metadata.EndpointType createEndpointType()
     /**
      * Create an instance of NameIDMappingServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.NameIDMappingServiceElement createNameIDMappingServiceElement()
@@ -801,7 +802,7 @@ public com.sun.identity.saml2.jaxb.metadata.NameIDMappingServiceElement createNa
     /**
      * Create an instance of SPSSODescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.SPSSODescriptorElement createSPSSODescriptorElement()
@@ -813,7 +814,7 @@ public com.sun.identity.saml2.jaxb.metadata.SPSSODescriptorElement createSPSSODe
     /**
      * Create an instance of ExtensionsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ExtensionsType createExtensionsType()
@@ -825,7 +826,7 @@ public com.sun.identity.saml2.jaxb.metadata.ExtensionsType createExtensionsType(
     /**
      * Create an instance of OrganizationNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.OrganizationNameElement createOrganizationNameElement()
@@ -837,7 +838,7 @@ public com.sun.identity.saml2.jaxb.metadata.OrganizationNameElement createOrgani
     /**
      * Create an instance of ManageNameIDServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ManageNameIDServiceElement createManageNameIDServiceElement()
@@ -849,7 +850,7 @@ public com.sun.identity.saml2.jaxb.metadata.ManageNameIDServiceElement createMan
     /**
      * Create an instance of ServiceDescriptionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ServiceDescriptionElement createServiceDescriptionElement()
@@ -861,7 +862,7 @@ public com.sun.identity.saml2.jaxb.metadata.ServiceDescriptionElement createServ
     /**
      * Create an instance of ServiceNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ServiceNameElement createServiceNameElement()
@@ -873,7 +874,7 @@ public com.sun.identity.saml2.jaxb.metadata.ServiceNameElement createServiceName
     /**
      * Create an instance of ContactPersonElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ContactPersonElement createContactPersonElement()
@@ -885,7 +886,7 @@ public com.sun.identity.saml2.jaxb.metadata.ContactPersonElement createContactPe
     /**
      * Create an instance of SPSSODescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.SPSSODescriptorType createSPSSODescriptorType()
@@ -897,7 +898,7 @@ public com.sun.identity.saml2.jaxb.metadata.SPSSODescriptorType createSPSSODescr
     /**
      * Create an instance of CompanyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.CompanyElement createCompanyElement()
@@ -909,7 +910,7 @@ public com.sun.identity.saml2.jaxb.metadata.CompanyElement createCompanyElement(
     /**
      * Create an instance of CompanyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.CompanyElement createCompanyElement(java.lang.String value)
@@ -921,7 +922,7 @@ public com.sun.identity.saml2.jaxb.metadata.CompanyElement createCompanyElement(
     /**
      * Create an instance of QueryDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.QueryDescriptorType createQueryDescriptorType()
@@ -933,7 +934,7 @@ public com.sun.identity.saml2.jaxb.metadata.QueryDescriptorType createQueryDescr
     /**
      * Create an instance of ContactType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.ContactType createContactType()
@@ -945,7 +946,7 @@ public com.sun.identity.saml2.jaxb.metadata.ContactType createContactType()
     /**
      * Create an instance of IDPSSODescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.IDPSSODescriptorType createIDPSSODescriptorType()
@@ -957,7 +958,7 @@ public com.sun.identity.saml2.jaxb.metadata.IDPSSODescriptorType createIDPSSODes
     /**
      * Create an instance of RequestedAttributeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.RequestedAttributeElement createRequestedAttributeElement()
@@ -969,7 +970,7 @@ public com.sun.identity.saml2.jaxb.metadata.RequestedAttributeElement createRequ
     /**
      * Create an instance of SingleLogoutServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.SingleLogoutServiceElement createSingleLogoutServiceElement()
@@ -981,7 +982,7 @@ public com.sun.identity.saml2.jaxb.metadata.SingleLogoutServiceElement createSin
     /**
      * Create an instance of AttributeConsumingServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeConsumingServiceElement createAttributeConsumingServiceElement()
@@ -993,7 +994,7 @@ public com.sun.identity.saml2.jaxb.metadata.AttributeConsumingServiceElement cre
     /**
      * Create an instance of SingleSignOnServiceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.SingleSignOnServiceElement createSingleSignOnServiceElement()
@@ -1005,7 +1006,7 @@ public com.sun.identity.saml2.jaxb.metadata.SingleSignOnServiceElement createSin
     /**
      * Create an instance of LocalizedNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.LocalizedNameType createLocalizedNameType()
@@ -1017,7 +1018,7 @@ public com.sun.identity.saml2.jaxb.metadata.LocalizedNameType createLocalizedNam
     /**
      * Create an instance of KeyDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.KeyDescriptorElement createKeyDescriptorElement()
@@ -1029,7 +1030,7 @@ public com.sun.identity.saml2.jaxb.metadata.KeyDescriptorElement createKeyDescri
     /**
      * Create an instance of AttributeProfileElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeProfileElement createAttributeProfileElement()
@@ -1041,7 +1042,7 @@ public com.sun.identity.saml2.jaxb.metadata.AttributeProfileElement createAttrib
     /**
      * Create an instance of AttributeProfileElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeProfileElement createAttributeProfileElement(java.lang.String value)
@@ -1053,7 +1054,7 @@ public com.sun.identity.saml2.jaxb.metadata.AttributeProfileElement createAttrib
     /**
      * Create an instance of PDPDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.PDPDescriptorElement createPDPDescriptorElement()
@@ -1065,7 +1066,7 @@ public com.sun.identity.saml2.jaxb.metadata.PDPDescriptorElement createPDPDescri
     /**
      * Create an instance of EntityDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.EntityDescriptorType createEntityDescriptorType()
@@ -1077,7 +1078,7 @@ public com.sun.identity.saml2.jaxb.metadata.EntityDescriptorType createEntityDes
     /**
      * Create an instance of AffiliationDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AffiliationDescriptorType createAffiliationDescriptorType()
@@ -1089,7 +1090,7 @@ public com.sun.identity.saml2.jaxb.metadata.AffiliationDescriptorType createAffi
     /**
      * Create an instance of AffiliateMemberElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AffiliateMemberElement createAffiliateMemberElement()
@@ -1101,7 +1102,7 @@ public com.sun.identity.saml2.jaxb.metadata.AffiliateMemberElement createAffilia
     /**
      * Create an instance of AffiliateMemberElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AffiliateMemberElement createAffiliateMemberElement(java.lang.String value)
@@ -1113,7 +1114,7 @@ public com.sun.identity.saml2.jaxb.metadata.AffiliateMemberElement createAffilia
     /**
      * Create an instance of IndexedEndpointType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.IndexedEndpointType createIndexedEndpointType()
@@ -1125,7 +1126,7 @@ public com.sun.identity.saml2.jaxb.metadata.IndexedEndpointType createIndexedEnd
     /**
      * Create an instance of AttributeServiceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadata.AttributeServiceType createAttributeServiceType()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationDisplayNameElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationDisplayNameElement.java
index a3ad18f85c..beeea6b00d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationDisplayNameElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationDisplayNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for OrganizationDisplayName element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 170)
- * 
                      
  * 
                      - * <element name="OrganizationDisplayName" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
+ * <element name="OrganizationDisplayName" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationElement.java
index 1d3b30c599..a6a161fb88 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Organization element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 159)
- * 
                      
  * 
                      - * <element name="Organization" type="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationType"/>
+ * <element name="Organization" type="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationNameElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationNameElement.java
index 998bdc47a4..4dcb9f4ba2 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationNameElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for OrganizationName element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 169)
- * 
                      
  * 
                      - * <element name="OrganizationName" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
+ * <element name="OrganizationName" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationType.java
index a6c8112b5a..e69e663a57 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for OrganizationType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 160)
- * 
                      
  * 
                      - * <complexType name="OrganizationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationName" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationDisplayName" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationURL" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OrganizationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationName" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationDisplayName" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationURL" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationURLElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationURLElement.java
index 6845f027c0..d706ec09ed 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationURLElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/OrganizationURLElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for OrganizationURL element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 171)
- * 
                      
  * 
                      - * <element name="OrganizationURL" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedURIType"/>
+ * <element name="OrganizationURL" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedURIType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorElement.java
index ecfdf39a9a..9415a7e592 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PDPDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 331)
- * 
                      
  * 
                      - * <element name="PDPDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}PDPDescriptorType"/>
+ * <element name="PDPDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}PDPDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorType.java
index 705fac19ae..ce608687c3 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/PDPDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for PDPDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 332)
- * 
                      
  * 
                      - * <complexType name="PDPDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthzService" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PDPDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthzService" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorElement.java
index e37005b8aa..8bddf17a41 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for QueryDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 397)
- * 
                      
  * 
                      - * <element name="QueryDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}QueryDescriptorType"/>
+ * <element name="QueryDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}QueryDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorType.java
index 71e034229e..e32daee7e7 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/QueryDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for QueryDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 398)
- * 
                      
  * 
                      - * <complexType name="QueryDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeElement.java
index f7b30d90de..2aa8c765ff 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequestedAttribute element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 308)
- * 
                      
  * 
                      - * <element name="RequestedAttribute" type="{urn:oasis:names:tc:SAML:2.0:metadata}RequestedAttributeType"/>
+ * <element name="RequestedAttribute" type="{urn:oasis:names:tc:SAML:2.0:metadata}RequestedAttributeType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeType.java
index 196eca2920..d1e15ce9bd 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RequestedAttributeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for RequestedAttributeType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 309)
- * 
                      
  * 
                      - * <complexType name="RequestedAttributeType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeType">
- *       <attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestedAttributeType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeType">
+ *       <attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorElement.java
index bd274f8f4b..4bd605ed11 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RoleDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 209)
- * 
                      
  * 
                      - * <element name="RoleDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType"/>
+ * <element name="RoleDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorType.java
index cc9e87a19e..fe6a01d5e5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/RoleDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,26 +13,25 @@
 /**
  * Java content class for RoleDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 210)
- * 
                      
  * 
                      - * <complexType name="RoleDescriptorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       <attribute name="errorURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="protocolSupportEnumeration" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}anyURIListType" />
- *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RoleDescriptorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
+ *       <attribute name="errorURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="protocolSupportEnumeration" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}anyURIListType" />
+ *       <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorElement.java
index 18825b7758..d9066372df 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPSSODescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 282)
- * 
                      
  * 
                      - * <element name="SPSSODescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}SPSSODescriptorType"/>
+ * <element name="SPSSODescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}SPSSODescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorType.java
index 32fc7f852e..8795a2899e 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SPSSODescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for SPSSODescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 283)
- * 
                      
  * 
                      - * <complexType name="SPSSODescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionConsumerService" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="AuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPSSODescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionConsumerService" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="AuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       <attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SSODescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SSODescriptorType.java
index 347efd6f4b..4b44a564d7 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SSODescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SSODescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for SSODescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 245)
- * 
                      
  * 
                      - * <complexType name="SSODescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ArtifactResolutionService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleLogoutService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ManageNameIDService" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SSODescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ArtifactResolutionService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleLogoutService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ManageNameIDService" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceDescriptionElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceDescriptionElement.java
index 93f184901c..9425b7624d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceDescriptionElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceDescriptionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ServiceDescription element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 307)
- * 
                      
  * 
                      - * <element name="ServiceDescription" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
+ * <element name="ServiceDescription" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceNameElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceNameElement.java
index 7494ae0cdc..550bc6df46 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceNameElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/ServiceNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ServiceName element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 306)
- * 
                      
  * 
                      - * <element name="ServiceName" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
+ * <element name="ServiceName" type="{urn:oasis:names:tc:SAML:2.0:metadata}localizedNameType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleLogoutServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleLogoutServiceElement.java
index 995de3f8b5..4c68911dd5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleLogoutServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleLogoutServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SingleLogoutService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 258)
- * 
                      
  * 
                      - * <element name="SingleLogoutService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="SingleLogoutService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleSignOnServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleSignOnServiceElement.java
index a398ea866f..4c7fb471e7 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleSignOnServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SingleSignOnServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SingleSignOnService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 277)
- * 
                      
  * 
                      - * <element name="SingleSignOnService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="SingleSignOnService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SurNameElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SurNameElement.java
index 2c673d45c4..d9246046f5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SurNameElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/SurNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SurName element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 187)
- * 
                      
  * 
                      - * <element name="SurName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="SurName" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/TelephoneNumberElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/TelephoneNumberElement.java
index 403c062b8e..0ec1fa07cb 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/TelephoneNumberElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/TelephoneNumberElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for TelephoneNumber element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 189)
- * 
                      
  * 
                      - * <element name="TelephoneNumber" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="TelephoneNumber" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorElement.java
index a46c6f7eca..10efa6d6c8 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for XACMLAuthzDecisionQueryDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 409)
- * 
                      
  * 
                      - * <element name="XACMLAuthzDecisionQueryDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLAuthzDecisionQueryDescriptorType"/>
+ * <element name="XACMLAuthzDecisionQueryDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLAuthzDecisionQueryDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorType.java
index f150546fc3..d70d6b469d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzDecisionQueryDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for XACMLAuthzDecisionQueryDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 410)
- * 
                      
  * 
                      - * <complexType name="XACMLAuthzDecisionQueryDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}QueryDescriptorType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XACMLAuthzDecisionQueryDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}QueryDescriptorType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzServiceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzServiceElement.java
index 9a14efb24d..c2d8f5a708 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzServiceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLAuthzServiceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for XACMLAuthzService element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 355)
- * 
                      
  * 
                      - * <element name="XACMLAuthzService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
+ * <element name="XACMLAuthzService" type="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorElement.java
index 7e4623a8a1..070a83a20e 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for XACMLPDPDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 345)
- * 
                      
  * 
                      - * <element name="XACMLPDPDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLPDPDescriptorType"/>
+ * <element name="XACMLPDPDescriptor" type="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLPDPDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorType.java
index 03045689ed..903839ef38 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadata/XACMLPDPDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for XACMLPDPDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/saml-schema-metadata-2.0.xsd line 346)
- * 
                      
  * 
                      - * <complexType name="XACMLPDPDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLAuthzService" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XACMLPDPDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}XACMLAuthzService" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesElement.java
index 71c0e2b05a..0f8371fe5d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EntityAttributes element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-metadata-attr.xsd line 55)
- * 
                      
  * 
                      - * <element name="EntityAttributes" type="{urn:oasis:names:tc:SAML:metadata:attribute}EntityAttributesType"/>
+ * <element name="EntityAttributes" type="{urn:oasis:names:tc:SAML:metadata:attribute}EntityAttributesType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesType.java
index 1ec42be09d..ac47b1a6f9 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/EntityAttributesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for EntityAttributesType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-metadata-attr.xsd line 56)
- * 
                      
  * 
                      - * <complexType name="EntityAttributesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EntityAttributesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/ObjectFactory.java
index 536e5db9bc..acdeac8a67 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataattr/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -53,7 +54,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -72,7 +73,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -91,7 +92,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -103,7 +104,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of EntityAttributesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataattr.EntityAttributesType createEntityAttributesType()
@@ -115,7 +116,7 @@ public com.sun.identity.saml2.jaxb.metadataattr.EntityAttributesType createEntit
     /**
      * Create an instance of EntityAttributesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataattr.EntityAttributesElement createEntityAttributesElement()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ActionNamespaceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ActionNamespaceElement.java
index 01c2a8fe1c..e062b60882 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ActionNamespaceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ActionNamespaceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ActionNamespace element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-saml-metadata-ext-query.xsd line 83)
- * 
                      
  * 
                      - * <element name="ActionNamespace" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="ActionNamespace" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorElement.java
index a69e978add..2353b31b1d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeQueryDescriptor element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-saml-metadata-ext-query.xsd line 72)
- * 
                      
  * 
                      - * <element name="AttributeQueryDescriptor" type="{urn:oasis:names:tc:SAML:metadata:ext:query}AttributeQueryDescriptorType"/>
+ * <element name="AttributeQueryDescriptor" type="{urn:oasis:names:tc:SAML:metadata:ext:query}AttributeQueryDescriptorType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorType.java
index 90467e0054..914210e3fa 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AttributeQueryDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AttributeQueryDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-saml-metadata-ext-query.xsd line 73)
- * 
                      
  * 
                      - * <complexType name="AttributeQueryDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:metadata:ext:query}QueryDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeQueryDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:metadata:ext:query}QueryDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthnQueryDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthnQueryDescriptorType.java
index 73d687e073..4f40b5e61f 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthnQueryDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthnQueryDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for AuthnQueryDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-saml-metadata-ext-query.xsd line 66)
- * 
                      
  * 
                      - * <complexType name="AuthnQueryDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:metadata:ext:query}QueryDescriptorType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthnQueryDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:metadata:ext:query}QueryDescriptorType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthzDecisionQueryDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthzDecisionQueryDescriptorType.java
index 62e925828d..4087d09e6b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthzDecisionQueryDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/AuthzDecisionQueryDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AuthzDecisionQueryDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-saml-metadata-ext-query.xsd line 85)
- * 
                      
  * 
                      - * <complexType name="AuthzDecisionQueryDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:metadata:ext:query}QueryDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:metadata:ext:query}ActionNamespace" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthzDecisionQueryDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:metadata:ext:query}QueryDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:metadata:ext:query}ActionNamespace" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ObjectFactory.java
index 79979d1be7..3515df9f5f 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -58,7 +59,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -77,7 +78,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -96,7 +97,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -108,7 +109,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of ActionNamespaceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataextquery.ActionNamespaceElement createActionNamespaceElement()
@@ -120,7 +121,7 @@ public com.sun.identity.saml2.jaxb.metadataextquery.ActionNamespaceElement creat
     /**
      * Create an instance of ActionNamespaceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataextquery.ActionNamespaceElement createActionNamespaceElement(java.lang.String value)
@@ -132,7 +133,7 @@ public com.sun.identity.saml2.jaxb.metadataextquery.ActionNamespaceElement creat
     /**
      * Create an instance of AuthnQueryDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataextquery.AuthnQueryDescriptorType createAuthnQueryDescriptorType()
@@ -144,7 +145,7 @@ public com.sun.identity.saml2.jaxb.metadataextquery.AuthnQueryDescriptorType cre
     /**
      * Create an instance of AttributeQueryDescriptorElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataextquery.AttributeQueryDescriptorElement createAttributeQueryDescriptorElement()
@@ -156,7 +157,7 @@ public com.sun.identity.saml2.jaxb.metadataextquery.AttributeQueryDescriptorElem
     /**
      * Create an instance of QueryDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataextquery.QueryDescriptorType createQueryDescriptorType()
@@ -168,7 +169,7 @@ public com.sun.identity.saml2.jaxb.metadataextquery.QueryDescriptorType createQu
     /**
      * Create an instance of AttributeQueryDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataextquery.AttributeQueryDescriptorType createAttributeQueryDescriptorType()
@@ -180,7 +181,7 @@ public com.sun.identity.saml2.jaxb.metadataextquery.AttributeQueryDescriptorType
     /**
      * Create an instance of AuthzDecisionQueryDescriptorType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataextquery.AuthzDecisionQueryDescriptorType createAuthzDecisionQueryDescriptorType()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/QueryDescriptorType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/QueryDescriptorType.java
index bacec7960c..627f774e3e 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/QueryDescriptorType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataextquery/QueryDescriptorType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for QueryDescriptorType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-saml-metadata-ext-query.xsd line 55)
- * 
                      
  * 
                      - * <complexType name="QueryDescriptorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QueryDescriptorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/DiscoveryResponseElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/DiscoveryResponseElement.java
index 6d64f85838..77302fe68c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/DiscoveryResponseElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/DiscoveryResponseElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DiscoveryResponse element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/sstc-saml-idp-discovery.xsd line 47)
- * 
                      
  * 
                      - * <element name="DiscoveryResponse" type="{urn:oasis:names:tc:SAML:2.0:metadata}IndexedEndpointType"/>
+ * <element name="DiscoveryResponse" type="{urn:oasis:names:tc:SAML:2.0:metadata}IndexedEndpointType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/ObjectFactory.java
index f5db6c6c8e..27336aa33c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/metadataidpdiscovery/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -52,7 +53,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -71,7 +72,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -90,7 +91,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -102,7 +103,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of DiscoveryResponseElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.metadataidpdiscovery.DiscoveryResponseElement createDiscoveryResponseElement()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/AnyType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/AnyType.java
index 7e2e2ba861..5a7587717c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/AnyType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/AnyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anyType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at  line unknown)
- * 
                      
  * 
                      - * <complexType name="anyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="anyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/ObjectFactory.java
index 98be6ea073..5a0edc17f2 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/schema/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -51,7 +52,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -70,7 +71,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -89,7 +90,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -101,7 +102,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of AnyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.schema.AnyType createAnyType()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodElement.java
index 55993253be..794d8b1b02 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AgreementMethod element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 114)
- * 
                      
  * 
                      - * <element name="AgreementMethod" type="{http://www.w3.org/2001/04/xmlenc#}AgreementMethodType"/>
+ * <element name="AgreementMethod" type="{http://www.w3.org/2001/04/xmlenc#}AgreementMethodType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodType.java
index a42a626ad8..9526b20701 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/AgreementMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for AgreementMethodType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 115)
- * 
                      
  * 
                      - * <complexType name="AgreementMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *         <any/>
- *         <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
- *         <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AgreementMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *         <any/>
+ *         <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
+ *         <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
@@ -82,9 +82,8 @@ public interface AgreementMethodType {
     /**
      * Java content class for KA-Nonce element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 117)
-     * 
                      
      * 
                      -     * <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="KA-Nonce" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                      
      * 
      */
@@ -117,9 +116,8 @@ public interface KANonce
     /**
      * Java content class for OriginatorKeyInfo element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 120)
-     * 
                      
      * 
                      -     * <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+     * <element name="OriginatorKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
      * 
                      
      * 
      */
@@ -134,9 +132,8 @@ public interface OriginatorKeyInfo
     /**
      * Java content class for RecipientKeyInfo element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 121)
-     * 
                      
      * 
                      -     * <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+     * <element name="RecipientKeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
      * 
                      
      * 
      */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataElement.java
index 073f47f85c..4624237091 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CipherData element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 67)
- * 
                      
  * 
                      - * <element name="CipherData" type="{http://www.w3.org/2001/04/xmlenc#}CipherDataType"/>
+ * <element name="CipherData" type="{http://www.w3.org/2001/04/xmlenc#}CipherDataType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataType.java
index 082990afb4..53c32a10e4 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for CipherDataType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 68)
- * 
                      
  * 
                      - * <complexType name="CipherDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="CipherValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherReference"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CipherDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="CipherValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherReference"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceElement.java
index 51443d3bed..f89bc8d772 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CipherReference element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 75)
- * 
                      
  * 
                      - * <element name="CipherReference" type="{http://www.w3.org/2001/04/xmlenc#}CipherReferenceType"/>
+ * <element name="CipherReference" type="{http://www.w3.org/2001/04/xmlenc#}CipherReferenceType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceType.java
index 88b4274159..ea73859f54 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/CipherReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for CipherReferenceType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 76)
- * 
                      
  * 
                      - * <complexType name="CipherReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="Transforms" type="{http://www.w3.org/2001/04/xmlenc#}TransformsType" minOccurs="0"/>
- *       </choice>
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CipherReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="Transforms" type="{http://www.w3.org/2001/04/xmlenc#}TransformsType" minOccurs="0"/>
+ *       </choice>
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataElement.java
index 0fb484c84a..7829bfae13 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedData element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 90)
- * 
                      
  * 
                      - * <element name="EncryptedData" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedDataType"/>
+ * <element name="EncryptedData" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedDataType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataType.java
index 066becebf1..50239ec1d9 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for EncryptedDataType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 91)
- * 
                      
  * 
                      - * <complexType name="EncryptedDataType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedDataType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyElement.java
index bf29f67df0..fa1acf7fb8 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptedKey element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 100)
- * 
                      
  * 
                      - * <element name="EncryptedKey" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedKeyType"/>
+ * <element name="EncryptedKey" type="{http://www.w3.org/2001/04/xmlenc#}EncryptedKeyType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyType.java
index 45d67b272c..132dcf0a80 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedKeyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for EncryptedKeyType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 101)
- * 
                      
  * 
                      - * <complexType name="EncryptedKeyType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}ReferenceList" minOccurs="0"/>
- *         <element name="CarriedKeyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedKeyType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmlenc#}EncryptedType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}ReferenceList" minOccurs="0"/>
+ *         <element name="CarriedKeyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedType.java
index ba72e99b6f..4e4c13f965 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for EncryptedType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 40)
- * 
                      
  * 
                      - * <complexType name="EncryptedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncryptionMethod" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionMethodType" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherData"/>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperties" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncryptionMethod" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionMethodType" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}CipherData"/>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperties" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionMethodType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionMethodType.java
index 333ce48a88..8e7577573c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionMethodType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for EncryptionMethodType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 54)
- * 
                      
  * 
                      - * <complexType name="EncryptionMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType" minOccurs="0"/>
- *         <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptionMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType" minOccurs="0"/>
+ *         <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
@@ -80,9 +80,8 @@ public interface EncryptionMethodType {
     /**
      * Java content class for KeySize element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 56)
-     * 
                      
      * 
                      -     * <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType"/>
+     * <element name="KeySize" type="{http://www.w3.org/2001/04/xmlenc#}KeySizeType"/>
      * 
                      
      * 
      */
@@ -115,9 +114,8 @@ public interface KeySize
     /**
      * Java content class for OAEPparams element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 57)
-     * 
                      
      * 
                      -     * <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="OAEPparams" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                      
      * 
      */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesElement.java
index 9d3eccaa82..4eceb4dc5b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptionProperties element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 145)
- * 
                      
  * 
                      - * <element name="EncryptionProperties" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertiesType"/>
+ * <element name="EncryptionProperties" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertiesType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesType.java
index 0da728853f..7824a82de5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertiesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for EncryptionPropertiesType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 146)
- * 
                      
  * 
                      - * <complexType name="EncryptionPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptionPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2001/04/xmlenc#}EncryptionProperty" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyElement.java
index 7941cf57fe..ad545636af 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EncryptionProperty element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 153)
- * 
                      
  * 
                      - * <element name="EncryptionProperty" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertyType"/>
+ * <element name="EncryptionProperty" type="{http://www.w3.org/2001/04/xmlenc#}EncryptionPropertyType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyType.java
index 9e0925fb8f..61046d8778 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/EncryptionPropertyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for EncryptionPropertyType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 154)
- * 
                      
  * 
                      - * <complexType name="EncryptionPropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Target" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptionPropertyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Target" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ObjectFactory.java
index bdb5effbab..10049720da 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -85,7 +86,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -104,7 +105,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -123,7 +124,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -135,7 +136,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of ReferenceListTypeKeyReference
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListType.KeyReference createReferenceListTypeKeyReference()
@@ -147,7 +148,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListType.KeyReference createR
     /**
      * Create an instance of CipherReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.CipherReferenceType createCipherReferenceType()
@@ -159,7 +160,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.CipherReferenceType createCipherRefere
     /**
      * Create an instance of CipherDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.CipherDataType createCipherDataType()
@@ -171,7 +172,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.CipherDataType createCipherDataType()
     /**
      * Create an instance of ReferenceListTypeDataReference
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListType.DataReference createReferenceListTypeDataReference()
@@ -183,7 +184,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListType.DataReference create
     /**
      * Create an instance of AgreementMethodTypeKANonce
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.KANonce createAgreementMethodTypeKANonce()
@@ -195,7 +196,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.KANonce createAgre
     /**
      * Create an instance of AgreementMethodTypeKANonce
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.KANonce createAgreementMethodTypeKANonce(byte[] value)
@@ -207,7 +208,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.KANonce createAgre
     /**
      * Create an instance of CipherDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.CipherDataElement createCipherDataElement()
@@ -219,7 +220,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.CipherDataElement createCipherDataElem
     /**
      * Create an instance of EncryptedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptedType createEncryptedType()
@@ -231,7 +232,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptedType createEncryptedType()
     /**
      * Create an instance of EncryptionMethodTypeKeySize
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.KeySize createEncryptionMethodTypeKeySize()
@@ -243,7 +244,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.KeySize createEnc
     /**
      * Create an instance of EncryptionMethodTypeKeySize
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.KeySize createEncryptionMethodTypeKeySize(java.math.BigInteger value)
@@ -255,7 +256,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.KeySize createEnc
     /**
      * Create an instance of ReferenceListType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListType createReferenceListType()
@@ -267,7 +268,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListType createReferenceListT
     /**
      * Create an instance of ReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.ReferenceType createReferenceType()
@@ -279,7 +280,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.ReferenceType createReferenceType()
     /**
      * Create an instance of EncryptionPropertiesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertiesElement createEncryptionPropertiesElement()
@@ -291,7 +292,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertiesElement createEncr
     /**
      * Create an instance of EncryptionMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType createEncryptionMethodType()
@@ -303,7 +304,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType createEncryptionM
     /**
      * Create an instance of EncryptedKeyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptedKeyElement createEncryptedKeyElement()
@@ -315,7 +316,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptedKeyElement createEncryptedKey
     /**
      * Create an instance of CipherReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.CipherReferenceElement createCipherReferenceElement()
@@ -327,7 +328,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.CipherReferenceElement createCipherRef
     /**
      * Create an instance of EncryptedKeyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptedKeyType createEncryptedKeyType()
@@ -339,7 +340,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptedKeyType createEncryptedKeyTyp
     /**
      * Create an instance of TransformsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.TransformsType createTransformsType()
@@ -351,7 +352,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.TransformsType createTransformsType()
     /**
      * Create an instance of EncryptedDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptedDataType createEncryptedDataType()
@@ -363,7 +364,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptedDataType createEncryptedDataT
     /**
      * Create an instance of ReferenceListElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListElement createReferenceListElement()
@@ -375,7 +376,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.ReferenceListElement createReferenceLi
     /**
      * Create an instance of EncryptionMethodTypeOAEPparams
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.OAEPparams createEncryptionMethodTypeOAEPparams()
@@ -387,7 +388,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.OAEPparams create
     /**
      * Create an instance of EncryptionMethodTypeOAEPparams
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.OAEPparams createEncryptionMethodTypeOAEPparams(byte[] value)
@@ -399,7 +400,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionMethodType.OAEPparams create
     /**
      * Create an instance of EncryptionPropertyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertyType createEncryptionPropertyType()
@@ -411,7 +412,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertyType createEncryptio
     /**
      * Create an instance of EncryptedDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptedDataElement createEncryptedDataElement()
@@ -423,7 +424,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptedDataElement createEncryptedDa
     /**
      * Create an instance of EncryptionPropertiesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertiesType createEncryptionPropertiesType()
@@ -435,7 +436,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertiesType createEncrypt
     /**
      * Create an instance of EncryptionPropertyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertyElement createEncryptionPropertyElement()
@@ -447,7 +448,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.EncryptionPropertyElement createEncryp
     /**
      * Create an instance of AgreementMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodElement createAgreementMethodElement()
@@ -459,7 +460,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodElement createAgreement
     /**
      * Create an instance of AgreementMethodTypeRecipientKeyInfo
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.RecipientKeyInfo createAgreementMethodTypeRecipientKeyInfo()
@@ -471,7 +472,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.RecipientKeyInfo c
     /**
      * Create an instance of AgreementMethodTypeOriginatorKeyInfo
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.OriginatorKeyInfo createAgreementMethodTypeOriginatorKeyInfo()
@@ -483,7 +484,7 @@ public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType.OriginatorKeyInfo
     /**
      * Create an instance of AgreementMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlenc.AgreementMethodType createAgreementMethodType()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListElement.java
index 7c7621c3a0..b2c4ddeb08 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ReferenceList element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 128)
- * 
                      
  * 
                      - * <element name="ReferenceList">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <choice maxOccurs="unbounded">
- *           <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *           <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *         </choice>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="ReferenceList">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <choice maxOccurs="unbounded">
+ *           <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *           <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *         </choice>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListType.java
index 083e442166..1834002f60 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceListType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for anonymous complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 129)
- * 
                      
  * 
                      - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *         <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *         <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
@@ -58,9 +58,8 @@ public interface ReferenceListType {
     /**
      * Java content class for DataReference element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 131)
-     * 
                      
      * 
                      -     * <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+     * <element name="DataReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
      * 
                      
      * 
      */
@@ -75,9 +74,8 @@ public interface DataReference
     /**
      * Java content class for KeyReference element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 132)
-     * 
                      
      * 
                      -     * <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
+     * <element name="KeyReference" type="{http://www.w3.org/2001/04/xmlenc#}ReferenceType"/>
      * 
                      
      * 
      */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceType.java
index 3ec6cfb127..4e9277d1fa 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/ReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ReferenceType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 137)
- * 
                      
  * 
                      - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/TransformsType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/TransformsType.java
index 976ee9d4db..2926e2c08e 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/TransformsType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlenc/TransformsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for TransformsType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xenc-schema.xsd line 83)
- * 
                      
  * 
                      - * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodElement.java
index bd19725976..5ec20b4438 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CanonicalizationMethod element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 77)
- * 
                      
  * 
                      - * <element name="CanonicalizationMethod" type="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethodType"/>
+ * <element name="CanonicalizationMethod" type="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethodType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodType.java
index dc8d9a731b..7cbce6a24d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/CanonicalizationMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for CanonicalizationMethodType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 78)
- * 
                      
  * 
                      - * <complexType name="CanonicalizationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CanonicalizationMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueElement.java
index b039c76102..45ce3572b8 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DSAKeyValue element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 291)
- * 
                      
  * 
                      - * <element name="DSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValueType"/>
+ * <element name="DSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValueType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueType.java
index e6c9e75ea5..62551d1a8a 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DSAKeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for DSAKeyValueType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 292)
- * 
                      
  * 
                      - * <complexType name="DSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <sequence minOccurs="0">
- *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <sequence minOccurs="0">
- *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <sequence minOccurs="0">
+ *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <sequence minOccurs="0">
+ *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodElement.java
index 528976ace3..8d74421258 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DigestMethod element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 129)
- * 
                      
  * 
                      - * <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
+ * <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodType.java
index cfe3772484..43738ecd0d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for DigestMethodType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 130)
- * 
                      
  * 
                      - * <complexType name="DigestMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestValueElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestValueElement.java
index 69102fd648..954c4a98f9 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestValueElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/DigestValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DigestValue element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 137)
- * 
                      
  * 
                      - * <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
+ * <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoElement.java
index 7ca87c59f0..2447c38cb6 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyInfo element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 146)
- * 
                      
  * 
                      - * <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ * <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoType.java
index 10ad12fc4d..dd80509787 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for KeyInfoType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 147)
- * 
                      
  * 
                      - * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyNameElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyNameElement.java
index 9e8d57c5c2..4378b1349f 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyNameElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyName element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 162)
- * 
                      
  * 
                      - * <element name="KeyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="KeyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueElement.java
index 35647a225c..1f1f31fb02 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyValue element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 165)
- * 
                      
  * 
                      - * <element name="KeyValue" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType"/>
+ * <element name="KeyValue" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueType.java
index 9917767e8a..99df2a36c6 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/KeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for KeyValueType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 166)
- * 
                      
  * 
                      - * <complexType name="KeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         <any/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
+ *         <any/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestElement.java
index 898ffd8233..fd27d2b388 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Manifest element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 255)
- * 
                      
  * 
                      - * <element name="Manifest" type="{http://www.w3.org/2000/09/xmldsig#}ManifestType"/>
+ * <element name="Manifest" type="{http://www.w3.org/2000/09/xmldsig#}ManifestType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestType.java
index f1a058c9f8..58b737aae5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ManifestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ManifestType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 256)
- * 
                      
  * 
                      - * <complexType name="ManifestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/MgmtDataElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/MgmtDataElement.java
index d5db717ce3..74ea5ff0e5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/MgmtDataElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/MgmtDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MgmtData element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 163)
- * 
                      
  * 
                      - * <element name="MgmtData" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="MgmtData" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectElement.java
index ab8808dfa5..705d268c19 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Object element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 245)
- * 
                      
  * 
                      - * <element name="Object" type="{http://www.w3.org/2000/09/xmldsig#}ObjectType"/>
+ * <element name="Object" type="{http://www.w3.org/2000/09/xmldsig#}ObjectType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectFactory.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectFactory.java
index d8e95fd8ef..5e6488331c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectFactory.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -128,7 +129,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -147,7 +148,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -166,7 +167,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -178,7 +179,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of SPKIDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataElement createSPKIDataElement()
@@ -190,7 +191,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataElement createSPKIDataElement(
     /**
      * Create an instance of ReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.ReferenceType createReferenceType()
@@ -202,7 +203,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.ReferenceType createReferenceType()
     /**
      * Create an instance of ManifestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.ManifestElement createManifestElement()
@@ -214,7 +215,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.ManifestElement createManifestElement(
     /**
      * Create an instance of X509DataTypeX509IssuerSerial
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509IssuerSerial createX509DataTypeX509IssuerSerial()
@@ -226,7 +227,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509IssuerSerial createX5
     /**
      * Create an instance of CanonicalizationMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.CanonicalizationMethodElement createCanonicalizationMethodElement()
@@ -238,7 +239,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.CanonicalizationMethodElement createCa
     /**
      * Create an instance of SignedInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignedInfoType createSignedInfoType()
@@ -250,7 +251,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignedInfoType createSignedInfoType()
     /**
      * Create an instance of DigestMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.DigestMethodType createDigestMethodType()
@@ -262,7 +263,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.DigestMethodType createDigestMethodTyp
     /**
      * Create an instance of SignatureMethodTypeHMACOutputLength
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodType.HMACOutputLength createSignatureMethodTypeHMACOutputLength()
@@ -274,7 +275,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodType.HMACOutputLength c
     /**
      * Create an instance of SignatureMethodTypeHMACOutputLength
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodType.HMACOutputLength createSignatureMethodTypeHMACOutputLength(java.math.BigInteger value)
@@ -286,7 +287,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodType.HMACOutputLength c
     /**
      * Create an instance of X509DataTypeX509SubjectName
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SubjectName createX509DataTypeX509SubjectName()
@@ -298,7 +299,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SubjectName createX50
     /**
      * Create an instance of X509DataTypeX509SubjectName
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SubjectName createX509DataTypeX509SubjectName(java.lang.String value)
@@ -310,7 +311,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SubjectName createX50
     /**
      * Create an instance of KeyNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.KeyNameElement createKeyNameElement()
@@ -322,7 +323,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.KeyNameElement createKeyNameElement()
     /**
      * Create an instance of KeyNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.KeyNameElement createKeyNameElement(java.lang.String value)
@@ -334,7 +335,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.KeyNameElement createKeyNameElement(ja
     /**
      * Create an instance of KeyInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.KeyInfoElement createKeyInfoElement()
@@ -346,7 +347,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.KeyInfoElement createKeyInfoElement()
     /**
      * Create an instance of RetrievalMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.RetrievalMethodElement createRetrievalMethodElement()
@@ -358,7 +359,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.RetrievalMethodElement createRetrieval
     /**
      * Create an instance of SignaturePropertyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertyElement createSignaturePropertyElement()
@@ -370,7 +371,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertyElement createSignatu
     /**
      * Create an instance of X509DataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataElement createX509DataElement()
@@ -382,7 +383,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataElement createX509DataElement(
     /**
      * Create an instance of SignedInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignedInfoElement createSignedInfoElement()
@@ -394,7 +395,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignedInfoElement createSignedInfoElem
     /**
      * Create an instance of MgmtDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.MgmtDataElement createMgmtDataElement()
@@ -406,7 +407,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.MgmtDataElement createMgmtDataElement(
     /**
      * Create an instance of MgmtDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.MgmtDataElement createMgmtDataElement(java.lang.String value)
@@ -418,7 +419,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.MgmtDataElement createMgmtDataElement(
     /**
      * Create an instance of PGPDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.PGPDataType createPGPDataType()
@@ -430,7 +431,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.PGPDataType createPGPDataType()
     /**
      * Create an instance of TransformTypeXPath
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.TransformType.XPath createTransformTypeXPath()
@@ -442,7 +443,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.TransformType.XPath createTransformTyp
     /**
      * Create an instance of TransformTypeXPath
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.TransformType.XPath createTransformTypeXPath(java.lang.String value)
@@ -454,7 +455,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.TransformType.XPath createTransformTyp
     /**
      * Create an instance of X509DataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType createX509DataType()
@@ -466,7 +467,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType createX509DataType()
     /**
      * Create an instance of X509DataTypeX509CRL
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509CRL createX509DataTypeX509CRL()
@@ -478,7 +479,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509CRL createX509DataTyp
     /**
      * Create an instance of X509DataTypeX509CRL
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509CRL createX509DataTypeX509CRL(byte[] value)
@@ -490,7 +491,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509CRL createX509DataTyp
     /**
      * Create an instance of X509IssuerSerialType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509IssuerSerialType createX509IssuerSerialType()
@@ -502,7 +503,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509IssuerSerialType createX509IssuerS
     /**
      * Create an instance of KeyInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.KeyInfoType createKeyInfoType()
@@ -514,7 +515,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.KeyInfoType createKeyInfoType()
     /**
      * Create an instance of SignaturePropertyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertyType createSignaturePropertyType()
@@ -526,7 +527,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertyType createSignatureP
     /**
      * Create an instance of TransformType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.TransformType createTransformType()
@@ -538,7 +539,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.TransformType createTransformType()
     /**
      * Create an instance of SignatureMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodType createSignatureMethodType()
@@ -550,7 +551,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodType createSignatureMet
     /**
      * Create an instance of SignatureElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureElement createSignatureElement()
@@ -562,7 +563,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureElement createSignatureElemen
     /**
      * Create an instance of KeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.KeyValueType createKeyValueType()
@@ -574,7 +575,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.KeyValueType createKeyValueType()
     /**
      * Create an instance of PGPDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.PGPDataElement createPGPDataElement()
@@ -586,7 +587,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.PGPDataElement createPGPDataElement()
     /**
      * Create an instance of DigestValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.DigestValueElement createDigestValueElement()
@@ -598,7 +599,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.DigestValueElement createDigestValueEl
     /**
      * Create an instance of DigestValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.DigestValueElement createDigestValueElement(byte[] value)
@@ -610,7 +611,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.DigestValueElement createDigestValueEl
     /**
      * Create an instance of RetrievalMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.RetrievalMethodType createRetrievalMethodType()
@@ -622,7 +623,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.RetrievalMethodType createRetrievalMet
     /**
      * Create an instance of ObjectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.ObjectElement createObjectElement()
@@ -634,7 +635,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.ObjectElement createObjectElement()
     /**
      * Create an instance of ObjectType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.ObjectType createObjectType()
@@ -646,7 +647,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.ObjectType createObjectType()
     /**
      * Create an instance of X509DataTypeX509SKI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SKI createX509DataTypeX509SKI()
@@ -658,7 +659,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SKI createX509DataTyp
     /**
      * Create an instance of X509DataTypeX509SKI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SKI createX509DataTypeX509SKI(byte[] value)
@@ -670,7 +671,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509SKI createX509DataTyp
     /**
      * Create an instance of DigestMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.DigestMethodElement createDigestMethodElement()
@@ -682,7 +683,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.DigestMethodElement createDigestMethod
     /**
      * Create an instance of TransformsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.TransformsType createTransformsType()
@@ -694,7 +695,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.TransformsType createTransformsType()
     /**
      * Create an instance of RSAKeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.RSAKeyValueType createRSAKeyValueType()
@@ -706,7 +707,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.RSAKeyValueType createRSAKeyValueType(
     /**
      * Create an instance of SPKIDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataType createSPKIDataType()
@@ -718,7 +719,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataType createSPKIDataType()
     /**
      * Create an instance of SPKIDataTypeSPKISexp
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTypeSPKISexp()
@@ -730,7 +731,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTy
     /**
      * Create an instance of SPKIDataTypeSPKISexp
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTypeSPKISexp(byte[] value)
@@ -742,7 +743,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTy
     /**
      * Create an instance of SignatureMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodElement createSignatureMethodElement()
@@ -754,7 +755,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureMethodElement createSignature
     /**
      * Create an instance of X509DataTypeX509Certificate
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509Certificate createX509DataTypeX509Certificate()
@@ -766,7 +767,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509Certificate createX50
     /**
      * Create an instance of X509DataTypeX509Certificate
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509Certificate createX509DataTypeX509Certificate(byte[] value)
@@ -778,7 +779,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.X509DataType.X509Certificate createX50
     /**
      * Create an instance of TransformElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.TransformElement createTransformElement()
@@ -790,7 +791,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.TransformElement createTransformElemen
     /**
      * Create an instance of ManifestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.ManifestType createManifestType()
@@ -802,7 +803,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.ManifestType createManifestType()
     /**
      * Create an instance of SignaturePropertiesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertiesType createSignaturePropertiesType()
@@ -814,7 +815,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertiesType createSignatur
     /**
      * Create an instance of RSAKeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.RSAKeyValueElement createRSAKeyValueElement()
@@ -826,7 +827,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.RSAKeyValueElement createRSAKeyValueEl
     /**
      * Create an instance of SignaturePropertiesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertiesElement createSignaturePropertiesElement()
@@ -838,7 +839,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignaturePropertiesElement createSigna
     /**
      * Create an instance of SignatureType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureType createSignatureType()
@@ -850,7 +851,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureType createSignatureType()
     /**
      * Create an instance of KeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.KeyValueElement createKeyValueElement()
@@ -862,7 +863,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.KeyValueElement createKeyValueElement(
     /**
      * Create an instance of ReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.ReferenceElement createReferenceElement()
@@ -874,7 +875,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.ReferenceElement createReferenceElemen
     /**
      * Create an instance of SignatureValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureValueElement createSignatureValueElement()
@@ -886,7 +887,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureValueElement createSignatureV
     /**
      * Create an instance of SignatureValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.SignatureValueType createSignatureValueType()
@@ -898,7 +899,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.SignatureValueType createSignatureValu
     /**
      * Create an instance of DSAKeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.DSAKeyValueType createDSAKeyValueType()
@@ -910,7 +911,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.DSAKeyValueType createDSAKeyValueType(
     /**
      * Create an instance of DSAKeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.DSAKeyValueElement createDSAKeyValueElement()
@@ -922,7 +923,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.DSAKeyValueElement createDSAKeyValueEl
     /**
      * Create an instance of TransformsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.TransformsElement createTransformsElement()
@@ -934,7 +935,7 @@ public com.sun.identity.saml2.jaxb.xmlsig.TransformsElement createTransformsElem
     /**
      * Create an instance of CanonicalizationMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.saml2.jaxb.xmlsig.CanonicalizationMethodType createCanonicalizationMethodType()
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectType.java
index 974260d159..45dec74e8a 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ObjectType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ObjectType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 246)
- * 
                      
  * 
                      - * <complexType name="ObjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </sequence>
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataElement.java
index 0448ec1250..bcf154d39c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PGPData element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 210)
- * 
                      
  * 
                      - * <element name="PGPData" type="{http://www.w3.org/2000/09/xmldsig#}PGPDataType"/>
+ * <element name="PGPData" type="{http://www.w3.org/2000/09/xmldsig#}PGPDataType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataType.java
index 98f30a8caf..9da89dd604 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/PGPDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for PGPDataType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 211)
- * 
                      
  * 
                      - * <complexType name="PGPDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *           <any/>
- *         </sequence>
- *         <sequence>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PGPDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *           <any/>
+ *         </sequence>
+ *         <sequence>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </sequence>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueElement.java
index 9431893374..4bfc7c5164 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RSAKeyValue element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 308)
- * 
                      
  * 
                      - * <element name="RSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValueType"/>
+ * <element name="RSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValueType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueType.java
index c9d848da53..4f2a5caff9 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RSAKeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for RSAKeyValueType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 309)
- * 
                      
  * 
                      - * <complexType name="RSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceElement.java
index a8941e3d33..27134e3dc2 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Reference element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 98)
- * 
                      
  * 
                      - * <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
+ * <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceType.java
index 18293f54ed..aac2129364 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/ReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for ReferenceType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 99)
- * 
                      
  * 
                      - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodElement.java
index c59836f35f..2c97c0acdd 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RetrievalMethod element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 174)
- * 
                      
  * 
                      - * <element name="RetrievalMethod" type="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethodType"/>
+ * <element name="RetrievalMethod" type="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethodType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodType.java
index 5c876322d9..56764aadfd 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/RetrievalMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for RetrievalMethodType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 175)
- * 
                      
  * 
                      - * <complexType name="RetrievalMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RetrievalMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataElement.java
index 3afdd5ad1b..e4bb51c32d 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPKIData element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 231)
- * 
                      
  * 
                      - * <element name="SPKIData" type="{http://www.w3.org/2000/09/xmldsig#}SPKIDataType"/>
+ * <element name="SPKIData" type="{http://www.w3.org/2000/09/xmldsig#}SPKIDataType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataType.java
index d17d540ad1..6ce3b015f9 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SPKIDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SPKIDataType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 232)
- * 
                      
  * 
                      - * <complexType name="SPKIDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPKIDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
@@ -58,9 +58,8 @@ public interface SPKIDataType {
     /**
      * Java content class for SPKISexp element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 234)
-     * 
                      
      * 
                      -     * <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                      
      * 
      */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureElement.java
index de64dd2134..48d486e49b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Signature element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 45)
- * 
                      
  * 
                      - * <element name="Signature" type="{http://www.w3.org/2000/09/xmldsig#}SignatureType"/>
+ * <element name="Signature" type="{http://www.w3.org/2000/09/xmldsig#}SignatureType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodElement.java
index b22edcc639..8913cf862b 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureMethod element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 86)
- * 
                      
  * 
                      - * <element name="SignatureMethod" type="{http://www.w3.org/2000/09/xmldsig#}SignatureMethodType"/>
+ * <element name="SignatureMethod" type="{http://www.w3.org/2000/09/xmldsig#}SignatureMethodType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodType.java
index 893030b77c..d162738d59 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SignatureMethodType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 87)
- * 
                      
  * 
                      - * <complexType name="SignatureMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
@@ -78,9 +78,8 @@ public interface SignatureMethodType {
     /**
      * Java content class for HMACOutputLength element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 89)
-     * 
                      
      * 
                      -     * <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"/>
+     * <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"/>
      * 
                      
      * 
      */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesElement.java
index 115f5584d5..20e83a4739 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureProperties element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 263)
- * 
                      
  * 
                      - * <element name="SignatureProperties" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertiesType"/>
+ * <element name="SignatureProperties" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertiesType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesType.java
index bc3abe2f64..8f2bf56aa5 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertiesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SignaturePropertiesType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 264)
- * 
                      
  * 
                      - * <complexType name="SignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyElement.java
index 43381405b6..96a5036701 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureProperty element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 271)
- * 
                      
  * 
                      - * <element name="SignatureProperty" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertyType"/>
+ * <element name="SignatureProperty" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertyType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyType.java
index f1be7465bf..35d1496496 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignaturePropertyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SignaturePropertyType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 272)
- * 
                      
  * 
                      - * <complexType name="SignaturePropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureType.java
index 17aac51aa9..630d56ac48 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for SignatureType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 46)
- * 
                      
  * 
                      - * <complexType name="SignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueElement.java
index 301142cf10..013f96a56c 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureValue element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 56)
- * 
                      
  * 
                      - * <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
+ * <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueType.java
index e8efa0e8c4..a667e15890 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignatureValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for SignatureValueType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 57)
- * 
                      
  * 
                      - * <complexType name="SignatureValueType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="SignatureValueType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoElement.java
index a5d4e059d8..cbd3377a16 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignedInfo element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 67)
- * 
                      
  * 
                      - * <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
+ * <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoType.java
index 0fb7a8caad..9b9ac8db58 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/SignedInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for SignedInfoType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 68)
- * 
                      
  * 
                      - * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformElement.java
index 0adbe0760f..f2a3465902 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Transform element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 117)
- * 
                      
  * 
                      - * <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType"/>
+ * <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformType.java
index 03f0306019..dd1ae16ff2 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for TransformType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 118)
- * 
                      
  * 
                      - * <complexType name="TransformType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </choice>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </choice>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
@@ -78,9 +78,8 @@ public interface TransformType {
     /**
      * Java content class for XPath element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 122)
-     * 
                      
      * 
                      -     * <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     * <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
      * 
                      
      * 
      */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsElement.java
index 29bf820ca6..7ba20b6942 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Transforms element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 110)
- * 
                      
  * 
                      - * <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
+ * <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsType.java
index 346c0e30f1..9a294b05f0 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/TransformsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for TransformsType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 111)
- * 
                      
  * 
                      - * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataElement.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataElement.java
index 0cafa383d7..1224d9557a 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataElement.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for X509Data element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 185)
- * 
                      
  * 
                      - * <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
+ * <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataType.java
index 9589e53909..cfa747a4d6 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509DataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for X509DataType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 186)
- * 
                      
  * 
                      - * <complexType name="X509DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <choice>
- *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509DataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <choice>
+ *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
@@ -68,9 +68,8 @@ public interface X509DataType {
     /**
      * Java content class for X509CRL element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 193)
-     * 
                      
      * 
                      -     * <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                      
      * 
      */
@@ -103,9 +102,8 @@ public interface X509CRL
     /**
      * Java content class for X509Certificate element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 192)
-     * 
                      
      * 
                      -     * <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                      
      * 
      */
@@ -138,9 +136,8 @@ public interface X509Certificate
     /**
      * Java content class for X509IssuerSerial element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 189)
-     * 
                      
      * 
                      -     * <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+     * <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
      * 
                      
      * 
      */
@@ -155,9 +152,8 @@ public interface X509IssuerSerial
     /**
      * Java content class for X509SKI element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 190)
-     * 
                      
      * 
                      -     * <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                      
      * 
      */
@@ -190,9 +186,8 @@ public interface X509SKI
     /**
      * Java content class for X509SubjectName element declaration.
      * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 191)
-     * 
                      
      * 
                      -     * <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     * <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
      * 
                      
      * 
      */
diff --git a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509IssuerSerialType.java b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509IssuerSerialType.java
index 471332155c..b6df40a102 100644
--- a/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509IssuerSerialType.java
+++ b/openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/xmlsig/X509IssuerSerialType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:07 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for X509IssuerSerialType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/saml2/xmldsig-core-schema.xsd line 199)
- * 
                      
  * 
                      - * <complexType name="X509IssuerSerialType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509IssuerSerialType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeElement.java
index 5d0fe914ac..af2557c9a9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Attribute element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 65)
- * 
                      
  * 
                      - * <element name="Attribute" type="{urn:sun:fm:wsfederation:1.0:federationconfig}AttributeType"/>
+ * <element name="Attribute" type="{urn:sun:fm:wsfederation:1.0:federationconfig}AttributeType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeType.java
index defa36153f..4b9ab514bf 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/AttributeType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,18 +15,17 @@
 /**
  * Java content class for AttributeType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 66)
- * 
                      
  * 
                      - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}Value" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}Value" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/BaseConfigType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/BaseConfigType.java
index ce0a33bf1b..068bd8502e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/BaseConfigType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/BaseConfigType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for BaseConfigType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 59)
- * 
                      
  * 
                      - * <complexType name="BaseConfigType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="metaAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BaseConfigType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="metaAlias" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigElement.java
index 0caf20728f..c4f48701fc 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FederationConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 41)
- * 
                      
  * 
                      - * <element name="FederationConfig" type="{urn:sun:fm:wsfederation:1.0:federationconfig}FederationConfigType"/>
+ * <element name="FederationConfig" type="{urn:sun:fm:wsfederation:1.0:federationconfig}FederationConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigType.java
index f2881259f9..969a3618ed 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/FederationConfigType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for FederationConfigType complex type.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 42)
- * 
                      
  * 
                      - * <complexType name="FederationConfigType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *         <choice>
- *           <choice maxOccurs="unbounded">
- *             <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}IDPSSOConfig"/>
- *             <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}SPSSOConfig"/>
- *           </choice>
- *         </choice>
- *       </sequence>
- *       <attribute name="FederationID" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="hosted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FederationConfigType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *         <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *         <choice>
+ *           <choice maxOccurs="unbounded">
+ *             <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}IDPSSOConfig"/>
+ *             <element ref="{urn:sun:fm:wsfederation:1.0:federationconfig}SPSSOConfig"/>
+ *           </choice>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="FederationID" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="hosted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/IDPSSOConfigElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/IDPSSOConfigElement.java
index 9b8b764669..ebc78c9d58 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/IDPSSOConfigElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/IDPSSOConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IDPSSOConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 57)
- * 
                      
  * 
                      - * <element name="IDPSSOConfig" type="{urn:sun:fm:wsfederation:1.0:federationconfig}BaseConfigType"/>
+ * <element name="IDPSSOConfig" type="{urn:sun:fm:wsfederation:1.0:federationconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ObjectFactory.java
index 039c0d3112..32c83d1836 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -63,7 +64,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -82,7 +83,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -101,7 +102,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -113,7 +114,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of AttributeType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.AttributeType createAttributeType()
@@ -125,7 +126,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.AttributeType createAttri
     /**
      * Create an instance of AttributeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.AttributeElement createAttributeElement()
@@ -137,7 +138,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.AttributeElement createAt
     /**
      * Create an instance of FederationConfigType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.FederationConfigType createFederationConfigType()
@@ -149,7 +150,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.FederationConfigType crea
     /**
      * Create an instance of SPSSOConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.SPSSOConfigElement createSPSSOConfigElement()
@@ -161,7 +162,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.SPSSOConfigElement create
     /**
      * Create an instance of IDPSSOConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.IDPSSOConfigElement createIDPSSOConfigElement()
@@ -173,7 +174,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.IDPSSOConfigElement creat
     /**
      * Create an instance of FederationConfigElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.FederationConfigElement createFederationConfigElement()
@@ -185,7 +186,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.FederationConfigElement c
     /**
      * Create an instance of ValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.ValueElement createValueElement()
@@ -197,7 +198,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.ValueElement createValueE
     /**
      * Create an instance of ValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.ValueElement createValueElement(java.lang.String value)
@@ -209,7 +210,7 @@ public com.sun.identity.wsfederation.jaxb.entityconfig.ValueElement createValueE
     /**
      * Create an instance of BaseConfigType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.entityconfig.BaseConfigType createBaseConfigType()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/SPSSOConfigElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/SPSSOConfigElement.java
index 5d39af2e8f..e01de1b0a6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/SPSSOConfigElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/SPSSOConfigElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPSSOConfig element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 58)
- * 
                      
  * 
                      - * <element name="SPSSOConfig" type="{urn:sun:fm:wsfederation:1.0:federationconfig}BaseConfigType"/>
+ * <element name="SPSSOConfig" type="{urn:sun:fm:wsfederation:1.0:federationconfig}BaseConfigType"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ValueElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ValueElement.java
index 56b19346fd..91d367d4d6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ValueElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/ValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Value element declaration.
  * 
                      The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/entity-config-schema.xsd line 72)
- * 
                      
  * 
                      - * <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                      
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java
index bd91b4038d..2cca74fa4d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/DefaultJAXBContextImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -89,7 +90,7 @@ public synchronized com.sun.msv.grammar.Grammar getGrammar() throws JAXBExceptio
      * java content-tree into XML data.
      *
      * @return a Marshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Marshaller object
      */
     public Marshaller createMarshaller() throws JAXBException {
@@ -101,7 +102,7 @@ public Marshaller createMarshaller() throws JAXBException {
      * data into a java content-tree.
      *
      * @return an Unmarshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Unmarshaller object
      */
     public Unmarshaller createUnmarshaller() throws JAXBException {
@@ -113,7 +114,7 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
      * java content-tree.
      *
      * @return an Unmarshaller object
-     * @throws JAXBException if an error was encountered while creating the
+     * @throws javax.xml.bind.JAXBException if an error was encountered while creating the
      *                      Validator object
      */
     public Validator createValidator() throws JAXBException {
@@ -127,7 +128,7 @@ public Validator createValidator() throws JAXBException {
      *
      * @param javaContentInterface the Class object 
      * @return an instance of the Java content interface
-     * @exception JAXBException
+     * @exception JAXBException if an error occurs while creating the instance
      */
     public Object newInstance( Class javaContentInterface ) 
         throws JAXBException {
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java
index 8b958e14fc..bbba5dd46c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoFacade.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -260,7 +261,7 @@ public com.sun.msv.grammar.Expression getTopLevel() {
 
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)
+     * @see GrammarInfo#castToXMLSerializable(java.lang.Object)
      */
     public XMLSerializable castToXMLSerializable(Object o) {
         XMLSerializable result = null;
@@ -274,7 +275,7 @@ public XMLSerializable castToXMLSerializable(Object o) {
     }
 
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)
+     * @see GrammarInfo#castToValidatableObject(java.lang.Object)
      */
     public ValidatableObject castToValidatableObject(Object o) {
         ValidatableObject result = null;
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java
index 16cd3f489d..ee7e8f5b4e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/GrammarInfoImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -160,7 +161,7 @@ public final com.sun.msv.grammar.Grammar getGrammar() throws JAXBException {
     }
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToXMLSerializable(java.lang.Object)
+     * @see GrammarInfo#castToXMLSerializable(java.lang.Object)
      */
     public XMLSerializable castToXMLSerializable(Object o) {
         if( o instanceof XMLSerializable ) {
@@ -171,7 +172,7 @@ public XMLSerializable castToXMLSerializable(Object o) {
     }
     
     /**
-     * @see com.sun.tools.xjc.runtime.GrammarInfo#castToValidatableObject(java.lang.Object)
+     * @see GrammarInfo#castToValidatableObject(java.lang.Object)
      */
     public ValidatableObject castToValidatableObject(Object o) {
         if( o instanceof ValidatableObject ) {
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java
index c2f581450e..3bf0563dc5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/InterleaveDispatcher.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -20,12 +21,11 @@
 
 /**
  * Splits the unmarshalling events to bracnhes to support
- * XML Schema's <all> and RELAX NG's <interleave>
+ * XML Schema's <all> and RELAX NG's <interleave>
  * 
  * 
                      
  * This class will be extended by the generated code.
  * 
- * @optionalRuntime
  * 
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java
index 749dc9a19d..2e78be06f6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/MarshallerImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -48,7 +49,7 @@
 import com.sun.identity.shared.xml.XMLUtils;
 
 /**
- * Implementation of {@link Marshaller} interface for JAXB RI.
+ * Implementation of {@link javax.xml.bind.Marshaller} interface for JAXB RI.
  * 
  * @author Kohsuke Kawaguchi
  * @author Vivek Pandey
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java
index de42682ef7..2d087d3f0c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/NamespaceContext2.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -10,7 +11,7 @@
 import javax.xml.namespace.NamespaceContext;
 
 /**
- * Maintains namespace<->prefix bindings.
+ * Maintains namespace<->prefix bindings.
  * 
  * 
                      
  * This interface extends {@link NamespaceContext} and provides
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java
index f2321b6877..d48dd2190e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXMarshaller.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -263,7 +264,7 @@ public void endElement() throws SAXException {
      * c.endElement();
      * 
      * 
-     * will generate <foo>abc def<bar/>ghi</foo>.
+     * will generate <foo>abc def<bar/>ghi</foo>.
      */
     public void text( String text, String fieldName ) throws SAXException {
         // If the assertion fails, it must be a bug of xjc.
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java
index 6618a79701..8739f926a2 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandler.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -17,7 +18,7 @@
  * both the SAX events and error events.
  * 
  * 
                      
- * This interface refines {@link ContentHandler} as follows:
+ * This interface refines {@link org.xml.sax.ContentHandler} as follows:
  * 
                        
  *  
                      1. element names and attribute names must be {@link String#intern()}ed.
  *  
                      2. namespace prefix and uris must be {@link String#intern()}ed.
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java
index ec6bab4d44..374e2859ed 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -31,7 +32,7 @@
 import com.sun.xml.bind.util.AttributesImpl;
 
 /**
- * Implementation of {@link UnmarshallerHandler}.
+ * Implementation of {@link javax.xml.bind.UnmarshallerHandler}.
  * 
  * This object converts SAX events into unmarshaller events and
  * cooridnates the entire unmarshalling process.
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java
index ff038c5cb8..53265d74e3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/UnmarshallingContext.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -25,7 +26,7 @@
  *
  * 
                        
  * Errors detected by the AbstractUnmarshallingEventHandlerImpl-derived classes should
- * be either thrown as {@link UnrepotedException} or reported through
+ * be either thrown as {@code UnrepotedException} or reported through
  * the handleEvent method of this interface.
  *
  * @author
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/XMLSerializer.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/XMLSerializer.java
index 5a109d65b7..059475427d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/XMLSerializer.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/XMLSerializer.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 package com.sun.identity.wsfederation.jaxb.entityconfig.impl.runtime;
@@ -127,7 +128,7 @@ public interface XMLSerializer
      * c.endElement();
      * 
      * 
-     * will generate <foo>abc def<bar/>ghi</foo>.
+     * will generate <foo>abc def<bar/>ghi</foo>.
      */
     void text( String text, String fieldName ) throws SAXException;
     
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ActionElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ActionElement.java
index 253690e6bb..fea3bb57ec 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ActionElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ActionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Action element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 78)
- * 
                        
  * 
                        - * <element name="Action" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
+ * <element name="Action" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedQNameType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedQNameType.java
index 4ce4f4fa2e..600504032e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedQNameType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedQNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for AttributedQNameType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 122)
- * 
                        
  * 
                        - * <complexType name="AttributedQNameType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>QName">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedQNameType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>QName">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedURIType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedURIType.java
index bd65a9f113..edf50c0300 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedURIType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedURIType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for AttributedURIType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 80)
- * 
                        
  * 
                        - * <complexType name="AttributedURIType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedURIType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedUnsignedLongType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedUnsignedLongType.java
index 5b23662d6f..9d1da54844 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedUnsignedLongType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/AttributedUnsignedLongType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for AttributedUnsignedLongType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 113)
- * 
                        
  * 
                        - * <complexType name="AttributedUnsignedLongType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedLong">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedUnsignedLongType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedLong">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceElement.java
index 9004026fe0..a63be67100 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for EndpointReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 26)
- * 
                        
  * 
                        - * <element name="EndpointReference" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="EndpointReference" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceType.java
index 780b1aca53..1694e59503 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/EndpointReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for EndpointReferenceType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 27)
- * 
                        
  * 
                        - * <complexType name="EndpointReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Address" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
- *         <element ref="{http://www.w3.org/2005/08/addressing}ReferenceParameters" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2005/08/addressing}Metadata" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EndpointReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Address" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
+ *         <element ref="{http://www.w3.org/2005/08/addressing}ReferenceParameters" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2005/08/addressing}Metadata" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FaultToElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FaultToElement.java
index a45896b481..99e1e420b6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FaultToElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FaultToElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FaultTo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 76)
- * 
                        
  * 
                        - * <element name="FaultTo" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="FaultTo" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FromElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FromElement.java
index 18bb94d5c4..46593e116e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FromElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/FromElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for From element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 75)
- * 
                        
  * 
                        - * <element name="From" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="From" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MessageIDElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MessageIDElement.java
index 28f8194ee4..4fb22130b6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MessageIDElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MessageIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MessageID element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 53)
- * 
                        
  * 
                        - * <element name="MessageID" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
+ * <element name="MessageID" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataElement.java
index 840a87eb52..dc46214873 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Metadata element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 45)
- * 
                        
  * 
                        - * <element name="Metadata" type="{http://www.w3.org/2005/08/addressing}MetadataType"/>
+ * <element name="Metadata" type="{http://www.w3.org/2005/08/addressing}MetadataType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataType.java
index 7d3d705e74..1de18548cc 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/MetadataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for MetadataType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 46)
- * 
                        
  * 
                        - * <complexType name="MetadataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MetadataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ObjectFactory.java
index 7e875eccb9..6d60f27753 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -86,7 +87,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -105,7 +106,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -124,7 +125,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -136,7 +137,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of ProblemActionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemActionType createProblemActionType()
@@ -148,7 +149,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemActionType createProblem
     /**
      * Create an instance of MessageIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.MessageIDElement createMessageIDElement()
@@ -160,7 +161,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.MessageIDElement createMessageI
     /**
      * Create an instance of ReplyToElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ReplyToElement createReplyToElement()
@@ -172,7 +173,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ReplyToElement createReplyToEle
     /**
      * Create an instance of MetadataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.MetadataType createMetadataType()
@@ -184,7 +185,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.MetadataType createMetadataType
     /**
      * Create an instance of RelatesToElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.RelatesToElement createRelatesToElement()
@@ -196,7 +197,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.RelatesToElement createRelatesT
     /**
      * Create an instance of MetadataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.MetadataElement createMetadataElement()
@@ -208,7 +209,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.MetadataElement createMetadataE
     /**
      * Create an instance of ReferenceParametersType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ReferenceParametersType createReferenceParametersType()
@@ -220,7 +221,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ReferenceParametersType createR
     /**
      * Create an instance of FromElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.FromElement createFromElement()
@@ -232,7 +233,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.FromElement createFromElement()
     /**
      * Create an instance of ReferenceParametersElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ReferenceParametersElement createReferenceParametersElement()
@@ -244,7 +245,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ReferenceParametersElement crea
     /**
      * Create an instance of RetryAfterElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.RetryAfterElement createRetryAfterElement()
@@ -256,7 +257,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.RetryAfterElement createRetryAf
     /**
      * Create an instance of ProblemIRIElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemIRIElement createProblemIRIElement()
@@ -268,7 +269,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemIRIElement createProblem
     /**
      * Create an instance of EndpointReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.EndpointReferenceType createEndpointReferenceType()
@@ -280,7 +281,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.EndpointReferenceType createEnd
     /**
      * Create an instance of AttributedQNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.AttributedQNameType createAttributedQNameType()
@@ -292,7 +293,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.AttributedQNameType createAttri
     /**
      * Create an instance of RelatesToType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.RelatesToType createRelatesToType()
@@ -304,7 +305,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.RelatesToType createRelatesToTy
     /**
      * Create an instance of AttributedURIType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.AttributedURIType createAttributedURIType()
@@ -316,7 +317,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.AttributedURIType createAttribu
     /**
      * Create an instance of ProblemActionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemActionElement createProblemActionElement()
@@ -328,7 +329,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemActionElement createProb
     /**
      * Create an instance of FaultToElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.FaultToElement createFaultToElement()
@@ -340,7 +341,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.FaultToElement createFaultToEle
     /**
      * Create an instance of ToElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ToElement createToElement()
@@ -352,7 +353,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ToElement createToElement()
     /**
      * Create an instance of AttributedUnsignedLongType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.AttributedUnsignedLongType createAttributedUnsignedLongType()
@@ -364,7 +365,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.AttributedUnsignedLongType crea
     /**
      * Create an instance of ProblemHeaderQNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemHeaderQNameElement createProblemHeaderQNameElement()
@@ -376,7 +377,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.ProblemHeaderQNameElement creat
     /**
      * Create an instance of EndpointReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.EndpointReferenceElement createEndpointReferenceElement()
@@ -388,7 +389,7 @@ public com.sun.identity.wsfederation.jaxb.wsaddr.EndpointReferenceElement create
     /**
      * Create an instance of ActionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsaddr.ActionElement createActionElement()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionElement.java
index 58ea771dce..f386cfcdac 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProblemAction element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 132)
- * 
                        
  * 
                        - * <element name="ProblemAction" type="{http://www.w3.org/2005/08/addressing}ProblemActionType"/>
+ * <element name="ProblemAction" type="{http://www.w3.org/2005/08/addressing}ProblemActionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionType.java
index 454c4d33de..13099aac65 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemActionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ProblemActionType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 133)
- * 
                        
  * 
                        - * <complexType name="ProblemActionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2005/08/addressing}Action" minOccurs="0"/>
- *         <element name="SoapAction" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ProblemActionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2005/08/addressing}Action" minOccurs="0"/>
+ *         <element name="SoapAction" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemHeaderQNameElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemHeaderQNameElement.java
index fe9273ca49..5abab72032 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemHeaderQNameElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemHeaderQNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProblemHeaderQName element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 121)
- * 
                        
  * 
                        - * <element name="ProblemHeaderQName" type="{http://www.w3.org/2005/08/addressing}AttributedQNameType"/>
+ * <element name="ProblemHeaderQName" type="{http://www.w3.org/2005/08/addressing}AttributedQNameType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemIRIElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemIRIElement.java
index 40bc8ed3d2..c30fdb0f8e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemIRIElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ProblemIRIElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProblemIRI element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 130)
- * 
                        
  * 
                        - * <element name="ProblemIRI" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
+ * <element name="ProblemIRI" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersElement.java
index 9374fbd3e3..c7eba32611 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ReferenceParameters element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 37)
- * 
                        
  * 
                        - * <element name="ReferenceParameters" type="{http://www.w3.org/2005/08/addressing}ReferenceParametersType"/>
+ * <element name="ReferenceParameters" type="{http://www.w3.org/2005/08/addressing}ReferenceParametersType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersType.java
index 5e36f06d0c..b3a36528f8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReferenceParametersType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for ReferenceParametersType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 38)
- * 
                        
  * 
                        - * <complexType name="ReferenceParametersType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceParametersType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToElement.java
index c7418333fd..5d9eae1b35 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RelatesTo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 54)
- * 
                        
  * 
                        - * <element name="RelatesTo" type="{http://www.w3.org/2005/08/addressing}RelatesToType"/>
+ * <element name="RelatesTo" type="{http://www.w3.org/2005/08/addressing}RelatesToType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToType.java
index bd474d04e1..077e40e643 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RelatesToType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for RelatesToType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 55)
- * 
                        
  * 
                        - * <complexType name="RelatesToType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="RelationshipType" type="{http://www.w3.org/2005/08/addressing}RelationshipTypeOpenEnum" default="http://www.w3.org/2005/08/addressing/reply" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="RelatesToType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="RelationshipType" type="{http://www.w3.org/2005/08/addressing}RelationshipTypeOpenEnum" default="http://www.w3.org/2005/08/addressing/reply" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReplyToElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReplyToElement.java
index c74ede6b12..e5256e2117 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReplyToElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ReplyToElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ReplyTo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 74)
- * 
                        
  * 
                        - * <element name="ReplyTo" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="ReplyTo" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RetryAfterElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RetryAfterElement.java
index 8f935b4184..224ae64c56 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RetryAfterElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/RetryAfterElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RetryAfter element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 112)
- * 
                        
  * 
                        - * <element name="RetryAfter" type="{http://www.w3.org/2005/08/addressing}AttributedUnsignedLongType"/>
+ * <element name="RetryAfter" type="{http://www.w3.org/2005/08/addressing}AttributedUnsignedLongType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ToElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ToElement.java
index 2fcc21090a..2495b547e7 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ToElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsaddr/ToElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for To element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-addr.xsd line 77)
- * 
                        
  * 
                        - * <element name="To" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
+ * <element name="To" type="{http://www.w3.org/2005/08/addressing}AttributedURIType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AdditionalContextProcessedElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AdditionalContextProcessedElement.java
index 342c3001d4..91b7b7d9ac 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AdditionalContextProcessedElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AdditionalContextProcessedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AdditionalContextProcessed element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 396)
- * 
                        
  * 
                        - * <element name="AdditionalContextProcessed" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
+ * <element name="AdditionalContextProcessed" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AssertionType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AssertionType.java
index 87a604051a..d9d28f5ff8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AssertionType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AssertionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for AssertionType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 377)
- * 
                        
  * 
                        - * <complexType name="AssertionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AssertionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleString.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleString.java
index f2d1f71ad1..f53c323135 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleString.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for AttributeExtensibleString complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 354)
- * 
                        
  * 
                        - * <complexType name="AttributeExtensibleString">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributeExtensibleString">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleURI.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleURI.java
index 0ecaa3efb7..cebb89689e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleURI.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeExtensibleURI.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for AttributeExtensibleURI complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 124)
- * 
                        
  * 
                        - * <complexType name="AttributeExtensibleURI">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributeExtensibleURI">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeServiceEndpointElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeServiceEndpointElement.java
index 01b2ded2a1..b40015be11 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeServiceEndpointElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AttributeServiceEndpointElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AttributeServiceEndpoint element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 139)
- * 
                        
  * 
                        - * <element name="AttributeServiceEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="AttributeServiceEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AuthenticationTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AuthenticationTokenElement.java
index 901032eb5b..ac47e960fa 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AuthenticationTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AuthenticationTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AuthenticationToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 386)
- * 
                        
  * 
                        - * <element name="AuthenticationToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="AuthenticationToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AutomaticPseudonymsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AutomaticPseudonymsElement.java
index 8a5607bbd9..4709e28dc0 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AutomaticPseudonymsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/AutomaticPseudonymsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for AutomaticPseudonyms element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 203)
- * 
                        
  * 
                        - * <element name="AutomaticPseudonyms" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ * <element name="AutomaticPseudonyms" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClaimType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClaimType.java
index 308476b2ab..50f608fbd5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClaimType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClaimType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ClaimType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 174)
- * 
                        
  * 
                        - * <complexType name="ClaimType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DisplayName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}DisplayNameType" minOccurs="0"/>
- *         <element name="Description" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}DescriptionType" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="Uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ClaimType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DisplayName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}DisplayNameType" minOccurs="0"/>
+ *         <element name="Description" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}DescriptionType" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymElement.java
index 0e2857aa98..08ad5e5527 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ClientPseudonym element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 343)
- * 
                        
  * 
                        - * <element name="ClientPseudonym" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ClientPseudonymType"/>
+ * <element name="ClientPseudonym" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ClientPseudonymType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymType.java
index 9244bf469a..27154440f3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ClientPseudonymType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ClientPseudonymType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 344)
- * 
                        
  * 
                        - * <complexType name="ClientPseudonymType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="PPID" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleString" minOccurs="0"/>
- *         <element name="DisplayName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleString" minOccurs="0"/>
- *         <element name="EMail" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleString" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ClientPseudonymType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="PPID" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleString" minOccurs="0"/>
+ *         <element name="DisplayName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleString" minOccurs="0"/>
+ *         <element name="EMail" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleString" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DescriptionType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DescriptionType.java
index be1d870063..70af7386e5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DescriptionType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DescriptionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for DescriptionType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 194)
- * 
                        
  * 
                        - * <complexType name="DescriptionType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DescriptionType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DisplayNameType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DisplayNameType.java
index 7c6cf7d0c4..d1e9fd2cd8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DisplayNameType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/DisplayNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for DisplayNameType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 186)
- * 
                        
  * 
                        - * <complexType name="DisplayNameType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="DisplayNameType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationElement.java
index 10c7f43d28..47b8c4698d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Federation element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 84)
- * 
                        
  * 
                        - * <element name="Federation" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FederationType"/>
+ * <element name="Federation" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FederationType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationIDElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationIDElement.java
index 22ec2ee958..061faffdd9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationIDElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationIDElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FederationID element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 331)
- * 
                        
  * 
                        - * <element name="FederationID" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI"/>
+ * <element name="FederationID" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataElement.java
index 59ec9bb638..529b01a4b8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FederationMetadata element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 69)
- * 
                        
  * 
                        - * <element name="FederationMetadata" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FederationMetadataType"/>
+ * <element name="FederationMetadata" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FederationMetadataType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerElement.java
index ac20cf4c0c..3264092298 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FederationMetadataHandler element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 206)
- * 
                        
  * 
                        - * <element name="FederationMetadataHandler" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FederationMetadataHandlerType"/>
+ * <element name="FederationMetadataHandler" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FederationMetadataHandlerType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerType.java
index ed6e9223b3..3ddd170852 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataHandlerType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for FederationMetadataHandlerType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 207)
- * 
                        
  * 
                        - * <complexType name="FederationMetadataHandlerType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FederationMetadataHandlerType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataType.java
index 7b0046f31f..6092535024 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationMetadataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for FederationMetadataType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 71)
- * 
                        
  * 
                        - * <complexType name="FederationMetadataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FederationMetadataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationType.java
index 3ee56e4c34..f72ffbdd7a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FederationType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for FederationType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 86)
- * 
                        
  * 
                        - * <complexType name="FederationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="FederationID" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FederationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="FederationID" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsElement.java
index 1f739fbf0a..1912cbfe9d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for FilterPseudonyms element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 234)
- * 
                        
  * 
                        - * <element name="FilterPseudonyms" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FilterPseudonymsType"/>
+ * <element name="FilterPseudonyms" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}FilterPseudonymsType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsType.java
index 0a8a3c5395..92b8c357c5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FilterPseudonymsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for FilterPseudonymsType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 235)
- * 
                        
  * 
                        - * <complexType name="FilterPseudonymsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymBasis" minOccurs="0"/>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}RelativeTo" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FilterPseudonymsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymBasis" minOccurs="0"/>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}RelativeTo" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/Freshness.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/Freshness.java
index f56f076f31..df96173d5f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/Freshness.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/Freshness.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for Freshness complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 364)
- * 
                        
  * 
                        - * <complexType name="Freshness">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedInt">
- *       <attribute name="AllowCache" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="Freshness">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedInt">
+ *       <attribute name="AllowCache" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FreshnessElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FreshnessElement.java
index 17bf5ce436..38507c9e2c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FreshnessElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/FreshnessElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Freshness element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 363)
- * 
                        
  * 
                        - * <element name="Freshness" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}Freshness"/>
+ * <element name="Freshness" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}Freshness"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNameType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNameType.java
index 91fa4f24b0..4caf6defaf 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNameType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNameType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for IssuerNameType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 117)
- * 
                        
  * 
                        - * <complexType name="IssuerNameType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Uri" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IssuerNameType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="Uri" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedElement.java
index fd928b4cfc..184a700607 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IssuerNamesOffered element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 108)
- * 
                        
  * 
                        - * <element name="IssuerNamesOffered" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}IssuerNamesOfferedType"/>
+ * <element name="IssuerNamesOffered" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}IssuerNamesOfferedType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedType.java
index 817a195cad..1a912032dd 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuerNamesOfferedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for IssuerNamesOfferedType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 110)
- * 
                        
  * 
                        - * <complexType name="IssuerNamesOfferedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="IssuerName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}IssuerNameType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IssuerNamesOfferedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="IssuerName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}IssuerNameType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuesSpecificPolicyFaultElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuesSpecificPolicyFaultElement.java
index fc4c4348cc..1217e323c9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuesSpecificPolicyFaultElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/IssuesSpecificPolicyFaultElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for IssuesSpecificPolicyFault element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 395)
- * 
                        
  * 
                        - * <element name="IssuesSpecificPolicyFault" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
+ * <element name="IssuesSpecificPolicyFault" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ObjectFactory.java
index 9c1d5a16f6..b8ab491cf2 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -157,7 +158,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -176,7 +177,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -195,7 +196,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -207,7 +208,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of RealmElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RealmElement createRealmElement()
@@ -219,7 +220,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RealmElement createRealmE
     /**
      * Create an instance of RealmElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RealmElement createRealmElement(java.lang.String value)
@@ -231,7 +232,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RealmElement createRealmE
     /**
      * Create an instance of IssuerNamesOfferedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.IssuerNamesOfferedType createIssuerNamesOfferedType()
@@ -243,7 +244,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.IssuerNamesOfferedType cr
     /**
      * Create an instance of RequestProofTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequestProofTokenType createRequestProofTokenType()
@@ -255,7 +256,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequestProofTokenType cre
     /**
      * Create an instance of ProofTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ProofTokenElement createProofTokenElement()
@@ -267,7 +268,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ProofTokenElement createP
     /**
      * Create an instance of DisplayNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.DisplayNameType createDisplayNameType()
@@ -279,7 +280,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.DisplayNameType createDis
     /**
      * Create an instance of AssertionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AssertionType createAssertionType()
@@ -291,7 +292,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AssertionType createAsser
     /**
      * Create an instance of SignOutElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.SignOutElement createSignOutElement()
@@ -303,7 +304,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.SignOutElement createSign
     /**
      * Create an instance of UriNamedClaimTypesOfferedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.UriNamedClaimTypesOfferedType createUriNamedClaimTypesOfferedType()
@@ -315,7 +316,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.UriNamedClaimTypesOffered
     /**
      * Create an instance of TokenTypesOfferedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenTypesOfferedElement createTokenTypesOfferedElement()
@@ -327,7 +328,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenTypesOfferedElement
     /**
      * Create an instance of RequireSharedCookiesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequireSharedCookiesElement createRequireSharedCookiesElement()
@@ -339,7 +340,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequireSharedCookiesEleme
     /**
      * Create an instance of SingleSignOutSubscriptionEndpointElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.SingleSignOutSubscriptionEndpointElement createSingleSignOutSubscriptionEndpointElement()
@@ -351,7 +352,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.SingleSignOutSubscription
     /**
      * Create an instance of SingleSignOutNotificationEndpointElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.SingleSignOutNotificationEndpointElement createSingleSignOutNotificationEndpointElement()
@@ -363,7 +364,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.SingleSignOutNotification
     /**
      * Create an instance of FederationMetadataHandlerElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataHandlerElement createFederationMetadataHandlerElement()
@@ -375,7 +376,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataHandler
     /**
      * Create an instance of TokenTypesOfferedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenTypesOfferedType createTokenTypesOfferedType()
@@ -387,7 +388,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenTypesOfferedType cre
     /**
      * Create an instance of IssuerNamesOfferedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.IssuerNamesOfferedElement createIssuerNamesOfferedElement()
@@ -399,7 +400,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.IssuerNamesOfferedElement
     /**
      * Create an instance of PseudonymType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymType createPseudonymType()
@@ -411,7 +412,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymType createPseud
     /**
      * Create an instance of IssuesSpecificPolicyFaultElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.IssuesSpecificPolicyFaultElement createIssuesSpecificPolicyFaultElement()
@@ -423,7 +424,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.IssuesSpecificPolicyFault
     /**
      * Create an instance of AttributeExtensibleURI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AttributeExtensibleURI createAttributeExtensibleURI()
@@ -435,7 +436,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AttributeExtensibleURI cr
     /**
      * Create an instance of FreshnessElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FreshnessElement createFreshnessElement()
@@ -447,7 +448,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FreshnessElement createFr
     /**
      * Create an instance of RelativeToType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RelativeToType createRelativeToType()
@@ -459,7 +460,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RelativeToType createRela
     /**
      * Create an instance of AdditionalContextProcessedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AdditionalContextProcessedElement createAdditionalContextProcessedElement()
@@ -471,7 +472,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AdditionalContextProcesse
     /**
      * Create an instance of SecurityTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.SecurityTokenElement createSecurityTokenElement()
@@ -483,7 +484,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.SecurityTokenElement crea
     /**
      * Create an instance of IssuerNameType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.IssuerNameType createIssuerNameType()
@@ -495,7 +496,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.IssuerNameType createIssu
     /**
      * Create an instance of FilterPseudonymsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FilterPseudonymsType createFilterPseudonymsType()
@@ -507,7 +508,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FilterPseudonymsType crea
     /**
      * Create an instance of AutomaticPseudonymsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AutomaticPseudonymsElement createAutomaticPseudonymsElement()
@@ -519,7 +520,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AutomaticPseudonymsElemen
     /**
      * Create an instance of AutomaticPseudonymsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AutomaticPseudonymsElement createAutomaticPseudonymsElement(boolean value)
@@ -531,7 +532,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AutomaticPseudonymsElemen
     /**
      * Create an instance of WebBindingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.WebBindingElement createWebBindingElement()
@@ -543,7 +544,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.WebBindingElement createW
     /**
      * Create an instance of TokenKeyTransferKeyInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenKeyTransferKeyInfoElement createTokenKeyTransferKeyInfoElement()
@@ -555,7 +556,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenKeyTransferKeyInfoEl
     /**
      * Create an instance of ReferenceDigestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceDigestType createReferenceDigestType()
@@ -567,7 +568,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceDigestType creat
     /**
      * Create an instance of RequireBearerTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequireBearerTokensElement createRequireBearerTokensElement()
@@ -579,7 +580,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequireBearerTokensElemen
     /**
      * Create an instance of FederationMetadataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataType createFederationMetadataType()
@@ -591,7 +592,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataType cr
     /**
      * Create an instance of PsuedonymServiceEndpointElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.PsuedonymServiceEndpointElement createPsuedonymServiceEndpointElement()
@@ -603,7 +604,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.PsuedonymServiceEndpointE
     /**
      * Create an instance of ClientPseudonymElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ClientPseudonymElement createClientPseudonymElement()
@@ -615,7 +616,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ClientPseudonymElement cr
     /**
      * Create an instance of TokenIssuerNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenIssuerNameElement createTokenIssuerNameElement()
@@ -627,7 +628,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenIssuerNameElement cr
     /**
      * Create an instance of RequireSignedTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequireSignedTokensElement createRequireSignedTokensElement()
@@ -639,7 +640,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequireSignedTokensElemen
     /**
      * Create an instance of FederationIDElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FederationIDElement createFederationIDElement()
@@ -651,7 +652,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FederationIDElement creat
     /**
      * Create an instance of FederationMetadataHandlerType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataHandlerType createFederationMetadataHandlerType()
@@ -663,7 +664,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataHandler
     /**
      * Create an instance of PseudonymBasisType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymBasisType createPseudonymBasisType()
@@ -675,7 +676,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymBasisType create
     /**
      * Create an instance of TokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenType createTokenType()
@@ -687,7 +688,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenType createTokenType
     /**
      * Create an instance of ReferenceTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceTokenElement createReferenceTokenElement()
@@ -699,7 +700,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceTokenElement cre
     /**
      * Create an instance of RequiresGenericClaimDialectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequiresGenericClaimDialectElement createRequiresGenericClaimDialectElement()
@@ -711,7 +712,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequiresGenericClaimDiale
     /**
      * Create an instance of AttributeExtensibleString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AttributeExtensibleString createAttributeExtensibleString()
@@ -723,7 +724,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AttributeExtensibleString
     /**
      * Create an instance of TokenSigningKeyInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenSigningKeyInfoElement createTokenSigningKeyInfoElement()
@@ -735,7 +736,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenSigningKeyInfoElemen
     /**
      * Create an instance of Freshness
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.Freshness createFreshness()
@@ -747,7 +748,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.Freshness createFreshness
     /**
      * Create an instance of ClaimType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ClaimType createClaimType()
@@ -759,7 +760,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ClaimType createClaimType
     /**
      * Create an instance of SignOutType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.SignOutType createSignOutType()
@@ -771,7 +772,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.SignOutType createSignOut
     /**
      * Create an instance of SecurityTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.SecurityTokenType createSecurityTokenType()
@@ -783,7 +784,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.SecurityTokenType createS
     /**
      * Create an instance of FilterPseudonymsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FilterPseudonymsElement createFilterPseudonymsElement()
@@ -795,7 +796,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FilterPseudonymsElement c
     /**
      * Create an instance of PseudonymBasisElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymBasisElement createPseudonymBasisElement()
@@ -807,7 +808,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymBasisElement cre
     /**
      * Create an instance of AttributeServiceEndpointElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AttributeServiceEndpointElement createAttributeServiceEndpointElement()
@@ -819,7 +820,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AttributeServiceEndpointE
     /**
      * Create an instance of TokenKeyInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenKeyInfoType createTokenKeyInfoType()
@@ -831,7 +832,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenKeyInfoType createTo
     /**
      * Create an instance of DescriptionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.DescriptionType createDescriptionType()
@@ -843,7 +844,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.DescriptionType createDes
     /**
      * Create an instance of TokenIssuerEndpointElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.TokenIssuerEndpointElement createTokenIssuerEndpointElement()
@@ -855,7 +856,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.TokenIssuerEndpointElemen
     /**
      * Create an instance of UriNamedClaimTypesOfferedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.UriNamedClaimTypesOfferedElement createUriNamedClaimTypesOfferedElement()
@@ -867,7 +868,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.UriNamedClaimTypesOffered
     /**
      * Create an instance of RequestPseudonymType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequestPseudonymType createRequestPseudonymType()
@@ -879,7 +880,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequestPseudonymType crea
     /**
      * Create an instance of FederationType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FederationType createFederationType()
@@ -891,7 +892,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FederationType createFede
     /**
      * Create an instance of RequestPseudonymElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequestPseudonymElement createRequestPseudonymElement()
@@ -903,7 +904,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequestPseudonymElement c
     /**
      * Create an instance of ClientPseudonymType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ClientPseudonymType createClientPseudonymType()
@@ -915,7 +916,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ClientPseudonymType creat
     /**
      * Create an instance of RequireReferenceTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequireReferenceTokenElement createRequireReferenceTokenElement()
@@ -927,7 +928,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequireReferenceTokenElem
     /**
      * Create an instance of RequestProofTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RequestProofTokenElement createRequestProofTokenElement()
@@ -939,7 +940,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RequestProofTokenElement
     /**
      * Create an instance of AuthenticationTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.AuthenticationTokenElement createAuthenticationTokenElement()
@@ -951,7 +952,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.AuthenticationTokenElemen
     /**
      * Create an instance of FederationMetadataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement createFederationMetadataElement()
@@ -963,7 +964,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FederationMetadataElement
     /**
      * Create an instance of ReferenceToken11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceToken11Element createReferenceToken11Element()
@@ -975,7 +976,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceToken11Element c
     /**
      * Create an instance of ReferenceTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceTokenType createReferenceTokenType()
@@ -987,7 +988,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.ReferenceTokenType create
     /**
      * Create an instance of FederationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement createFederationElement()
@@ -999,7 +1000,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.FederationElement createF
     /**
      * Create an instance of PseudonymElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymElement createPseudonymElement()
@@ -1011,7 +1012,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.PseudonymElement createPs
     /**
      * Create an instance of RelativeToElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.RelativeToElement createRelativeToElement()
@@ -1023,7 +1024,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.RelativeToElement createR
     /**
      * Create an instance of SignOutBasisType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.SignOutBasisType createSignOutBasisType()
@@ -1035,7 +1036,7 @@ public com.sun.identity.wsfederation.jaxb.wsfederation.SignOutBasisType createSi
     /**
      * Create an instance of ProofTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsfederation.ProofTokenType createProofTokenType()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenElement.java
index 13072e487b..30843f22d7 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ProofToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 290)
- * 
                        
  * 
                        - * <element name="ProofToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ProofTokenType"/>
+ * <element name="ProofToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ProofTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenType.java
index fb4d288f98..83383b2537 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ProofTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for ProofTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 291)
- * 
                        
  * 
                        - * <complexType name="ProofTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ProofTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisElement.java
index 2c04c20187..37dce39594 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PseudonymBasis element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 244)
- * 
                        
  * 
                        - * <element name="PseudonymBasis" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymBasisType"/>
+ * <element name="PseudonymBasis" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymBasisType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisType.java
index d9a0d6acab..e8c7c967f8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymBasisType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for PseudonymBasisType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 245)
- * 
                        
  * 
                        - * <complexType name="PseudonymBasisType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PseudonymBasisType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymElement.java
index d2f2490316..0d101d3870 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Pseudonym element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 261)
- * 
                        
  * 
                        - * <element name="Pseudonym" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymType"/>
+ * <element name="Pseudonym" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymType.java
index b2b486cff5..b552896408 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PseudonymType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for PseudonymType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 263)
- * 
                        
  * 
                        - * <complexType name="PseudonymType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymBasis"/>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}RelativeTo"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PseudonymType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}PseudonymBasis"/>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}RelativeTo"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PsuedonymServiceEndpointElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PsuedonymServiceEndpointElement.java
index 8e2d632d75..cb8a332461 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PsuedonymServiceEndpointElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/PsuedonymServiceEndpointElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PsuedonymServiceEndpoint element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 136)
- * 
                        
  * 
                        - * <element name="PsuedonymServiceEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="PsuedonymServiceEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RealmElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RealmElement.java
index d1def0ec76..41e15efb6d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RealmElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RealmElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Realm element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 231)
- * 
                        
  * 
                        - * <element name="Realm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * <element name="Realm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceDigestType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceDigestType.java
index 3134f7c047..6adadbc0b6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceDigestType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceDigestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for ReferenceDigestType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 322)
- * 
                        
  * 
                        - * <complexType name="ReferenceDigestType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ReferenceDigestType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceToken11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceToken11Element.java
index 18915ba3ef..6fb08cd81c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceToken11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceToken11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ReferenceToken11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 375)
- * 
                        
  * 
                        - * <element name="ReferenceToken11" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
+ * <element name="ReferenceToken11" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenElement.java
index 3a7d3b9271..23f7ae823b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ReferenceToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 310)
- * 
                        
  * 
                        - * <element name="ReferenceToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ReferenceTokenType"/>
+ * <element name="ReferenceToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ReferenceTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenType.java
index 6d8f93234d..8e17026bf6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/ReferenceTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for ReferenceTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 311)
- * 
                        
  * 
                        - * <complexType name="ReferenceTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ReferenceEPR" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" maxOccurs="unbounded"/>
- *         <element name="ReferenceDigest" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ReferenceDigestType" minOccurs="0"/>
- *         <element name="ReferenceType" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI" minOccurs="0"/>
- *         <element name="SerialNo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ReferenceEPR" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" maxOccurs="unbounded"/>
+ *         <element name="ReferenceDigest" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ReferenceDigestType" minOccurs="0"/>
+ *         <element name="ReferenceType" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI" minOccurs="0"/>
+ *         <element name="SerialNo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToElement.java
index d73b65babf..829538bfc2 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RelativeTo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 252)
- * 
                        
  * 
                        - * <element name="RelativeTo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}RelativeToType"/>
+ * <element name="RelativeTo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}RelativeToType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToType.java
index 23d0ef61ce..09d73b05f9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RelativeToType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for RelativeToType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 253)
- * 
                        
  * 
                        - * <complexType name="RelativeToType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RelativeToType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenElement.java
index 86b951d645..0eca47c7ff 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequestProofToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 334)
- * 
                        
  * 
                        - * <element name="RequestProofToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}RequestProofTokenType"/>
+ * <element name="RequestProofToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}RequestProofTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenType.java
index c040901d53..360eef1b99 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestProofTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for RequestProofTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 335)
- * 
                        
  * 
                        - * <complexType name="RequestProofTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestProofTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymElement.java
index f3df1b3513..4753e205a5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequestPseudonym element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 299)
- * 
                        
  * 
                        - * <element name="RequestPseudonym" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}RequestPseudonymType"/>
+ * <element name="RequestPseudonym" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}RequestPseudonymType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymType.java
index 20af0fdfef..40b0d502ab 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequestPseudonymType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for RequestPseudonymType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 300)
- * 
                        
  * 
                        - * <complexType name="RequestPseudonymType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Lookup" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="SingleUse" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestPseudonymType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Lookup" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       <attribute name="SingleUse" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireBearerTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireBearerTokensElement.java
index 0a0a9b5aac..1bdd6ad7ab 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireBearerTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireBearerTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequireBearerTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 389)
- * 
                        
  * 
                        - * <element name="RequireBearerTokens" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
+ * <element name="RequireBearerTokens" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireReferenceTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireReferenceTokenElement.java
index 916f408eb1..ef28e79577 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireReferenceTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireReferenceTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequireReferenceToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 374)
- * 
                        
  * 
                        - * <element name="RequireReferenceToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="RequireReferenceToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSharedCookiesElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSharedCookiesElement.java
index 2dbf4ab22d..a155c07cbc 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSharedCookiesElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSharedCookiesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequireSharedCookies element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 390)
- * 
                        
  * 
                        - * <element name="RequireSharedCookies" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
+ * <element name="RequireSharedCookies" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSignedTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSignedTokensElement.java
index 0f2f10d00f..fa997d8fe8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSignedTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequireSignedTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequireSignedTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 388)
- * 
                        
  * 
                        - * <element name="RequireSignedTokens" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
+ * <element name="RequireSignedTokens" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequiresGenericClaimDialectElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequiresGenericClaimDialectElement.java
index 9c763fcd33..9c08ceb5ee 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequiresGenericClaimDialectElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/RequiresGenericClaimDialectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RequiresGenericClaimDialect element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 394)
- * 
                        
  * 
                        - * <element name="RequiresGenericClaimDialect" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
+ * <element name="RequiresGenericClaimDialect" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenElement.java
index d65d77a422..8d099be96c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SecurityToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 282)
- * 
                        
  * 
                        - * <element name="SecurityToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}SecurityTokenType"/>
+ * <element name="SecurityToken" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}SecurityTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenType.java
index afb6db7c8e..ef3db00fef 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SecurityTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for SecurityTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 283)
- * 
                        
  * 
                        - * <complexType name="SecurityTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecurityTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutBasisType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutBasisType.java
index e98ee94725..cadf273268 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutBasisType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutBasisType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for SignOutBasisType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 223)
- * 
                        
  * 
                        - * <complexType name="SignOutBasisType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignOutBasisType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutElement.java
index e0669c62c9..09c908d4f0 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignOut element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 212)
- * 
                        
  * 
                        - * <element name="SignOut" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}SignOutType"/>
+ * <element name="SignOut" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}SignOutType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutType.java
index 5e2ae05ff7..2e756ad5c9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SignOutType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for SignOutType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 213)
- * 
                        
  * 
                        - * <complexType name="SignOutType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}Realm" minOccurs="0"/>
- *         <element name="SignOutBasis" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}SignOutBasisType"/>
- *         <any/>
- *       </sequence>
- *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignOutType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2006/12/federation}Realm" minOccurs="0"/>
+ *         <element name="SignOutBasis" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}SignOutBasisType"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutNotificationEndpointElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutNotificationEndpointElement.java
index 36634e93e1..b1409e0135 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutNotificationEndpointElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutNotificationEndpointElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SingleSignOutNotificationEndpoint element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 145)
- * 
                        
  * 
                        - * <element name="SingleSignOutNotificationEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="SingleSignOutNotificationEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutSubscriptionEndpointElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutSubscriptionEndpointElement.java
index 2bda074c71..8efe64d76c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutSubscriptionEndpointElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/SingleSignOutSubscriptionEndpointElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SingleSignOutSubscriptionEndpoint element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 142)
- * 
                        
  * 
                        - * <element name="SingleSignOutSubscriptionEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="SingleSignOutSubscriptionEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerEndpointElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerEndpointElement.java
index 622a0aaba3..57baaa16ce 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerEndpointElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerEndpointElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for TokenIssuerEndpoint element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 133)
- * 
                        
  * 
                        - * <element name="TokenIssuerEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
+ * <element name="TokenIssuerEndpoint" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerNameElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerNameElement.java
index 8bbb6343c4..79257b4346 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerNameElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenIssuerNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for TokenIssuerName element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 123)
- * 
                        
  * 
                        - * <element name="TokenIssuerName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI"/>
+ * <element name="TokenIssuerName" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}AttributeExtensibleURI"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyInfoType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyInfoType.java
index 95391a1970..77b9ea4ffd 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyInfoType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for TokenKeyInfoType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 97)
- * 
                        
  * 
                        - * <complexType name="TokenKeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityTokenReference"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TokenKeyInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityTokenReference"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyTransferKeyInfoElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyTransferKeyInfoElement.java
index 92f9d7aafd..74453945f9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyTransferKeyInfoElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenKeyTransferKeyInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for TokenKeyTransferKeyInfo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 105)
- * 
                        
  * 
                        - * <element name="TokenKeyTransferKeyInfo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenKeyInfoType"/>
+ * <element name="TokenKeyTransferKeyInfo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenKeyInfoType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenSigningKeyInfoElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenSigningKeyInfoElement.java
index b306163c06..f3e079adee 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenSigningKeyInfoElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenSigningKeyInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for TokenSigningKeyInfo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 95)
- * 
                        
  * 
                        - * <element name="TokenSigningKeyInfo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenKeyInfoType"/>
+ * <element name="TokenSigningKeyInfo" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenKeyInfoType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenType.java
index c69f1ca64f..d0dafbfa28 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for TokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 157)
- * 
                        
  * 
                        - * <complexType name="TokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedElement.java
index c97ac60cc9..0db8e44dff 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for TokenTypesOffered element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 148)
- * 
                        
  * 
                        - * <element name="TokenTypesOffered" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenTypesOfferedType"/>
+ * <element name="TokenTypesOffered" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenTypesOfferedType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedType.java
index 60a77dd2d0..68d8c9ec36 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/TokenTypesOfferedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for TokenTypesOfferedType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 149)
- * 
                        
  * 
                        - * <complexType name="TokenTypesOfferedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="TokenType" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenType" maxOccurs="unbounded"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TokenTypesOfferedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="TokenType" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}TokenType" maxOccurs="unbounded"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedElement.java
index 62c4da398f..962d747993 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for UriNamedClaimTypesOffered element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 166)
- * 
                        
  * 
                        - * <element name="UriNamedClaimTypesOffered" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}UriNamedClaimTypesOfferedType"/>
+ * <element name="UriNamedClaimTypesOffered" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}UriNamedClaimTypesOfferedType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedType.java
index ac2f9cb61a..18e481e288 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/UriNamedClaimTypesOfferedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for UriNamedClaimTypesOfferedType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 167)
- * 
                        
  * 
                        - * <complexType name="UriNamedClaimTypesOfferedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ClaimType" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ClaimType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UriNamedClaimTypesOfferedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ClaimType" type="{http://schemas.xmlsoap.org/ws/2006/12/federation}ClaimType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/WebBindingElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/WebBindingElement.java
index 9fde7f236e..6680135dbd 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/WebBindingElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsfederation/WebBindingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for WebBinding element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-federation.xsd line 385)
- * 
                        
  * 
                        - * <element name="WebBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="WebBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AllElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AllElement.java
index 2774d03666..9aef785d9d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AllElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AllElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for All element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 50)
- * 
                        
  * 
                        - * <element name="All" type="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType"/>
+ * <element name="All" type="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToElement.java
index 762b26fce5..b671e8a7ce 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for AppliesTo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 107)
- * 
                        
  * 
                        - * <element name="AppliesTo">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <any/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="AppliesTo">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <any/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToType.java
index f66e7126a4..ca4afd3254 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/AppliesToType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 108)
- * 
                        
  * 
                        - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ExactlyOneElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ExactlyOneElement.java
index 70fd0a46ea..f2a1e44a0d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ExactlyOneElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ExactlyOneElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for ExactlyOne element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 51)
- * 
                        
  * 
                        - * <element name="ExactlyOne" type="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType"/>
+ * <element name="ExactlyOne" type="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ObjectFactory.java
index e74cee21aa..4939d3fc70 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -67,7 +68,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -86,7 +87,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -105,7 +106,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -117,7 +118,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of PolicyAttachmentElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyAttachmentElement createPolicyAttachmentElement()
@@ -129,7 +130,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyAttachmentElement creat
     /**
      * Create an instance of OperatorContentType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.OperatorContentType createOperatorContentType()
@@ -141,7 +142,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.OperatorContentType createOpe
     /**
      * Create an instance of AllElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.AllElement createAllElement()
@@ -153,7 +154,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.AllElement createAllElement()
     /**
      * Create an instance of PolicyAttachmentType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyAttachmentType createPolicyAttachmentType()
@@ -165,7 +166,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyAttachmentType createPo
     /**
      * Create an instance of AppliesToType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.AppliesToType createAppliesToType()
@@ -177,7 +178,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.AppliesToType createAppliesTo
     /**
      * Create an instance of PolicyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyType createPolicyType()
@@ -189,7 +190,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyType createPolicyType()
     /**
      * Create an instance of AppliesToElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.AppliesToElement createAppliesToElement()
@@ -201,7 +202,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.AppliesToElement createApplie
     /**
      * Create an instance of ExactlyOneElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.ExactlyOneElement createExactlyOneElement()
@@ -213,7 +214,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.ExactlyOneElement createExact
     /**
      * Create an instance of PolicyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyElement createPolicyElement()
@@ -225,7 +226,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyElement createPolicyEle
     /**
      * Create an instance of PolicyReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyReferenceElement createPolicyReferenceElement()
@@ -237,7 +238,7 @@ public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyReferenceElement create
     /**
      * Create an instance of PolicyReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wspolicy.PolicyReferenceType createPolicyReferenceType()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/OperatorContentType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/OperatorContentType.java
index 10b8e72a84..f9fae5e3a2 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/OperatorContentType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/OperatorContentType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,23 +13,22 @@
 /**
  * Java content class for OperatorContentType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 53)
- * 
                        
  * 
                        - * <complexType name="OperatorContentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
- *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}All"/>
- *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}ExactlyOne"/>
- *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}PolicyReference"/>
- *           <any/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OperatorContentType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}All"/>
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}ExactlyOne"/>
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}PolicyReference"/>
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentElement.java
index 2226a602e8..c8ad297d1a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for PolicyAttachment element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 87)
- * 
                        
  * 
                        - * <element name="PolicyAttachment">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}AppliesTo"/>
- *           <choice maxOccurs="unbounded">
- *             <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
- *             <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}PolicyReference"/>
- *           </choice>
- *           <any/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="PolicyAttachment">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}AppliesTo"/>
+ *           <choice maxOccurs="unbounded">
+ *             <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
+ *             <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}PolicyReference"/>
+ *           </choice>
+ *           <any/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentType.java
index f63312c2f9..3550bae73b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyAttachmentType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for anonymous complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 88)
- * 
                        
  * 
                        - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}AppliesTo"/>
- *         <choice maxOccurs="unbounded">
- *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
- *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}PolicyReference"/>
- *         </choice>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}AppliesTo"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
+ *           <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}PolicyReference"/>
+ *         </choice>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyElement.java
index ae35f12c41..b48ea0b23a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for Policy element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 39)
- * 
                        
  * 
                        - * <element name="Policy">
- *   <complexType>
- *     <complexContent>
- *       <extension base="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType">
- *         <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *         <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
- *       </extension>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="Policy">
+ *   <complexType>
+ *     <complexContent>
+ *       <extension base="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType">
+ *         <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *         <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ *       </extension>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceElement.java
index f3c29728c4..3310956988 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for PolicyReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 65)
- * 
                        
  * 
                        - * <element name="PolicyReference">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <attribute name="Digest" type="{http://www.w3.org/2001/XMLSchema}base64Binary" />
- *         <attribute name="DigestAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI" default="http://schemas.xmlsoap.org/ws/2004/09/policy/Sha1Exc" />
- *         <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <element name="PolicyReference">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <attribute name="Digest" type="{http://www.w3.org/2001/XMLSchema}base64Binary" />
+ *         <attribute name="DigestAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI" default="http://schemas.xmlsoap.org/ws/2004/09/policy/Sha1Exc" />
+ *         <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceType.java
index 12c629af84..bfa25866c8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for anonymous complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 66)
- * 
                        
  * 
                        - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Digest" type="{http://www.w3.org/2001/XMLSchema}base64Binary" />
- *       <attribute name="DigestAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI" default="http://schemas.xmlsoap.org/ws/2004/09/policy/Sha1Exc" />
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="Digest" type="{http://www.w3.org/2001/XMLSchema}base64Binary" />
+ *       <attribute name="DigestAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI" default="http://schemas.xmlsoap.org/ws/2004/09/policy/Sha1Exc" />
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyType.java
index 9e5655839e..13ddf7f8e7 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wspolicy/PolicyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for anonymous complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-policy.xsd line 40)
- * 
                        
  * 
                        - * <complexType>
- *   <complexContent>
- *     <extension base="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType">
- *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType">
+ *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/AttributedString.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/AttributedString.java
index bcbc9b520a..4c524892eb 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/AttributedString.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/AttributedString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,15 +14,14 @@
  * This type represents an element with arbitrary attributes.
  * Java content class for AttributedString complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 14)
- * 
                        
  * 
                        - * <complexType name="AttributedString">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedString">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenElement.java
index f8338139eb..d7d68aacaf 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:BinarySecurityToken element per Section 4.2.
  * Java content class for BinarySecurityToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 147)
- * 
                        
  * 
                        - * <element name="BinarySecurityToken" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}BinarySecurityTokenType"/>
+ * <element name="BinarySecurityToken" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}BinarySecurityTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenType.java
index 3ff3452eb7..a3f6c0901e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/BinarySecurityTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,15 +14,14 @@
  * A security token that is encoded in binary
  * Java content class for BinarySecurityTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 56)
- * 
                        
  * 
                        - * <complexType name="BinarySecurityTokenType">
- *   <simpleContent>
- *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>EncodedString">
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="BinarySecurityTokenType">
+ *   <simpleContent>
+ *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>EncodedString">
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedElement.java
index 183fb427e4..972ddb3590 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines a security token embedded reference
  * Java content class for Embedded element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 157)
- * 
                        
  * 
                        - * <element name="Embedded" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}EmbeddedType"/>
+ * <element name="Embedded" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}EmbeddedType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedType.java
index d1af6e4593..bc818e0950 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EmbeddedType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,18 +14,17 @@
  * This type represents a reference to an embedded security token.
  * Java content class for EmbeddedType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 95)
- * 
                        
  * 
                        - * <complexType name="EmbeddedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </choice>
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmbeddedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EncodedString.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EncodedString.java
index df4ae57c36..b4430defa1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EncodedString.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/EncodedString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,15 +14,14 @@
  * This type is used for elements containing stringified binary data.
  * Java content class for EncodedString complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 35)
- * 
                        
  * 
                        - * <complexType name="EncodedString">
- *   <simpleContent>
- *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>AttributedString">
- *       <attribute name="EncodingType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="EncodedString">
+ *   <simpleContent>
+ *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>AttributedString">
+ *       <attribute name="EncodingType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierElement.java
index b7e2ee41d7..936965bb3e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines a key identifier reference
  * Java content class for KeyIdentifier element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 162)
- * 
                        
  * 
                        - * <element name="KeyIdentifier" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}KeyIdentifierType"/>
+ * <element name="KeyIdentifier" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}KeyIdentifierType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierType.java
index cd0c856791..03c83ecf0d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/KeyIdentifierType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,15 +14,14 @@
  * A security token key identifier
  * Java content class for KeyIdentifierType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 66)
- * 
                        
  * 
                        - * <complexType name="KeyIdentifierType">
- *   <simpleContent>
- *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>EncodedString">
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="KeyIdentifierType">
+ *   <simpleContent>
+ *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>EncodedString">
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/NonceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/NonceElement.java
index b6265a738f..0f5df36e87 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/NonceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/NonceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Nonce element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 183)
- * 
                        
  * 
                        - * <element name="Nonce" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}EncodedString"/>
+ * <element name="Nonce" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}EncodedString"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ObjectFactory.java
index 1aed86ca1b..9ed460beb8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -81,7 +82,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -100,7 +101,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -119,7 +120,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -131,7 +132,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of EmbeddedType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.EmbeddedType createEmbeddedType()
@@ -143,7 +144,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.EmbeddedType createEmbeddedType()
     /**
      * Create an instance of ReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.ReferenceType createReferenceType()
@@ -155,7 +156,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.ReferenceType createReferenceType
     /**
      * Create an instance of BinarySecurityTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.BinarySecurityTokenElement createBinarySecurityTokenElement()
@@ -167,7 +168,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.BinarySecurityTokenElement create
     /**
      * Create an instance of SecurityElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.SecurityElement createSecurityElement()
@@ -179,7 +180,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.SecurityElement createSecurityEle
     /**
      * Create an instance of SecurityHeaderType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.SecurityHeaderType createSecurityHeaderType()
@@ -191,7 +192,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.SecurityHeaderType createSecurity
     /**
      * Create an instance of EmbeddedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.EmbeddedElement createEmbeddedElement()
@@ -203,7 +204,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.EmbeddedElement createEmbeddedEle
     /**
      * Create an instance of UsernameTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.UsernameTokenElement createUsernameTokenElement()
@@ -215,7 +216,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.UsernameTokenElement createUserna
     /**
      * Create an instance of TransformationParametersType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.TransformationParametersType createTransformationParametersType()
@@ -227,7 +228,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.TransformationParametersType crea
     /**
      * Create an instance of TransformationParametersElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.TransformationParametersElement createTransformationParametersElement()
@@ -239,7 +240,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.TransformationParametersElement c
     /**
      * Create an instance of EncodedString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.EncodedString createEncodedString()
@@ -251,7 +252,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.EncodedString createEncodedString
     /**
      * Create an instance of PasswordElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.PasswordElement createPasswordElement()
@@ -263,7 +264,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.PasswordElement createPasswordEle
     /**
      * Create an instance of SecurityTokenReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.SecurityTokenReferenceElement createSecurityTokenReferenceElement()
@@ -275,7 +276,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.SecurityTokenReferenceElement cre
     /**
      * Create an instance of SecurityTokenReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.SecurityTokenReferenceType createSecurityTokenReferenceType()
@@ -287,7 +288,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.SecurityTokenReferenceType create
     /**
      * Create an instance of PasswordString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.PasswordString createPasswordString()
@@ -299,7 +300,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.PasswordString createPasswordStri
     /**
      * Create an instance of KeyIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.KeyIdentifierElement createKeyIdentifierElement()
@@ -311,7 +312,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.KeyIdentifierElement createKeyIde
     /**
      * Create an instance of BinarySecurityTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.BinarySecurityTokenType createBinarySecurityTokenType()
@@ -323,7 +324,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.BinarySecurityTokenType createBin
     /**
      * Create an instance of ReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.ReferenceElement createReferenceElement()
@@ -335,7 +336,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.ReferenceElement createReferenceE
     /**
      * Create an instance of NonceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.NonceElement createNonceElement()
@@ -347,7 +348,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.NonceElement createNonceElement()
     /**
      * Create an instance of AttributedString
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.AttributedString createAttributedString()
@@ -359,7 +360,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.AttributedString createAttributed
     /**
      * Create an instance of UsernameTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.UsernameTokenType createUsernameTokenType()
@@ -371,7 +372,7 @@ public com.sun.identity.wsfederation.jaxb.wsse.UsernameTokenType createUsernameT
     /**
      * Create an instance of KeyIdentifierType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsse.KeyIdentifierType createKeyIdentifierType()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordElement.java
index a44b8814e2..c9426442cd 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Password element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 182)
- * 
                        
  * 
                        - * <element name="Password" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}PasswordString"/>
+ * <element name="Password" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}PasswordString"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordString.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordString.java
index 4d4ff7ff90..caa3dcce06 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordString.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/PasswordString.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,15 +14,14 @@
  * This type is used for password elements per Section 4.1.
  * Java content class for PasswordString complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 25)
- * 
                        
  * 
                        - * <complexType name="PasswordString">
- *   <simpleContent>
- *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>AttributedString">
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="PasswordString">
+ *   <simpleContent>
+ *     <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>AttributedString">
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceElement.java
index 61229c7c84..4d50aa2fe5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines a security token reference
  * Java content class for Reference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 152)
- * 
                        
  * 
                        - * <element name="Reference" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}ReferenceType"/>
+ * <element name="Reference" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}ReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceType.java
index d811b72547..f498584213 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/ReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,16 +14,15 @@
  * This type represents a reference to an external security token.
  * Java content class for ReferenceType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 87)
- * 
                        
  * 
                        - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityElement.java
index b86094b914..6c9944c9af 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:Security SOAP header element per Section 4.
  * Java content class for Security element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 172)
- * 
                        
  * 
                        - * <element name="Security" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityHeaderType"/>
+ * <element name="Security" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityHeaderType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityHeaderType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityHeaderType.java
index df3b17160d..6ea548249c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityHeaderType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityHeaderType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,17 +14,16 @@
  * This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.
  * Java content class for SecurityHeaderType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 116)
- * 
                        
  * 
                        - * <complexType name="SecurityHeaderType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecurityHeaderType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceElement.java
index e56e929c5c..eaa9866188 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:SecurityTokenReference per Section 4.3.
  * Java content class for SecurityTokenReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 167)
- * 
                        
  * 
                        - * <element name="SecurityTokenReference" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityTokenReferenceType"/>
+ * <element name="SecurityTokenReference" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityTokenReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceType.java
index 6d7a3487e6..1fca900561 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/SecurityTokenReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,19 +14,18 @@
  * This type is used reference a security token.
  * Java content class for SecurityTokenReferenceType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 105)
- * 
                        
  * 
                        - * <complexType name="SecurityTokenReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </choice>
- *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Usage"/>
- *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecurityTokenReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </choice>
+ *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Usage"/>
+ *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersElement.java
index ae2ffaf567..1262642df5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element contains properties for transformations from any namespace, including DSIG.
  * Java content class for TransformationParameters element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 177)
- * 
                        
  * 
                        - * <element name="TransformationParameters" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}TransformationParametersType"/>
+ * <element name="TransformationParameters" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}TransformationParametersType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersType.java
index 836ef7c560..066dc801d5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/TransformationParametersType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,17 +14,16 @@
  * This complexType defines a container for elements to be specified from any namespace as properties/parameters of a DSIG transformation.
  * Java content class for TransformationParametersType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 129)
- * 
                        
  * 
                        - * <complexType name="TransformationParametersType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformationParametersType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenElement.java
index 79ed9ab374..4bcd92e3aa 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,9 +14,8 @@
  * This element defines the wsse:UsernameToken element per Section 4.1.
  * Java content class for UsernameToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 142)
- * 
                        
  * 
                        - * <element name="UsernameToken" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameTokenType"/>
+ * <element name="UsernameToken" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenType.java
index 410d86fe4f..5fc1ba4448 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsse/UsernameTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -13,19 +14,18 @@
  * This type represents a username token per Section 4.1
  * Java content class for UsernameTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-secext-1.0.xsd line 45)
- * 
                        
  * 
                        - * <complexType name="UsernameTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}AttributedString"/>
- *         <any/>
- *       </sequence>
- *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UsernameTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}AttributedString"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AbsXPathElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AbsXPathElement.java
index fd8f71c3a9..18ab76c887 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AbsXPathElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AbsXPathElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for AbsXPath element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 696)
- * 
                        
  * 
                        - * <element name="AbsXPath" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="AbsXPath" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AlgorithmSuiteElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AlgorithmSuiteElement.java
index a2bf479e3a..5e66039072 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AlgorithmSuiteElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AlgorithmSuiteElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for AlgorithmSuite element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 534)
- * 
                        
  * 
                        - * <element name="AlgorithmSuite" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="AlgorithmSuite" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AsymmetricBindingElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AsymmetricBindingElement.java
index 0107c2f8da..c92816ac5f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AsymmetricBindingElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/AsymmetricBindingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for AsymmetricBinding element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 828)
- * 
                        
  * 
                        - * <element name="AsymmetricBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="AsymmetricBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Element.java
index 1423dbbb63..225223195b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic128 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 563)
- * 
                        
  * 
                        - * <element name="Basic128" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic128" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Rsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Rsa15Element.java
index eb01173905..e46c44ad1d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Rsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Rsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic128Rsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 591)
- * 
                        
  * 
                        - * <element name="Basic128Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic128Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Element.java
index adf2f95964..6fdde91d3f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic128Sha256 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 619)
- * 
                        
  * 
                        - * <element name="Basic128Sha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic128Sha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Rsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Rsa15Element.java
index 079b106450..ca2873e89c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Rsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic128Sha256Rsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic128Sha256Rsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 647)
- * 
                        
  * 
                        - * <element name="Basic128Sha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic128Sha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Element.java
index cc1297adc7..94ed85739d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic192 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 556)
- * 
                        
  * 
                        - * <element name="Basic192" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic192" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Rsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Rsa15Element.java
index 7b5808ee04..35ab0bd512 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Rsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Rsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic192Rsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 584)
- * 
                        
  * 
                        - * <element name="Basic192Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic192Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Element.java
index 0843b2d968..91cfb83a7b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic192Sha256 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 612)
- * 
                        
  * 
                        - * <element name="Basic192Sha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic192Sha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Rsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Rsa15Element.java
index 3a615fff6a..a72d84fd79 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Rsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic192Sha256Rsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic192Sha256Rsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 640)
- * 
                        
  * 
                        - * <element name="Basic192Sha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic192Sha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Element.java
index badf7995b2..fa2cf1c907 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic256 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 549)
- * 
                        
  * 
                        - * <element name="Basic256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Rsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Rsa15Element.java
index d3295b1d6b..d1eb06bc4f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Rsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Rsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic256Rsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 577)
- * 
                        
  * 
                        - * <element name="Basic256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Element.java
index eb6954fee7..37e36f32bb 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic256Sha256 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 605)
- * 
                        
  * 
                        - * <element name="Basic256Sha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic256Sha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Rsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Rsa15Element.java
index 8556ced42d..db7978f9db 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Rsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Basic256Sha256Rsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Basic256Sha256Rsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 633)
- * 
                        
  * 
                        - * <element name="Basic256Sha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Basic256Sha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/BootstrapPolicyElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/BootstrapPolicyElement.java
index 2bb7530435..569ba73640 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/BootstrapPolicyElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/BootstrapPolicyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for BootstrapPolicy element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 419)
- * 
                        
  * 
                        - * <element name="BootstrapPolicy" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="BootstrapPolicy" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EmptyType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EmptyType.java
index 5af6e6c03b..ed1ee2b5d6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EmptyType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EmptyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for EmptyType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 50)
- * 
                        
  * 
                        - * <complexType name="EmptyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EmptyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptBeforeSigningElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptBeforeSigningElement.java
index 8768abee8e..e188a8ae9e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptBeforeSigningElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptBeforeSigningElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for EncryptBeforeSigning element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 799)
- * 
                        
  * 
                        - * <element name="EncryptBeforeSigning" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="EncryptBeforeSigning" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptSignatureElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptSignatureElement.java
index 98c4412482..0924de2a49 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptSignatureElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptSignatureElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for EncryptSignature element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 806)
- * 
                        
  * 
                        - * <element name="EncryptSignature" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="EncryptSignature" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedElementsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedElementsElement.java
index f0d9bb71fe..674ec69309 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedElementsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedElementsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for EncryptedElements element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 64)
- * 
                        
  * 
                        - * <element name="EncryptedElements" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SerElementsType"/>
+ * <element name="EncryptedElements" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SerElementsType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedPartsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedPartsElement.java
index 0634e48ec3..c8a909e49a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedPartsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptedPartsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for EncryptedParts element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 35)
- * 
                        
  * 
                        - * <element name="EncryptedParts" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SePartsType"/>
+ * <element name="EncryptedParts" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SePartsType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptionTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptionTokenElement.java
index a0b7ee51e6..095c041254 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptionTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EncryptionTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for EncryptionToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 774)
- * 
                        
  * 
                        - * <element name="EncryptionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="EncryptionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingEncryptedSupportingTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingEncryptedSupportingTokensElement.java
index 74f3348ef6..2105c1c29e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingEncryptedSupportingTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingEncryptedSupportingTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for EndorsingEncryptedSupportingTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 959)
- * 
                        
  * 
                        - * <element name="EndorsingEncryptedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="EndorsingEncryptedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingSupportingTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingSupportingTokensElement.java
index 6af49fe23a..a537f03ca0 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingSupportingTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/EndorsingSupportingTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for EndorsingSupportingTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 920)
- * 
                        
  * 
                        - * <element name="EndorsingSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="EndorsingSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HashPasswordElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HashPasswordElement.java
index 9b24116173..845ef073ba 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HashPasswordElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HashPasswordElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for HashPassword element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 136)
- * 
                        
  * 
                        - * <element name="HashPassword" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="HashPassword" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HeaderType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HeaderType.java
index eecdd15484..f9438f9e38 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HeaderType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HeaderType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,16 +13,15 @@
 /**
  * Java content class for HeaderType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 51)
- * 
                        
  * 
                        - * <complexType name="HeaderType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="Namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="HeaderType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="Namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpBasicAuthenticationElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpBasicAuthenticationElement.java
index 6421114849..6d3f3e785c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpBasicAuthenticationElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpBasicAuthenticationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for HttpBasicAuthentication element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 509)
- * 
                        
  * 
                        - * <element name="HttpBasicAuthentication" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="HttpBasicAuthentication" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpDigestAuthenticationElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpDigestAuthenticationElement.java
index 2a11335efb..9df74082b3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpDigestAuthenticationElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpDigestAuthenticationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for HttpDigestAuthentication element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 516)
- * 
                        
  * 
                        - * <element name="HttpDigestAuthentication" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="HttpDigestAuthentication" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpsTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpsTokenElement.java
index c181872e39..9f62a6ca7b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpsTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/HttpsTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for HttpsToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 502)
- * 
                        
  * 
                        - * <element name="HttpsToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="HttpsToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IncludeTimestampElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IncludeTimestampElement.java
index d7917b2246..c98a4944c3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IncludeTimestampElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IncludeTimestampElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for IncludeTimestamp element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 759)
- * 
                        
  * 
                        - * <element name="IncludeTimestamp" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="IncludeTimestamp" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InclusiveC14NElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InclusiveC14NElement.java
index 7633556dc0..9e0729ba9c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InclusiveC14NElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InclusiveC14NElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for InclusiveC14N element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 661)
- * 
                        
  * 
                        - * <element name="InclusiveC14N" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="InclusiveC14N" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorEncryptionTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorEncryptionTokenElement.java
index f0d326b7d8..4fd4753d03 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorEncryptionTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorEncryptionTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for InitiatorEncryptionToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 852)
- * 
                        
  * 
                        - * <element name="InitiatorEncryptionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="InitiatorEncryptionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorSignatureTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorSignatureTokenElement.java
index b310c9dae1..6e2764ccdf 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorSignatureTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorSignatureTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for InitiatorSignatureToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 844)
- * 
                        
  * 
                        - * <element name="InitiatorSignatureToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="InitiatorSignatureToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorTokenElement.java
index 27277b0d95..aa924b213c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/InitiatorTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for InitiatorToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 836)
- * 
                        
  * 
                        - * <element name="InitiatorToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="InitiatorToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenElement.java
index 56a863df1c..4f87d21d2c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for IssuedToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 165)
- * 
                        
  * 
                        - * <element name="IssuedToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IssuedTokenType"/>
+ * <element name="IssuedToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IssuedTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenType.java
index 20652e0cc9..70b019e856 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/IssuedTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for IssuedTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 172)
- * 
                        
  * 
                        - * <complexType name="IssuedTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Issuer" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/>
- *         <element name="RequestSecurityTokenTemplate" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}RequestSecurityTokenTemplateType"/>
- *         <any/>
- *       </sequence>
- *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IssuedTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Issuer" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/>
+ *         <element name="RequestSecurityTokenTemplate" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}RequestSecurityTokenTemplateType"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/KerberosTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/KerberosTokenElement.java
index 2da86fc4d1..dc23f0065e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/KerberosTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/KerberosTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for KerberosToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 318)
- * 
                        
  * 
                        - * <element name="KerberosToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="KerberosToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxElement.java
index 54567ceeb8..ebc41482c1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Lax element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 719)
- * 
                        
  * 
                        - * <element name="Lax" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Lax" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsFirstElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsFirstElement.java
index 6402e91230..bd99457ea3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsFirstElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsFirstElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for LaxTsFirst element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 726)
- * 
                        
  * 
                        - * <element name="LaxTsFirst" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="LaxTsFirst" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsLastElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsLastElement.java
index e933f0586c..f9b8b96854 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsLastElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LaxTsLastElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for LaxTsLast element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 733)
- * 
                        
  * 
                        - * <element name="LaxTsLast" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="LaxTsLast" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LayoutElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LayoutElement.java
index 13e0758e16..bab70af0fc 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LayoutElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/LayoutElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Layout element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 704)
- * 
                        
  * 
                        - * <element name="Layout" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="Layout" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportClientChallengeElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportClientChallengeElement.java
index f7595bd33d..ac7ffa7adb 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportClientChallengeElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportClientChallengeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportClientChallenge element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1070)
- * 
                        
  * 
                        - * <element name="MustSupportClientChallenge" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportClientChallenge" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportIssuedTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportIssuedTokensElement.java
index 8861cc6be4..3f3f2cf50d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportIssuedTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportIssuedTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportIssuedTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1098)
- * 
                        
  * 
                        - * <element name="MustSupportIssuedTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportIssuedTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEmbeddedTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEmbeddedTokenElement.java
index c55ad88b7c..495b4d0b30 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEmbeddedTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEmbeddedTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportRefEmbeddedToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1017)
- * 
                        
  * 
                        - * <element name="MustSupportRefEmbeddedToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportRefEmbeddedToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEncryptedKeyElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEncryptedKeyElement.java
index 74d577aadb..157453fe43 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEncryptedKeyElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefEncryptedKeyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportRefEncryptedKey element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1044)
- * 
                        
  * 
                        - * <element name="MustSupportRefEncryptedKey" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportRefEncryptedKey" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefExternalURIElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefExternalURIElement.java
index 9b3040b0f5..b93d2e5d22 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefExternalURIElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefExternalURIElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportRefExternalURI element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1010)
- * 
                        
  * 
                        - * <element name="MustSupportRefExternalURI" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportRefExternalURI" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefIssuerSerialElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefIssuerSerialElement.java
index 3f1d95f497..08c4c312d6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefIssuerSerialElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefIssuerSerialElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportRefIssuerSerial element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1003)
- * 
                        
  * 
                        - * <element name="MustSupportRefIssuerSerial" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportRefIssuerSerial" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefKeyIdentifierElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefKeyIdentifierElement.java
index fd9bbe1945..3e266834f7 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefKeyIdentifierElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefKeyIdentifierElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportRefKeyIdentifier element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 996)
- * 
                        
  * 
                        - * <element name="MustSupportRefKeyIdentifier" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportRefKeyIdentifier" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefThumbprintElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefThumbprintElement.java
index bfe726871c..df25052b4a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefThumbprintElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportRefThumbprintElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportRefThumbprint element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1037)
- * 
                        
  * 
                        - * <element name="MustSupportRefThumbprint" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportRefThumbprint" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportServerChallengeElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportServerChallengeElement.java
index e64fb80147..286c0cd98d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportServerChallengeElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/MustSupportServerChallengeElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for MustSupportServerChallenge element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1077)
- * 
                        
  * 
                        - * <element name="MustSupportServerChallenge" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="MustSupportServerChallenge" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NestedPolicyType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NestedPolicyType.java
index a746a4f193..9ddadaaf64 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NestedPolicyType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NestedPolicyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for NestedPolicyType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 541)
- * 
                        
  * 
                        - * <complexType name="NestedPolicyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NestedPolicyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://schemas.xmlsoap.org/ws/2004/09/policy}Policy"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NoPasswordElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NoPasswordElement.java
index 7ba010ee7a..1545b032e3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NoPasswordElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/NoPasswordElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for NoPassword element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 129)
- * 
                        
  * 
                        - * <element name="NoPassword" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="NoPassword" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ObjectFactory.java
index 60bbe868e0..36a925d4bc 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -299,7 +300,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -318,7 +319,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -337,7 +338,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -349,7 +350,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of TripleDesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesElement createTripleDesElement()
@@ -361,7 +362,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesElement createTripl
     /**
      * Create an instance of Wss11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Wss11Element createWss11Element()
@@ -373,7 +374,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Wss11Element createWss11Elem
     /**
      * Create an instance of ProtectionTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.ProtectionTokenElement createProtectionTokenElement()
@@ -385,7 +386,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.ProtectionTokenElement creat
     /**
      * Create an instance of HttpBasicAuthenticationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.HttpBasicAuthenticationElement createHttpBasicAuthenticationElement()
@@ -397,7 +398,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.HttpBasicAuthenticationEleme
     /**
      * Create an instance of RequireClientCertificateElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireClientCertificateElement createRequireClientCertificateElement()
@@ -409,7 +410,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireClientCertificateElem
     /**
      * Create an instance of Basic256Rsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Rsa15Element createBasic256Rsa15Element()
@@ -421,7 +422,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Rsa15Element createB
     /**
      * Create an instance of Basic128Rsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Rsa15Element createBasic128Rsa15Element()
@@ -433,7 +434,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Rsa15Element createB
     /**
      * Create an instance of Basic128Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Element createBasic128Element()
@@ -445,7 +446,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Element createBasic1
     /**
      * Create an instance of WssSamlV20Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssSamlV20Token11Element createWssSamlV20Token11Element()
@@ -457,7 +458,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssSamlV20Token11Element cre
     /**
      * Create an instance of XPathFilter20Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.XPathFilter20Element createXPathFilter20Element()
@@ -469,7 +470,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.XPathFilter20Element createX
     /**
      * Create an instance of RequestSecurityTokenTemplateType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequestSecurityTokenTemplateType createRequestSecurityTokenTemplateType()
@@ -481,7 +482,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequestSecurityTokenTemplate
     /**
      * Create an instance of HashPasswordElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.HashPasswordElement createHashPasswordElement()
@@ -493,7 +494,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.HashPasswordElement createHa
     /**
      * Create an instance of OnlySignEntireHeadersAndBodyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.OnlySignEntireHeadersAndBodyElement createOnlySignEntireHeadersAndBodyElement()
@@ -505,7 +506,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.OnlySignEntireHeadersAndBody
     /**
      * Create an instance of LayoutElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.LayoutElement createLayoutElement()
@@ -517,7 +518,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.LayoutElement createLayoutEl
     /**
      * Create an instance of XPath10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.XPath10Element createXPath10Element()
@@ -529,7 +530,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.XPath10Element createXPath10
     /**
      * Create an instance of WssRelV10Token10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV10Token10Element createWssRelV10Token10Element()
@@ -541,7 +542,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV10Token10Element crea
     /**
      * Create an instance of Basic192Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Element createBasic192Element()
@@ -553,7 +554,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Element createBasic1
     /**
      * Create an instance of SupportingTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SupportingTokensElement createSupportingTokensElement()
@@ -565,7 +566,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SupportingTokensElement crea
     /**
      * Create an instance of InitiatorTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.InitiatorTokenElement createInitiatorTokenElement()
@@ -577,7 +578,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.InitiatorTokenElement create
     /**
      * Create an instance of MustSupportRefIssuerSerialElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefIssuerSerialElement createMustSupportRefIssuerSerialElement()
@@ -589,7 +590,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefIssuerSerialEl
     /**
      * Create an instance of SecurityContextTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SecurityContextTokenElement createSecurityContextTokenElement()
@@ -601,7 +602,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SecurityContextTokenElement
     /**
      * Create an instance of RequireIssuerSerialReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireIssuerSerialReferenceElement createRequireIssuerSerialReferenceElement()
@@ -613,7 +614,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireIssuerSerialReference
     /**
      * Create an instance of WssKerberosV5ApReqToken11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssKerberosV5ApReqToken11Element createWssKerberosV5ApReqToken11Element()
@@ -625,7 +626,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssKerberosV5ApReqToken11Ele
     /**
      * Create an instance of QNameAssertionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.QNameAssertionType createQNameAssertionType()
@@ -637,7 +638,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.QNameAssertionType createQNa
     /**
      * Create an instance of STRTransform10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.STRTransform10Element createSTRTransform10Element()
@@ -649,7 +650,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.STRTransform10Element create
     /**
      * Create an instance of RequireExplicitDerivedKeysElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireExplicitDerivedKeysElement createRequireExplicitDerivedKeysElement()
@@ -661,7 +662,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireExplicitDerivedKeysEl
     /**
      * Create an instance of AbsXPathElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.AbsXPathElement createAbsXPathElement()
@@ -673,7 +674,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.AbsXPathElement createAbsXPa
     /**
      * Create an instance of TripleDesRsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesRsa15Element createTripleDesRsa15Element()
@@ -685,7 +686,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesRsa15Element create
     /**
      * Create an instance of EncryptBeforeSigningElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptBeforeSigningElement createEncryptBeforeSigningElement()
@@ -697,7 +698,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptBeforeSigningElement
     /**
      * Create an instance of EncryptionTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptionTokenElement createEncryptionTokenElement()
@@ -709,7 +710,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptionTokenElement creat
     /**
      * Create an instance of RequireSignatureConfirmationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireSignatureConfirmationElement createRequireSignatureConfirmationElement()
@@ -721,7 +722,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireSignatureConfirmation
     /**
      * Create an instance of SignatureTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SignatureTokenElement createSignatureTokenElement()
@@ -733,7 +734,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SignatureTokenElement create
     /**
      * Create an instance of WssX509V3Token10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509V3Token10Element createWssX509V3Token10Element()
@@ -745,7 +746,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509V3Token10Element crea
     /**
      * Create an instance of Trust10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Trust10Element createTrust10Element()
@@ -757,7 +758,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Trust10Element createTrust10
     /**
      * Create an instance of RequireExternalUriReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireExternalUriReferenceElement createRequireExternalUriReferenceElement()
@@ -769,7 +770,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireExternalUriReferenceE
     /**
      * Create an instance of RequireServerEntropyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireServerEntropyElement createRequireServerEntropyElement()
@@ -781,7 +782,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireServerEntropyElement
     /**
      * Create an instance of IssuedTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.IssuedTokenElement createIssuedTokenElement()
@@ -793,7 +794,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.IssuedTokenElement createIss
     /**
      * Create an instance of RecipientSignatureTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RecipientSignatureTokenElement createRecipientSignatureTokenElement()
@@ -805,7 +806,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RecipientSignatureTokenEleme
     /**
      * Create an instance of HeaderType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.HeaderType createHeaderType()
@@ -817,7 +818,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.HeaderType createHeaderType(
     /**
      * Create an instance of InitiatorSignatureTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.InitiatorSignatureTokenElement createInitiatorSignatureTokenElement()
@@ -829,7 +830,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.InitiatorSignatureTokenEleme
     /**
      * Create an instance of LaxTsLastElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.LaxTsLastElement createLaxTsLastElement()
@@ -841,7 +842,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.LaxTsLastElement createLaxTs
     /**
      * Create an instance of SignedElementsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedElementsElement createSignedElementsElement()
@@ -853,7 +854,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedElementsElement create
     /**
      * Create an instance of AsymmetricBindingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.AsymmetricBindingElement createAsymmetricBindingElement()
@@ -865,7 +866,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.AsymmetricBindingElement cre
     /**
      * Create an instance of SamlTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SamlTokenElement createSamlTokenElement()
@@ -877,7 +878,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SamlTokenElement createSamlT
     /**
      * Create an instance of EndorsingSupportingTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EndorsingSupportingTokensElement createEndorsingSupportingTokensElement()
@@ -889,7 +890,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EndorsingSupportingTokensEle
     /**
      * Create an instance of WssX509Pkcs7Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509Pkcs7Token11Element createWssX509Pkcs7Token11Element()
@@ -901,7 +902,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509Pkcs7Token11Element c
     /**
      * Create an instance of TripleDesSha256Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesSha256Element createTripleDesSha256Element()
@@ -913,7 +914,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesSha256Element creat
     /**
      * Create an instance of RequireDerivedKeysElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireDerivedKeysElement createRequireDerivedKeysElement()
@@ -925,7 +926,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireDerivedKeysElement cr
     /**
      * Create an instance of TokenAssertionType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.TokenAssertionType createTokenAssertionType()
@@ -937,7 +938,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.TokenAssertionType createTok
     /**
      * Create an instance of HttpDigestAuthenticationElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.HttpDigestAuthenticationElement createHttpDigestAuthenticationElement()
@@ -949,7 +950,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.HttpDigestAuthenticationElem
     /**
      * Create an instance of MustSupportClientChallengeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportClientChallengeElement createMustSupportClientChallengeElement()
@@ -961,7 +962,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportClientChallengeEl
     /**
      * Create an instance of IncludeTimestampElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.IncludeTimestampElement createIncludeTimestampElement()
@@ -973,7 +974,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.IncludeTimestampElement crea
     /**
      * Create an instance of MustSupportRefThumbprintElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefThumbprintElement createMustSupportRefThumbprintElement()
@@ -985,7 +986,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefThumbprintElem
     /**
      * Create an instance of InitiatorEncryptionTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.InitiatorEncryptionTokenElement createInitiatorEncryptionTokenElement()
@@ -997,7 +998,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.InitiatorEncryptionTokenElem
     /**
      * Create an instance of SignedSupportingTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedSupportingTokensElement createSignedSupportingTokensElement()
@@ -1009,7 +1010,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedSupportingTokensElemen
     /**
      * Create an instance of WssRelV20Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV20Token11Element createWssRelV20Token11Element()
@@ -1021,7 +1022,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV20Token11Element crea
     /**
      * Create an instance of LaxElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.LaxElement createLaxElement()
@@ -1033,7 +1034,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.LaxElement createLaxElement(
     /**
      * Create an instance of WssX509V3Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509V3Token11Element createWssX509V3Token11Element()
@@ -1045,7 +1046,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509V3Token11Element crea
     /**
      * Create an instance of MustSupportIssuedTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportIssuedTokensElement createMustSupportIssuedTokensElement()
@@ -1057,7 +1058,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportIssuedTokensEleme
     /**
      * Create an instance of RequireImplicitDerivedKeysElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireImplicitDerivedKeysElement createRequireImplicitDerivedKeysElement()
@@ -1069,7 +1070,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireImplicitDerivedKeysEl
     /**
      * Create an instance of SignedEndorsingEncryptedSupportingTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedEndorsingEncryptedSupportingTokensElement createSignedEndorsingEncryptedSupportingTokensElement()
@@ -1081,7 +1082,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedEndorsingEncryptedSupp
     /**
      * Create an instance of SignedEncryptedSupportingTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedEncryptedSupportingTokensElement createSignedEncryptedSupportingTokensElement()
@@ -1093,7 +1094,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedEncryptedSupportingTok
     /**
      * Create an instance of SePartsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SePartsType createSePartsType()
@@ -1105,7 +1106,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SePartsType createSePartsTyp
     /**
      * Create an instance of RequireClientEntropyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireClientEntropyElement createRequireClientEntropyElement()
@@ -1117,7 +1118,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireClientEntropyElement
     /**
      * Create an instance of EncryptSignatureElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptSignatureElement createEncryptSignatureElement()
@@ -1129,7 +1130,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptSignatureElement crea
     /**
      * Create an instance of Basic192Rsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Rsa15Element createBasic192Rsa15Element()
@@ -1141,7 +1142,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Rsa15Element createB
     /**
      * Create an instance of TripleDesSha256Rsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesSha256Rsa15Element createTripleDesSha256Rsa15Element()
@@ -1153,7 +1154,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.TripleDesSha256Rsa15Element
     /**
      * Create an instance of MustSupportServerChallengeElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportServerChallengeElement createMustSupportServerChallengeElement()
@@ -1165,7 +1166,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportServerChallengeEl
     /**
      * Create an instance of RequireEmbeddedTokenReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireEmbeddedTokenReferenceElement createRequireEmbeddedTokenReferenceElement()
@@ -1177,7 +1178,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireEmbeddedTokenReferenc
     /**
      * Create an instance of AlgorithmSuiteElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.AlgorithmSuiteElement createAlgorithmSuiteElement()
@@ -1189,7 +1190,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.AlgorithmSuiteElement create
     /**
      * Create an instance of RequireExternalReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireExternalReferenceElement createRequireExternalReferenceElement()
@@ -1201,7 +1202,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireExternalReferenceElem
     /**
      * Create an instance of RecipientEncryptionTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RecipientEncryptionTokenElement createRecipientEncryptionTokenElement()
@@ -1213,7 +1214,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RecipientEncryptionTokenElem
     /**
      * Create an instance of WssUsernameToken10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssUsernameToken10Element createWssUsernameToken10Element()
@@ -1225,7 +1226,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssUsernameToken10Element cr
     /**
      * Create an instance of NestedPolicyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.NestedPolicyType createNestedPolicyType()
@@ -1237,7 +1238,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.NestedPolicyType createNeste
     /**
      * Create an instance of InclusiveC14NElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.InclusiveC14NElement createInclusiveC14NElement()
@@ -1249,7 +1250,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.InclusiveC14NElement createI
     /**
      * Create an instance of TransportBindingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.TransportBindingElement createTransportBindingElement()
@@ -1261,7 +1262,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.TransportBindingElement crea
     /**
      * Create an instance of EncryptedPartsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptedPartsElement createEncryptedPartsElement()
@@ -1273,7 +1274,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptedPartsElement create
     /**
      * Create an instance of Wss10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Wss10Element createWss10Element()
@@ -1285,7 +1286,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Wss10Element createWss10Elem
     /**
      * Create an instance of TransportTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.TransportTokenElement createTransportTokenElement()
@@ -1297,7 +1298,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.TransportTokenElement create
     /**
      * Create an instance of HttpsTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.HttpsTokenElement createHttpsTokenElement()
@@ -1309,7 +1310,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.HttpsTokenElement createHttp
     /**
      * Create an instance of SecureConversationTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SecureConversationTokenType createSecureConversationTokenType()
@@ -1321,7 +1322,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SecureConversationTokenType
     /**
      * Create an instance of Basic256Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Element createBasic256Element()
@@ -1333,7 +1334,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Element createBasic2
     /**
      * Create an instance of SecureConversationTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SecureConversationTokenElement createSecureConversationTokenElement()
@@ -1345,7 +1346,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SecureConversationTokenEleme
     /**
      * Create an instance of Basic192Sha256Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Sha256Element createBasic192Sha256Element()
@@ -1357,7 +1358,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Sha256Element create
     /**
      * Create an instance of WssRelV20Token10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV20Token10Element createWssRelV20Token10Element()
@@ -1369,7 +1370,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV20Token10Element crea
     /**
      * Create an instance of Basic192Sha256Rsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Sha256Rsa15Element createBasic192Sha256Rsa15Element()
@@ -1381,7 +1382,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic192Sha256Rsa15Element c
     /**
      * Create an instance of WssSamlV11Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssSamlV11Token11Element createWssSamlV11Token11Element()
@@ -1393,7 +1394,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssSamlV11Token11Element cre
     /**
      * Create an instance of MustSupportRefExternalURIElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefExternalURIElement createMustSupportRefExternalURIElement()
@@ -1405,7 +1406,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefExternalURIEle
     /**
      * Create an instance of EncryptedElementsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptedElementsElement createEncryptedElementsElement()
@@ -1417,7 +1418,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EncryptedElementsElement cre
     /**
      * Create an instance of WssUsernameToken11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssUsernameToken11Element createWssUsernameToken11Element()
@@ -1429,7 +1430,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssUsernameToken11Element cr
     /**
      * Create an instance of WssX509Pkcs7Token10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509Pkcs7Token10Element createWssX509Pkcs7Token10Element()
@@ -1441,7 +1442,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509Pkcs7Token10Element c
     /**
      * Create an instance of SC200502SecurityContextTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SC200502SecurityContextTokenElement createSC200502SecurityContextTokenElement()
@@ -1453,7 +1454,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SC200502SecurityContextToken
     /**
      * Create an instance of RecipientTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RecipientTokenElement createRecipientTokenElement()
@@ -1465,7 +1466,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RecipientTokenElement create
     /**
      * Create an instance of SOAPNormalization10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SOAPNormalization10Element createSOAPNormalization10Element()
@@ -1477,7 +1478,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SOAPNormalization10Element c
     /**
      * Create an instance of X509TokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.X509TokenElement createX509TokenElement()
@@ -1489,7 +1490,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.X509TokenElement createX509T
     /**
      * Create an instance of KerberosTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.KerberosTokenElement createKerberosTokenElement()
@@ -1501,7 +1502,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.KerberosTokenElement createK
     /**
      * Create an instance of MustSupportRefKeyIdentifierElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefKeyIdentifierElement createMustSupportRefKeyIdentifierElement()
@@ -1513,7 +1514,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefKeyIdentifierE
     /**
      * Create an instance of Basic256Sha256Rsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Sha256Rsa15Element createBasic256Sha256Rsa15Element()
@@ -1525,7 +1526,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Sha256Rsa15Element c
     /**
      * Create an instance of WssRelV10Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV10Token11Element createWssRelV10Token11Element()
@@ -1537,7 +1538,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssRelV10Token11Element crea
     /**
      * Create an instance of WssX509PkiPathV1Token10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509PkiPathV1Token10Element createWssX509PkiPathV1Token10Element()
@@ -1549,7 +1550,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509PkiPathV1Token10Eleme
     /**
      * Create an instance of SignedPartsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedPartsElement createSignedPartsElement()
@@ -1561,7 +1562,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedPartsElement createSig
     /**
      * Create an instance of MustSupportRefEncryptedKeyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefEncryptedKeyElement createMustSupportRefEncryptedKeyElement()
@@ -1573,7 +1574,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefEncryptedKeyEl
     /**
      * Create an instance of NoPasswordElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.NoPasswordElement createNoPasswordElement()
@@ -1585,7 +1586,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.NoPasswordElement createNoPa
     /**
      * Create an instance of StrictElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.StrictElement createStrictElement()
@@ -1597,7 +1598,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.StrictElement createStrictEl
     /**
      * Create an instance of SerElementsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SerElementsType createSerElementsType()
@@ -1609,7 +1610,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SerElementsType createSerEle
     /**
      * Create an instance of WssX509PkiPathV1Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509PkiPathV1Token11Element createWssX509PkiPathV1Token11Element()
@@ -1621,7 +1622,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509PkiPathV1Token11Eleme
     /**
      * Create an instance of Basic128Sha256Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Sha256Element createBasic128Sha256Element()
@@ -1633,7 +1634,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Sha256Element create
     /**
      * Create an instance of SignedEndorsingSupportingTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedEndorsingSupportingTokensElement createSignedEndorsingSupportingTokensElement()
@@ -1645,7 +1646,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SignedEndorsingSupportingTok
     /**
      * Create an instance of MustSupportRefEmbeddedTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefEmbeddedTokenElement createMustSupportRefEmbeddedTokenElement()
@@ -1657,7 +1658,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.MustSupportRefEmbeddedTokenE
     /**
      * Create an instance of SymmetricBindingElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SymmetricBindingElement createSymmetricBindingElement()
@@ -1669,7 +1670,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SymmetricBindingElement crea
     /**
      * Create an instance of WssSamlV11Token10Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssSamlV11Token10Element createWssSamlV11Token10Element()
@@ -1681,7 +1682,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssSamlV11Token10Element cre
     /**
      * Create an instance of ProtectTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.ProtectTokensElement createProtectTokensElement()
@@ -1693,7 +1694,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.ProtectTokensElement createP
     /**
      * Create an instance of IssuedTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.IssuedTokenType createIssuedTokenType()
@@ -1705,7 +1706,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.IssuedTokenType createIssued
     /**
      * Create an instance of RequiredElementsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequiredElementsElement createRequiredElementsElement()
@@ -1717,7 +1718,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequiredElementsElement crea
     /**
      * Create an instance of LaxTsFirstElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.LaxTsFirstElement createLaxTsFirstElement()
@@ -1729,7 +1730,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.LaxTsFirstElement createLaxT
     /**
      * Create an instance of RequireThumbprintReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireThumbprintReferenceElement createRequireThumbprintReferenceElement()
@@ -1741,7 +1742,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireThumbprintReferenceEl
     /**
      * Create an instance of EmptyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EmptyType createEmptyType()
@@ -1753,7 +1754,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EmptyType createEmptyType()
     /**
      * Create an instance of SpnegoContextTokenType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SpnegoContextTokenType createSpnegoContextTokenType()
@@ -1765,7 +1766,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SpnegoContextTokenType creat
     /**
      * Create an instance of BootstrapPolicyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.BootstrapPolicyElement createBootstrapPolicyElement()
@@ -1777,7 +1778,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.BootstrapPolicyElement creat
     /**
      * Create an instance of WssX509V1Token11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509V1Token11Element createWssX509V1Token11Element()
@@ -1789,7 +1790,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssX509V1Token11Element crea
     /**
      * Create an instance of RelTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RelTokenElement createRelTokenElement()
@@ -1801,7 +1802,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RelTokenElement createRelTok
     /**
      * Create an instance of UsernameTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.UsernameTokenElement createUsernameTokenElement()
@@ -1813,7 +1814,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.UsernameTokenElement createU
     /**
      * Create an instance of RequireInternalReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireInternalReferenceElement createRequireInternalReferenceElement()
@@ -1825,7 +1826,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireInternalReferenceElem
     /**
      * Create an instance of SpnegoContextTokenElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.SpnegoContextTokenElement createSpnegoContextTokenElement()
@@ -1837,7 +1838,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.SpnegoContextTokenElement cr
     /**
      * Create an instance of EndorsingEncryptedSupportingTokensElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.EndorsingEncryptedSupportingTokensElement createEndorsingEncryptedSupportingTokensElement()
@@ -1849,7 +1850,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.EndorsingEncryptedSupporting
     /**
      * Create an instance of Basic128Sha256Rsa15Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Sha256Rsa15Element createBasic128Sha256Rsa15Element()
@@ -1861,7 +1862,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic128Sha256Rsa15Element c
     /**
      * Create an instance of Basic256Sha256Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Sha256Element createBasic256Sha256Element()
@@ -1873,7 +1874,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.Basic256Sha256Element create
     /**
      * Create an instance of WssGssKerberosV5ApReqToken11Element
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.WssGssKerberosV5ApReqToken11Element createWssGssKerberosV5ApReqToken11Element()
@@ -1885,7 +1886,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.WssGssKerberosV5ApReqToken11
     /**
      * Create an instance of RequireRequestSecurityTokenCollectionElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireRequestSecurityTokenCollectionElement createRequireRequestSecurityTokenCollectionElement()
@@ -1897,7 +1898,7 @@ public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireRequestSecurityTokenC
     /**
      * Create an instance of RequireKeyIdentifierReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsspolicy.RequireKeyIdentifierReferenceElement createRequireKeyIdentifierReferenceElement()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/OnlySignEntireHeadersAndBodyElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/OnlySignEntireHeadersAndBodyElement.java
index 5624005088..fb36968d3a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/OnlySignEntireHeadersAndBodyElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/OnlySignEntireHeadersAndBodyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for OnlySignEntireHeadersAndBody element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 820)
- * 
                        
  * 
                        - * <element name="OnlySignEntireHeadersAndBody" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="OnlySignEntireHeadersAndBody" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectTokensElement.java
index a883eb6bea..d0d5031e41 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for ProtectTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 813)
- * 
                        
  * 
                        - * <element name="ProtectTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="ProtectTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectionTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectionTokenElement.java
index 17fa6c750b..715ca48041 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectionTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/ProtectionTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for ProtectionToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 788)
- * 
                        
  * 
                        - * <element name="ProtectionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="ProtectionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/QNameAssertionType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/QNameAssertionType.java
index 3cdb9e2959..88e906bbcd 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/QNameAssertionType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/QNameAssertionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,14 +13,13 @@
 /**
  * Java content class for QNameAssertionType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 161)
- * 
                        
  * 
                        - * <complexType name="QNameAssertionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QNameAssertionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientEncryptionTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientEncryptionTokenElement.java
index a8d823c135..615e028844 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientEncryptionTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientEncryptionTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RecipientEncryptionToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 876)
- * 
                        
  * 
                        - * <element name="RecipientEncryptionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="RecipientEncryptionToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientSignatureTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientSignatureTokenElement.java
index 3a2d24328e..7aed71b483 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientSignatureTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientSignatureTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RecipientSignatureToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 868)
- * 
                        
  * 
                        - * <element name="RecipientSignatureToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="RecipientSignatureToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientTokenElement.java
index 880831a681..508fdf6c40 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RecipientTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RecipientToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 860)
- * 
                        
  * 
                        - * <element name="RecipientToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="RecipientToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RelTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RelTokenElement.java
index a69655b23e..5e88ccc47f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RelTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RelTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RelToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 461)
- * 
                        
  * 
                        - * <element name="RelToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="RelToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequestSecurityTokenTemplateType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequestSecurityTokenTemplateType.java
index 3b66d8b9a1..4ace8d4390 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequestSecurityTokenTemplateType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequestSecurityTokenTemplateType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for RequestSecurityTokenTemplateType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 185)
- * 
                        
  * 
                        - * <complexType name="RequestSecurityTokenTemplateType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="TrustVersion" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestSecurityTokenTemplateType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="TrustVersion" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientCertificateElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientCertificateElement.java
index c85a162cc4..14496de4b8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientCertificateElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientCertificateElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireClientCertificate element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 523)
- * 
                        
  * 
                        - * <element name="RequireClientCertificate" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireClientCertificate" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientEntropyElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientEntropyElement.java
index fdc56282a3..c486b0252b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientEntropyElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireClientEntropyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireClientEntropy element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1084)
- * 
                        
  * 
                        - * <element name="RequireClientEntropy" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireClientEntropy" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireDerivedKeysElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireDerivedKeysElement.java
index d2dee42aa4..23bdaa925f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireDerivedKeysElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireDerivedKeysElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireDerivedKeys element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 193)
- * 
                        
  * 
                        - * <element name="RequireDerivedKeys" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireDerivedKeys" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireEmbeddedTokenReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireEmbeddedTokenReferenceElement.java
index 84c08d8820..a42825639c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireEmbeddedTokenReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireEmbeddedTokenReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireEmbeddedTokenReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 254)
- * 
                        
  * 
                        - * <element name="RequireEmbeddedTokenReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireEmbeddedTokenReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExplicitDerivedKeysElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExplicitDerivedKeysElement.java
index 9636373b93..543c59a9a9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExplicitDerivedKeysElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExplicitDerivedKeysElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireExplicitDerivedKeys element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 207)
- * 
                        
  * 
                        - * <element name="RequireExplicitDerivedKeys" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireExplicitDerivedKeys" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalReferenceElement.java
index eca81352f0..59ea31bf10 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireExternalReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 214)
- * 
                        
  * 
                        - * <element name="RequireExternalReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireExternalReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalUriReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalUriReferenceElement.java
index 6c823cf6c4..bdaa87a525 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalUriReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireExternalUriReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireExternalUriReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 379)
- * 
                        
  * 
                        - * <element name="RequireExternalUriReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireExternalUriReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireImplicitDerivedKeysElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireImplicitDerivedKeysElement.java
index 421c0b1f8c..ce22786320 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireImplicitDerivedKeysElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireImplicitDerivedKeysElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireImplicitDerivedKeys element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 200)
- * 
                        
  * 
                        - * <element name="RequireImplicitDerivedKeys" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireImplicitDerivedKeys" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireInternalReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireInternalReferenceElement.java
index 451bdf5ae4..c134d65297 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireInternalReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireInternalReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireInternalReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 221)
- * 
                        
  * 
                        - * <element name="RequireInternalReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireInternalReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireIssuerSerialReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireIssuerSerialReferenceElement.java
index c87c2b7ab9..03786b69e4 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireIssuerSerialReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireIssuerSerialReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireIssuerSerialReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 247)
- * 
                        
  * 
                        - * <element name="RequireIssuerSerialReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireIssuerSerialReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireKeyIdentifierReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireKeyIdentifierReferenceElement.java
index d92c966f86..d53bb86dc5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireKeyIdentifierReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireKeyIdentifierReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireKeyIdentifierReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 240)
- * 
                        
  * 
                        - * <element name="RequireKeyIdentifierReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireKeyIdentifierReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireRequestSecurityTokenCollectionElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireRequestSecurityTokenCollectionElement.java
index 16a6f96e87..d7ce12982e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireRequestSecurityTokenCollectionElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireRequestSecurityTokenCollectionElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireRequestSecurityTokenCollection element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1105)
- * 
                        
  * 
                        - * <element name="RequireRequestSecurityTokenCollection" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireRequestSecurityTokenCollection" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireServerEntropyElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireServerEntropyElement.java
index eb0cc88938..a205431094 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireServerEntropyElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireServerEntropyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireServerEntropy element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1091)
- * 
                        
  * 
                        - * <element name="RequireServerEntropy" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireServerEntropy" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireSignatureConfirmationElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireSignatureConfirmationElement.java
index 697e352884..8a9faf6fb6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireSignatureConfirmationElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireSignatureConfirmationElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireSignatureConfirmation element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1051)
- * 
                        
  * 
                        - * <element name="RequireSignatureConfirmation" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireSignatureConfirmation" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireThumbprintReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireThumbprintReferenceElement.java
index 7e425b0ff6..1ff6253afc 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireThumbprintReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequireThumbprintReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequireThumbprintReference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 261)
- * 
                        
  * 
                        - * <element name="RequireThumbprintReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="RequireThumbprintReference" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequiredElementsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequiredElementsElement.java
index 733f03b21a..f976e5db52 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequiredElementsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/RequiredElementsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for RequiredElements element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 71)
- * 
                        
  * 
                        - * <element name="RequiredElements" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SerElementsType"/>
+ * <element name="RequiredElements" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SerElementsType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SC200502SecurityContextTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SC200502SecurityContextTokenElement.java
index 583310b0f7..15cdf8a242 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SC200502SecurityContextTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SC200502SecurityContextTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SC200502SecurityContextToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 386)
- * 
                        
  * 
                        - * <element name="SC200502SecurityContextToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="SC200502SecurityContextToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SOAPNormalization10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SOAPNormalization10Element.java
index 977700991a..41140529fa 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SOAPNormalization10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SOAPNormalization10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SOAPNormalization10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 668)
- * 
                        
  * 
                        - * <element name="SOAPNormalization10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="SOAPNormalization10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/STRTransform10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/STRTransform10Element.java
index e7fd7f80a7..9790ad60d2 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/STRTransform10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/STRTransform10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for STRTransform10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 675)
- * 
                        
  * 
                        - * <element name="STRTransform10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="STRTransform10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SamlTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SamlTokenElement.java
index e43439a0ad..caf69ddea6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SamlTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SamlTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SamlToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 427)
- * 
                        
  * 
                        - * <element name="SamlToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="SamlToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SePartsType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SePartsType.java
index 2be7106e3e..e75481b092 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SePartsType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SePartsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SePartsType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 42)
- * 
                        
  * 
                        - * <complexType name="SePartsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Body" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}EmptyType" minOccurs="0"/>
- *         <element name="Header" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}HeaderType" maxOccurs="unbounded" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SePartsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Body" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}EmptyType" minOccurs="0"/>
+ *         <element name="Header" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}HeaderType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenElement.java
index 68938300fd..39d078f05d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SecureConversationToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 394)
- * 
                        
  * 
                        - * <element name="SecureConversationToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SecureConversationTokenType"/>
+ * <element name="SecureConversationToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SecureConversationTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenType.java
index 0b36dad407..2e4b766c14 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecureConversationTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SecureConversationTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 401)
- * 
                        
  * 
                        - * <complexType name="SecureConversationTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Issuer" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SecureConversationTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Issuer" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecurityContextTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecurityContextTokenElement.java
index 7ebf20d5ea..3f5da510d3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecurityContextTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SecurityContextTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SecurityContextToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 368)
- * 
                        
  * 
                        - * <element name="SecurityContextToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="SecurityContextToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SerElementsType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SerElementsType.java
index af1bcc7976..b2a84fdd3a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SerElementsType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SerElementsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SerElementsType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 78)
- * 
                        
  * 
                        - * <complexType name="SerElementsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="XPathVersion" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SerElementsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="XPathVersion" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignatureTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignatureTokenElement.java
index 69ab404c46..2bdc666b5f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignatureTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignatureTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SignatureToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 781)
- * 
                        
  * 
                        - * <element name="SignatureToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="SignatureToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedElementsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedElementsElement.java
index 9eb0f639d9..0a5ded1213 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedElementsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedElementsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SignedElements element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 57)
- * 
                        
  * 
                        - * <element name="SignedElements" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SerElementsType"/>
+ * <element name="SignedElements" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SerElementsType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEncryptedSupportingTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEncryptedSupportingTokensElement.java
index 27d859adfa..8ec149ea7e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEncryptedSupportingTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEncryptedSupportingTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SignedEncryptedSupportingTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 946)
- * 
                        
  * 
                        - * <element name="SignedEncryptedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="SignedEncryptedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingEncryptedSupportingTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingEncryptedSupportingTokensElement.java
index 2707ebccd4..aeec5c607f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingEncryptedSupportingTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingEncryptedSupportingTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SignedEndorsingEncryptedSupportingTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 972)
- * 
                        
  * 
                        - * <element name="SignedEndorsingEncryptedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="SignedEndorsingEncryptedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingSupportingTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingSupportingTokensElement.java
index 8006e2342f..41e4e7fa62 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingSupportingTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedEndorsingSupportingTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SignedEndorsingSupportingTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 933)
- * 
                        
  * 
                        - * <element name="SignedEndorsingSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="SignedEndorsingSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedPartsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedPartsElement.java
index 3ba49e270f..7a7fe3b3ac 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedPartsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedPartsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SignedParts element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 28)
- * 
                        
  * 
                        - * <element name="SignedParts" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SePartsType"/>
+ * <element name="SignedParts" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SePartsType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedSupportingTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedSupportingTokensElement.java
index a5b7bbea3e..eed6bcd5af 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedSupportingTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SignedSupportingTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SignedSupportingTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 907)
- * 
                        
  * 
                        - * <element name="SignedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="SignedSupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenElement.java
index ed31638a00..5eea27015f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SpnegoContextToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 345)
- * 
                        
  * 
                        - * <element name="SpnegoContextToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SpnegoContextTokenType"/>
+ * <element name="SpnegoContextToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}SpnegoContextTokenType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenType.java
index e67e221dbf..901a08468d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SpnegoContextTokenType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SpnegoContextTokenType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 352)
- * 
                        
  * 
                        - * <complexType name="SpnegoContextTokenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Issuer" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SpnegoContextTokenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Issuer" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/StrictElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/StrictElement.java
index 23d00ff659..c6460ac75b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/StrictElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/StrictElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Strict element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 712)
- * 
                        
  * 
                        - * <element name="Strict" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="Strict" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SupportingTokensElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SupportingTokensElement.java
index 0a43acff33..28eaf9bdb0 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SupportingTokensElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SupportingTokensElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SupportingTokens element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 894)
- * 
                        
  * 
                        - * <element name="SupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="SupportingTokens" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SymmetricBindingElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SymmetricBindingElement.java
index 139d329322..54bae6701a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SymmetricBindingElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/SymmetricBindingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for SymmetricBinding element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 767)
- * 
                        
  * 
                        - * <element name="SymmetricBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="SymmetricBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TokenAssertionType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TokenAssertionType.java
index 5fc091249e..9cd10af511 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TokenAssertionType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TokenAssertionType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for TokenAssertionType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 117)
- * 
                        
  * 
                        - * <complexType name="TokenAssertionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TokenAssertionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute ref="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}IncludeToken"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportBindingElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportBindingElement.java
index 25257bc862..58cf755065 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportBindingElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportBindingElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for TransportBinding element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 741)
- * 
                        
  * 
                        - * <element name="TransportBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="TransportBinding" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportTokenElement.java
index cba0184494..39d317b168 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TransportTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for TransportToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 749)
- * 
                        
  * 
                        - * <element name="TransportToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="TransportToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesElement.java
index 5c70167380..acb7bf28d4 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for TripleDes element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 570)
- * 
                        
  * 
                        - * <element name="TripleDes" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="TripleDes" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesRsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesRsa15Element.java
index fe30ac6c1b..e3cb7c326b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesRsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesRsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for TripleDesRsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 598)
- * 
                        
  * 
                        - * <element name="TripleDesRsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="TripleDesRsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Element.java
index 1139be7f88..a729743a06 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for TripleDesSha256 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 626)
- * 
                        
  * 
                        - * <element name="TripleDesSha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="TripleDesSha256" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Rsa15Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Rsa15Element.java
index 4bce5693f6..821d8c594b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Rsa15Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/TripleDesSha256Rsa15Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for TripleDesSha256Rsa15 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 654)
- * 
                        
  * 
                        - * <element name="TripleDesSha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="TripleDesSha256Rsa15" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Trust10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Trust10Element.java
index f1b3bf93c7..3083f18cc6 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Trust10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Trust10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Trust10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1062)
- * 
                        
  * 
                        - * <element name="Trust10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="Trust10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/UsernameTokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/UsernameTokenElement.java
index d33fca48bc..db85e4105d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/UsernameTokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/UsernameTokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for UsernameToken element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 110)
- * 
                        
  * 
                        - * <element name="UsernameToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="UsernameToken" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss10Element.java
index 3c0e085be1..01f478f054 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Wss10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 988)
- * 
                        
  * 
                        - * <element name="Wss10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="Wss10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss11Element.java
index b45b1bc67e..5a32023c43 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/Wss11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Wss11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 1025)
- * 
                        
  * 
                        - * <element name="Wss11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
+ * <element name="Wss11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}NestedPolicyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssGssKerberosV5ApReqToken11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssGssKerberosV5ApReqToken11Element.java
index 8a97cf626a..69b398163c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssGssKerberosV5ApReqToken11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssGssKerberosV5ApReqToken11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssGssKerberosV5ApReqToken11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 337)
- * 
                        
  * 
                        - * <element name="WssGssKerberosV5ApReqToken11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssGssKerberosV5ApReqToken11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssKerberosV5ApReqToken11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssKerberosV5ApReqToken11Element.java
index a88f476dcd..792de5bbba 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssKerberosV5ApReqToken11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssKerberosV5ApReqToken11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssKerberosV5ApReqToken11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 330)
- * 
                        
  * 
                        - * <element name="WssKerberosV5ApReqToken11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssKerberosV5ApReqToken11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token10Element.java
index 5c3028b281..aeea5fd2d9 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssRelV10Token10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 473)
- * 
                        
  * 
                        - * <element name="WssRelV10Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssRelV10Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token11Element.java
index 1445a4dbb6..ad092a9a07 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV10Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssRelV10Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 487)
- * 
                        
  * 
                        - * <element name="WssRelV10Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssRelV10Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token10Element.java
index c4a49b1b54..c29fa41f49 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssRelV20Token10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 480)
- * 
                        
  * 
                        - * <element name="WssRelV20Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssRelV20Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token11Element.java
index 5fd4a88c9a..02553f5ed1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssRelV20Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssRelV20Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 494)
- * 
                        
  * 
                        - * <element name="WssRelV20Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssRelV20Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token10Element.java
index 643b28f16e..1c0bc2b26f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssSamlV11Token10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 439)
- * 
                        
  * 
                        - * <element name="WssSamlV11Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssSamlV11Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token11Element.java
index ec71146122..cdbc371456 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV11Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssSamlV11Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 446)
- * 
                        
  * 
                        - * <element name="WssSamlV11Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssSamlV11Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV20Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV20Token11Element.java
index 0313a8a637..7d8b2b84a1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV20Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssSamlV20Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssSamlV20Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 453)
- * 
                        
  * 
                        - * <element name="WssSamlV20Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssSamlV20Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken10Element.java
index 9944864234..64844300e4 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssUsernameToken10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 143)
- * 
                        
  * 
                        - * <element name="WssUsernameToken10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssUsernameToken10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken11Element.java
index 8bf72c49c0..9df4b3ab5c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssUsernameToken11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssUsernameToken11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 150)
- * 
                        
  * 
                        - * <element name="WssUsernameToken11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssUsernameToken11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token10Element.java
index 4b39379c12..dd6b3e48c8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssX509Pkcs7Token10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 275)
- * 
                        
  * 
                        - * <element name="WssX509Pkcs7Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssX509Pkcs7Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token11Element.java
index ab14d3d236..3051c49f64 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509Pkcs7Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssX509Pkcs7Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 303)
- * 
                        
  * 
                        - * <element name="WssX509Pkcs7Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssX509Pkcs7Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token10Element.java
index e55c8cae6c..ee179bc85d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssX509PkiPathV1Token10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 282)
- * 
                        
  * 
                        - * <element name="WssX509PkiPathV1Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssX509PkiPathV1Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token11Element.java
index 02b601c4b0..97630adb75 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509PkiPathV1Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssX509PkiPathV1Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 310)
- * 
                        
  * 
                        - * <element name="WssX509PkiPathV1Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssX509PkiPathV1Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V1Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V1Token11Element.java
index 645d8971a2..f903e7c9f7 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V1Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V1Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssX509V1Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 289)
- * 
                        
  * 
                        - * <element name="WssX509V1Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssX509V1Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token10Element.java
index 181f2601da..ec44e33721 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssX509V3Token10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 268)
- * 
                        
  * 
                        - * <element name="WssX509V3Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssX509V3Token10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token11Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token11Element.java
index 494aaba501..3f26aee5f5 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token11Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/WssX509V3Token11Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for WssX509V3Token11 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 296)
- * 
                        
  * 
                        - * <element name="WssX509V3Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="WssX509V3Token11" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/X509TokenElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/X509TokenElement.java
index 0cc72f34e7..ec0da713d1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/X509TokenElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/X509TokenElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for X509Token element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 229)
- * 
                        
  * 
                        - * <element name="X509Token" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
+ * <element name="X509Token" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}TokenAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPath10Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPath10Element.java
index 06643bbe60..6553ad73cb 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPath10Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPath10Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for XPath10 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 682)
- * 
                        
  * 
                        - * <element name="XPath10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="XPath10" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPathFilter20Element.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPathFilter20Element.java
index 7369ee2454..7d37285ce1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPathFilter20Element.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsspolicy/XPathFilter20Element.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for XPathFilter20 element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/ws-securitypolicy-1.2.xsd line 689)
- * 
                        
  * 
                        - * <element name="XPathFilter20" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
+ * <element name="XPathFilter20" type="{http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200512}QNameAssertionType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedDateTime.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedDateTime.java
index c5ac350556..e35ebd651b 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedDateTime.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedDateTime.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,15 +15,14 @@
  * 
  * Java content class for AttributedDateTime complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-utility-1.0.xsd line 45)
- * 
                        
  * 
                        - * <complexType name="AttributedDateTime">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedDateTime">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedURI.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedURI.java
index fd3dd935c4..7a959d68cb 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedURI.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/AttributedURI.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,15 +15,14 @@
  * 
  * Java content class for AttributedURI complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-utility-1.0.xsd line 57)
- * 
                        
  * 
                        - * <complexType name="AttributedURI">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="AttributedURI">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/CreatedElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/CreatedElement.java
index 268c03a91e..395f525a5a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/CreatedElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/CreatedElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Created element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-utility-1.0.xsd line 101)
- * 
                        
  * 
                        - * <element name="Created" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}AttributedDateTime"/>
+ * <element name="Created" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}AttributedDateTime"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ExpiresElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ExpiresElement.java
index 5b5a529097..2f8304e82d 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ExpiresElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ExpiresElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,9 +15,8 @@
  * 
  * Java content class for Expires element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-utility-1.0.xsd line 94)
- * 
                        
  * 
                        - * <element name="Expires" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}AttributedDateTime"/>
+ * <element name="Expires" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}AttributedDateTime"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ObjectFactory.java
index 2fe13e0363..7ff1822b22 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -59,7 +60,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -78,7 +79,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -97,7 +98,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -109,7 +110,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of TimestampType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsu.TimestampType createTimestampType()
@@ -121,7 +122,7 @@ public com.sun.identity.wsfederation.jaxb.wsu.TimestampType createTimestampType(
     /**
      * Create an instance of AttributedDateTime
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsu.AttributedDateTime createAttributedDateTime()
@@ -133,7 +134,7 @@ public com.sun.identity.wsfederation.jaxb.wsu.AttributedDateTime createAttribute
     /**
      * Create an instance of CreatedElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsu.CreatedElement createCreatedElement()
@@ -145,7 +146,7 @@ public com.sun.identity.wsfederation.jaxb.wsu.CreatedElement createCreatedElemen
     /**
      * Create an instance of ExpiresElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsu.ExpiresElement createExpiresElement()
@@ -157,7 +158,7 @@ public com.sun.identity.wsfederation.jaxb.wsu.ExpiresElement createExpiresElemen
     /**
      * Create an instance of TimestampElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsu.TimestampElement createTimestampElement()
@@ -169,7 +170,7 @@ public com.sun.identity.wsfederation.jaxb.wsu.TimestampElement createTimestampEl
     /**
      * Create an instance of AttributedURI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.wsu.AttributedURI createAttributedURI()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampElement.java
index 93a6becbdd..90b48db150 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -15,9 +16,8 @@
  * 
  * Java content class for Timestamp element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-utility-1.0.xsd line 85)
- * 
                        
  * 
                        - * <element name="Timestamp" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}TimestampType"/>
+ * <element name="Timestamp" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}TimestampType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampType.java
index ae27c5b62f..acee7ce73a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/wsu/TimestampType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -14,22 +15,21 @@
  * 
  * Java content class for TimestampType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/oasis-200401-wss-wssecurity-utility-1.0.xsd line 70)
- * 
                        
  * 
                        - * <complexType name="TimestampType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
- *         <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <any/>
- *         </choice>
- *       </sequence>
- *       <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TimestampType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
+ *         <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *       <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodElement.java
index a48874247e..b95adfb4ac 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for CanonicalizationMethod element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 78)
- * 
                        
  * 
                        - * <element name="CanonicalizationMethod" type="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethodType"/>
+ * <element name="CanonicalizationMethod" type="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethodType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodType.java
index 0709486bda..ac31b87034 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/CanonicalizationMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for CanonicalizationMethodType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 79)
- * 
                        
  * 
                        - * <complexType name="CanonicalizationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CanonicalizationMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueElement.java
index 7efc2ea880..92eb308fae 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DSAKeyValue element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 292)
- * 
                        
  * 
                        - * <element name="DSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValueType"/>
+ * <element name="DSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValueType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueType.java
index 3568bd05ed..1cd8cd7cc1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DSAKeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,27 +13,26 @@
 /**
  * Java content class for DSAKeyValueType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 293)
- * 
                        
  * 
                        - * <complexType name="DSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <sequence minOccurs="0">
- *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <sequence minOccurs="0">
- *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <sequence minOccurs="0">
+ *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <sequence minOccurs="0">
+ *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodElement.java
index 51dd13c985..672d05641c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DigestMethod element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 130)
- * 
                        
  * 
                        - * <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
+ * <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodType.java
index 6277180aa2..f342b34a89 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for DigestMethodType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 131)
- * 
                        
  * 
                        - * <complexType name="DigestMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestValueElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestValueElement.java
index b94b19cbcd..7c330d0bca 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestValueElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/DigestValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for DigestValue element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 138)
- * 
                        
  * 
                        - * <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
+ * <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoElement.java
index 0e4fb407fd..b1a0fc6fae 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyInfo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 147)
- * 
                        
  * 
                        - * <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ * <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoType.java
index c33d2327f0..840d1dd1c1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for KeyInfoType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 148)
- * 
                        
  * 
                        - * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyNameElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyNameElement.java
index 415a478be9..4c26c5b4d0 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyNameElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyNameElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyName element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 163)
- * 
                        
  * 
                        - * <element name="KeyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="KeyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueElement.java
index 1f24aa0752..1cd64c927c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for KeyValue element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 166)
- * 
                        
  * 
                        - * <element name="KeyValue" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType"/>
+ * <element name="KeyValue" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueType.java
index 2bc6bfe697..31b70518ef 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/KeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for KeyValueType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 167)
- * 
                        
  * 
                        - * <complexType name="KeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         <any/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
+ *         <any/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestElement.java
index fcdc1c96ec..6a8102f6a1 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Manifest element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 256)
- * 
                        
  * 
                        - * <element name="Manifest" type="{http://www.w3.org/2000/09/xmldsig#}ManifestType"/>
+ * <element name="Manifest" type="{http://www.w3.org/2000/09/xmldsig#}ManifestType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestType.java
index f68dd35f13..b3550d330c 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ManifestType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for ManifestType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 257)
- * 
                        
  * 
                        - * <complexType name="ManifestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/MgmtDataElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/MgmtDataElement.java
index 94ead103d1..816f1decb8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/MgmtDataElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/MgmtDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for MgmtData element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 164)
- * 
                        
  * 
                        - * <element name="MgmtData" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="MgmtData" type="{http://www.w3.org/2001/XMLSchema}string"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectElement.java
index 252eb9e9af..b563e0915f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Object element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 246)
- * 
                        
  * 
                        - * <element name="Object" type="{http://www.w3.org/2000/09/xmldsig#}ObjectType"/>
+ * <element name="Object" type="{http://www.w3.org/2000/09/xmldsig#}ObjectType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectFactory.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectFactory.java
index d215340f01..9fe6cad269 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectFactory.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectFactory.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -128,7 +129,7 @@ public ObjectFactory() {
      *     the Class object of the javacontent interface to instantiate
      * @return
      *     a new instance
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public java.lang.Object newInstance(java.lang.Class javaContentInterface)
@@ -147,7 +148,7 @@ public java.lang.Object newInstance(java.lang.Class javaContentInterface)
      *     the name of the property to retrieve
      * @return
      *     the value of the requested property
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error retrieving the given property or value
      */
     public java.lang.Object getProperty(java.lang.String name)
@@ -166,7 +167,7 @@ public java.lang.Object getProperty(java.lang.String name)
      *     the name of the property to retrieve
      * @param value
      *     the value of the property to be set
-     * @throws PropertyException
+     * @throws javax.xml.bind.PropertyException
      *     when there is an error processing the given property or value
      */
     public void setProperty(java.lang.String name, java.lang.Object value)
@@ -178,7 +179,7 @@ public void setProperty(java.lang.String name, java.lang.Object value)
     /**
      * Create an instance of KeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.KeyValueElement createKeyValueElement()
@@ -190,7 +191,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.KeyValueElement createKeyValueE
     /**
      * Create an instance of SignaturePropertyElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertyElement createSignaturePropertyElement()
@@ -202,7 +203,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertyElement create
     /**
      * Create an instance of SignatureElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureElement createSignatureElement()
@@ -214,7 +215,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureElement createSignatur
     /**
      * Create an instance of X509IssuerSerialType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509IssuerSerialType createX509IssuerSerialType()
@@ -226,7 +227,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509IssuerSerialType createX509
     /**
      * Create an instance of KeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.KeyValueType createKeyValueType()
@@ -238,7 +239,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.KeyValueType createKeyValueType
     /**
      * Create an instance of KeyInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.KeyInfoType createKeyInfoType()
@@ -250,7 +251,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.KeyInfoType createKeyInfoType()
     /**
      * Create an instance of KeyNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.KeyNameElement createKeyNameElement()
@@ -262,7 +263,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.KeyNameElement createKeyNameEle
     /**
      * Create an instance of KeyNameElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.KeyNameElement createKeyNameElement(java.lang.String value)
@@ -274,7 +275,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.KeyNameElement createKeyNameEle
     /**
      * Create an instance of DigestMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.DigestMethodType createDigestMethodType()
@@ -286,7 +287,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.DigestMethodType createDigestMe
     /**
      * Create an instance of X509DataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataElement createX509DataElement()
@@ -298,7 +299,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataElement createX509DataE
     /**
      * Create an instance of RSAKeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.RSAKeyValueType createRSAKeyValueType()
@@ -310,7 +311,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.RSAKeyValueType createRSAKeyVal
     /**
      * Create an instance of PGPDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.PGPDataElement createPGPDataElement()
@@ -322,7 +323,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.PGPDataElement createPGPDataEle
     /**
      * Create an instance of TransformTypeXPath
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.TransformType.XPath createTransformTypeXPath()
@@ -334,7 +335,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.TransformType.XPath createTrans
     /**
      * Create an instance of TransformTypeXPath
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.TransformType.XPath createTransformTypeXPath(java.lang.String value)
@@ -346,7 +347,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.TransformType.XPath createTrans
     /**
      * Create an instance of SignatureMethodTypeHMACOutputLength
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodType.HMACOutputLength createSignatureMethodTypeHMACOutputLength()
@@ -358,7 +359,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodType.HMACOutputL
     /**
      * Create an instance of SignatureMethodTypeHMACOutputLength
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodType.HMACOutputLength createSignatureMethodTypeHMACOutputLength(java.math.BigInteger value)
@@ -370,7 +371,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodType.HMACOutputL
     /**
      * Create an instance of SignatureType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureType createSignatureType()
@@ -382,7 +383,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureType createSignatureTy
     /**
      * Create an instance of RSAKeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.RSAKeyValueElement createRSAKeyValueElement()
@@ -394,7 +395,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.RSAKeyValueElement createRSAKey
     /**
      * Create an instance of SignatureMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodType createSignatureMethodType()
@@ -406,7 +407,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodType createSigna
     /**
      * Create an instance of TransformElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.TransformElement createTransformElement()
@@ -418,7 +419,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.TransformElement createTransfor
     /**
      * Create an instance of ObjectElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.ObjectElement createObjectElement()
@@ -430,7 +431,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.ObjectElement createObjectEleme
     /**
      * Create an instance of DSAKeyValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.DSAKeyValueType createDSAKeyValueType()
@@ -442,7 +443,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.DSAKeyValueType createDSAKeyVal
     /**
      * Create an instance of TransformType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.TransformType createTransformType()
@@ -454,7 +455,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.TransformType createTransformTy
     /**
      * Create an instance of SignatureValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureValueElement createSignatureValueElement()
@@ -466,7 +467,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureValueElement createSig
     /**
      * Create an instance of TransformsElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.TransformsElement createTransformsElement()
@@ -478,7 +479,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.TransformsElement createTransfo
     /**
      * Create an instance of X509DataTypeX509CRL
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509CRL createX509DataTypeX509CRL()
@@ -490,7 +491,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509CRL createX509
     /**
      * Create an instance of X509DataTypeX509CRL
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509CRL createX509DataTypeX509CRL(byte[] value)
@@ -502,7 +503,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509CRL createX509
     /**
      * Create an instance of X509DataTypeX509IssuerSerial
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509IssuerSerial createX509DataTypeX509IssuerSerial()
@@ -514,7 +515,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509IssuerSerial c
     /**
      * Create an instance of SignedInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignedInfoElement createSignedInfoElement()
@@ -526,7 +527,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignedInfoElement createSignedI
     /**
      * Create an instance of X509DataTypeX509Certificate
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509Certificate createX509DataTypeX509Certificate()
@@ -538,7 +539,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509Certificate cr
     /**
      * Create an instance of X509DataTypeX509Certificate
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509Certificate createX509DataTypeX509Certificate(byte[] value)
@@ -550,7 +551,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509Certificate cr
     /**
      * Create an instance of TransformsType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.TransformsType createTransformsType()
@@ -562,7 +563,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.TransformsType createTransforms
     /**
      * Create an instance of SPKIDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataType createSPKIDataType()
@@ -574,7 +575,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataType createSPKIDataType
     /**
      * Create an instance of SignatureValueType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureValueType createSignatureValueType()
@@ -586,7 +587,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureValueType createSignat
     /**
      * Create an instance of ReferenceType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.ReferenceType createReferenceType()
@@ -598,7 +599,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.ReferenceType createReferenceTy
     /**
      * Create an instance of RetrievalMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.RetrievalMethodType createRetrievalMethodType()
@@ -610,7 +611,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.RetrievalMethodType createRetri
     /**
      * Create an instance of X509DataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType createX509DataType()
@@ -622,7 +623,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType createX509DataType
     /**
      * Create an instance of SPKIDataTypeSPKISexp
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTypeSPKISexp()
@@ -634,7 +635,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataType.SPKISexp createSPK
     /**
      * Create an instance of SPKIDataTypeSPKISexp
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataType.SPKISexp createSPKIDataTypeSPKISexp(byte[] value)
@@ -646,7 +647,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataType.SPKISexp createSPK
     /**
      * Create an instance of KeyInfoElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.KeyInfoElement createKeyInfoElement()
@@ -658,7 +659,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.KeyInfoElement createKeyInfoEle
     /**
      * Create an instance of X509DataTypeX509SubjectName
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SubjectName createX509DataTypeX509SubjectName()
@@ -670,7 +671,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SubjectName cr
     /**
      * Create an instance of X509DataTypeX509SubjectName
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SubjectName createX509DataTypeX509SubjectName(java.lang.String value)
@@ -682,7 +683,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SubjectName cr
     /**
      * Create an instance of DigestValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.DigestValueElement createDigestValueElement()
@@ -694,7 +695,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.DigestValueElement createDigest
     /**
      * Create an instance of DigestValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.DigestValueElement createDigestValueElement(byte[] value)
@@ -706,7 +707,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.DigestValueElement createDigest
     /**
      * Create an instance of SignedInfoType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignedInfoType createSignedInfoType()
@@ -718,7 +719,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignedInfoType createSignedInfo
     /**
      * Create an instance of CanonicalizationMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.CanonicalizationMethodElement createCanonicalizationMethodElement()
@@ -730,7 +731,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.CanonicalizationMethodElement c
     /**
      * Create an instance of SignatureMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodElement createSignatureMethodElement()
@@ -742,7 +743,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignatureMethodElement createSi
     /**
      * Create an instance of SignaturePropertyType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertyType createSignaturePropertyType()
@@ -754,7 +755,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertyType createSig
     /**
      * Create an instance of DigestMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.DigestMethodElement createDigestMethodElement()
@@ -766,7 +767,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.DigestMethodElement createDiges
     /**
      * Create an instance of DSAKeyValueElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.DSAKeyValueElement createDSAKeyValueElement()
@@ -778,7 +779,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.DSAKeyValueElement createDSAKey
     /**
      * Create an instance of ReferenceElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.ReferenceElement createReferenceElement()
@@ -790,7 +791,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.ReferenceElement createReferenc
     /**
      * Create an instance of MgmtDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.MgmtDataElement createMgmtDataElement()
@@ -802,7 +803,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.MgmtDataElement createMgmtDataE
     /**
      * Create an instance of MgmtDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.MgmtDataElement createMgmtDataElement(java.lang.String value)
@@ -814,7 +815,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.MgmtDataElement createMgmtDataE
     /**
      * Create an instance of CanonicalizationMethodType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.CanonicalizationMethodType createCanonicalizationMethodType()
@@ -826,7 +827,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.CanonicalizationMethodType crea
     /**
      * Create an instance of ManifestType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.ManifestType createManifestType()
@@ -838,7 +839,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.ManifestType createManifestType
     /**
      * Create an instance of SignaturePropertiesElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertiesElement createSignaturePropertiesElement()
@@ -850,7 +851,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertiesElement crea
     /**
      * Create an instance of RetrievalMethodElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.RetrievalMethodElement createRetrievalMethodElement()
@@ -862,7 +863,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.RetrievalMethodElement createRe
     /**
      * Create an instance of SignaturePropertiesType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertiesType createSignaturePropertiesType()
@@ -874,7 +875,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SignaturePropertiesType createS
     /**
      * Create an instance of PGPDataType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.PGPDataType createPGPDataType()
@@ -886,7 +887,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.PGPDataType createPGPDataType()
     /**
      * Create an instance of ManifestElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.ManifestElement createManifestElement()
@@ -898,7 +899,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.ManifestElement createManifestE
     /**
      * Create an instance of SPKIDataElement
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataElement createSPKIDataElement()
@@ -910,7 +911,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.SPKIDataElement createSPKIDataE
     /**
      * Create an instance of X509DataTypeX509SKI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SKI createX509DataTypeX509SKI()
@@ -922,7 +923,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SKI createX509
     /**
      * Create an instance of X509DataTypeX509SKI
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SKI createX509DataTypeX509SKI(byte[] value)
@@ -934,7 +935,7 @@ public com.sun.identity.wsfederation.jaxb.xmlsig.X509DataType.X509SKI createX509
     /**
      * Create an instance of ObjectType
      * 
-     * @throws JAXBException
+     * @throws javax.xml.bind.JAXBException
      *     if an error occurs
      */
     public com.sun.identity.wsfederation.jaxb.xmlsig.ObjectType createObjectType()
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectType.java
index 442a0af5ce..c7d070c2fc 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ObjectType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for ObjectType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 247)
- * 
                        
  * 
                        - * <complexType name="ObjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </sequence>
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataElement.java
index dcafe3ad7e..3441e6a515 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for PGPData element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 211)
- * 
                        
  * 
                        - * <element name="PGPData" type="{http://www.w3.org/2000/09/xmldsig#}PGPDataType"/>
+ * <element name="PGPData" type="{http://www.w3.org/2000/09/xmldsig#}PGPDataType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataType.java
index d67d864bee..acb1a8343f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/PGPDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,25 +13,24 @@
 /**
  * Java content class for PGPDataType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 212)
- * 
                        
  * 
                        - * <complexType name="PGPDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *           <any/>
- *         </sequence>
- *         <sequence>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PGPDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *           <any/>
+ *         </sequence>
+ *         <sequence>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </sequence>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueElement.java
index 1ada624070..d3cf0fca38 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RSAKeyValue element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 309)
- * 
                        
  * 
                        - * <element name="RSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValueType"/>
+ * <element name="RSAKeyValue" type="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValueType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueType.java
index 106ae14499..d0545f20be 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RSAKeyValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for RSAKeyValueType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 310)
- * 
                        
  * 
                        - * <complexType name="RSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceElement.java
index 57f027788f..162fd236c8 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Reference element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 99)
- * 
                        
  * 
                        - * <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
+ * <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceType.java
index 749b912bf8..c093bb7770 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/ReferenceType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,22 +13,21 @@
 /**
  * Java content class for ReferenceType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 100)
- * 
                        
  * 
                        - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodElement.java
index f929d791f5..a6be590b30 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for RetrievalMethod element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 175)
- * 
                        
  * 
                        - * <element name="RetrievalMethod" type="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethodType"/>
+ * <element name="RetrievalMethod" type="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethodType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodType.java
index 09fc85fb90..e18e3cd904 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/RetrievalMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for RetrievalMethodType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 176)
- * 
                        
  * 
                        - * <complexType name="RetrievalMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RetrievalMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataElement.java
index d74d285773..bfa4ba17ca 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SPKIData element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 232)
- * 
                        
  * 
                        - * <element name="SPKIData" type="{http://www.w3.org/2000/09/xmldsig#}SPKIDataType"/>
+ * <element name="SPKIData" type="{http://www.w3.org/2000/09/xmldsig#}SPKIDataType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataType.java
index de203f32aa..d86d097556 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SPKIDataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SPKIDataType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 233)
- * 
                        
  * 
                        - * <complexType name="SPKIDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPKIDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
@@ -58,9 +58,8 @@ public interface SPKIDataType {
     /**
      * Java content class for SPKISexp element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 235)
-     * 
                        
      * 
                        -     * <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                        
      * 
      */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureElement.java
index eed24562be..9ea22cec9f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Signature element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 46)
- * 
                        
  * 
                        - * <element name="Signature" type="{http://www.w3.org/2000/09/xmldsig#}SignatureType"/>
+ * <element name="Signature" type="{http://www.w3.org/2000/09/xmldsig#}SignatureType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodElement.java
index e0ddf8f773..4302e98fcd 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureMethod element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 87)
- * 
                        
  * 
                        - * <element name="SignatureMethod" type="{http://www.w3.org/2000/09/xmldsig#}SignatureMethodType"/>
+ * <element name="SignatureMethod" type="{http://www.w3.org/2000/09/xmldsig#}SignatureMethodType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodType.java
index 5d04c00f37..97d29660bb 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureMethodType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SignatureMethodType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 88)
- * 
                        
  * 
                        - * <complexType name="SignatureMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
@@ -78,9 +78,8 @@ public interface SignatureMethodType {
     /**
      * Java content class for HMACOutputLength element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 90)
-     * 
                        
      * 
                        -     * <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"/>
+     * <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType"/>
      * 
                        
      * 
      */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesElement.java
index 709c3ee63c..991834f732 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureProperties element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 264)
- * 
                        
  * 
                        - * <element name="SignatureProperties" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertiesType"/>
+ * <element name="SignatureProperties" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertiesType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesType.java
index 065df77288..59c0fe9a2f 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertiesType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for SignaturePropertiesType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 265)
- * 
                        
  * 
                        - * <complexType name="SignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyElement.java
index ce68898e82..ddfbc147c3 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureProperty element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 272)
- * 
                        
  * 
                        - * <element name="SignatureProperty" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertyType"/>
+ * <element name="SignatureProperty" type="{http://www.w3.org/2000/09/xmldsig#}SignaturePropertyType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyType.java
index c182180a90..97ad571bbe 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignaturePropertyType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for SignaturePropertyType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 273)
- * 
                        
  * 
                        - * <complexType name="SignaturePropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureType.java
index 889747b308..865b197550 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,21 +13,20 @@
 /**
  * Java content class for SignatureType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 47)
- * 
                        
  * 
                        - * <complexType name="SignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueElement.java
index 783c0bad4f..4496ee3c7a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignatureValue element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 57)
- * 
                        
  * 
                        - * <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
+ * <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueType.java
index 517e60df27..ae572a299e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignatureValueType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,15 +13,14 @@
 /**
  * Java content class for SignatureValueType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 58)
- * 
                        
  * 
                        - * <complexType name="SignatureValueType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="SignatureValueType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoElement.java
index 7c8dfa5623..b1b94271fb 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for SignedInfo element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 68)
- * 
                        
  * 
                        - * <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
+ * <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoType.java
index 1442acaabc..2972398f7e 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/SignedInfoType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,20 +13,19 @@
 /**
  * Java content class for SignedInfoType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 69)
- * 
                        
  * 
                        - * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformElement.java
index 5c6a8c62b8..794c1c8ef7 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Transform element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 118)
- * 
                        
  * 
                        - * <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType"/>
+ * <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformType.java
index 94532ae567..ae7548b517 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,19 +13,18 @@
 /**
  * Java content class for TransformType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 119)
- * 
                        
  * 
                        - * <complexType name="TransformType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </choice>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </choice>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
@@ -78,9 +78,8 @@ public interface TransformType {
     /**
      * Java content class for XPath element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 123)
-     * 
                        
      * 
                        -     * <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     * <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
      * 
                        
      * 
      */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsElement.java
index e43722e30d..f1566fdd74 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for Transforms element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 111)
- * 
                        
  * 
                        - * <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
+ * <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsType.java
index 625bcb5076..1884be90ce 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/TransformsType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,17 +13,16 @@
 /**
  * Java content class for TransformsType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 112)
- * 
                        
  * 
                        - * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataElement.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataElement.java
index 2b61894f1e..9c91976093 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataElement.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataElement.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,9 +13,8 @@
 /**
  * Java content class for X509Data element declaration.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 186)
- * 
                        
  * 
                        - * <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
+ * <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
  * 
                        
  * 
  */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataType.java
index 8d4eccaf1f..2b1207c22a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509DataType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,24 +13,23 @@
 /**
  * Java content class for X509DataType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 187)
- * 
                        
  * 
                        - * <complexType name="X509DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <choice>
- *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509DataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <choice>
+ *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
@@ -68,9 +68,8 @@ public interface X509DataType {
     /**
      * Java content class for X509CRL element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 194)
-     * 
                        
      * 
                        -     * <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                        
      * 
      */
@@ -103,9 +102,8 @@ public interface X509CRL
     /**
      * Java content class for X509Certificate element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 193)
-     * 
                        
      * 
                        -     * <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                        
      * 
      */
@@ -138,9 +136,8 @@ public interface X509Certificate
     /**
      * Java content class for X509IssuerSerial element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 190)
-     * 
                        
      * 
                        -     * <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+     * <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
      * 
                        
      * 
      */
@@ -155,9 +152,8 @@ public interface X509IssuerSerial
     /**
      * Java content class for X509SKI element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 191)
-     * 
                        
      * 
                        -     * <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+     * <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
      * 
                        
      * 
      */
@@ -190,9 +186,8 @@ public interface X509SKI
     /**
      * Java content class for X509SubjectName element declaration.
      * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 192)
-     * 
                        
      * 
                        -     * <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     * <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
      * 
                        
      * 
      */
diff --git a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509IssuerSerialType.java b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509IssuerSerialType.java
index 446212a830..7025365a3a 100644
--- a/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509IssuerSerialType.java
+++ b/openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/xmlsig/X509IssuerSerialType.java
@@ -3,6 +3,7 @@
 // See http://java.sun.com/xml/jaxb 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
 // Generated on: 2012.06.11 at 10:34:16 AM PDT 
+// Portions Copyrighted 2026 3A Systems, LLC
 //
 
 
@@ -12,18 +13,17 @@
 /**
  * Java content class for X509IssuerSerialType complex type.
  * 
                        The following schema fragment specifies the expected content contained within this java content object. (defined at file:/Users/allan/A-SVN/trunk/opensso/products/federation/library/xsd/wsfederation/xmldsig-core-schema.xsd line 200)
- * 
                        
  * 
                        - * <complexType name="X509IssuerSerialType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509IssuerSerialType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  */
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..6277faa639 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,16 +51,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AdviceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignment" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="AdviceId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AdviceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignment" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="AdviceId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..bf07352011 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -51,17 +52,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AdviceExpressionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignmentExpression" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="AdviceId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="AppliesTo" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}EffectType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AdviceExpressionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignmentExpression" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="AdviceId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="AppliesTo" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}EffectType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..73983443d1 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AdviceExpressionsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpression" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AdviceExpressionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpression" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..5c39ca012b 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -49,15 +50,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AllOfType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Match"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AllOfType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Match"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..26950e2c49 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AnyOfType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AllOf"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnyOfType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AllOf"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..215cde2d23 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -52,17 +53,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ApplyType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="FunctionId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ApplyType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="FunctionId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..49d8758ec3 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AssociatedAdviceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Advice" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AssociatedAdviceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Advice" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..07482da934 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,18 +51,18 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="IncludeInResult" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="IncludeInResult" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..ce923c10fe 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,15 +48,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributeAssignmentType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValueType">
- *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Category" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeAssignmentType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValueType">
+ *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Category" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..88850be23e 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -49,18 +50,18 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributeAssignmentExpressionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression"/>
- *       </sequence>
- *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Category" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeAssignmentExpressionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression"/>
+ *       </sequence>
+ *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Category" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..32e94bcc3a 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,17 +48,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributeDesignatorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
- *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="MustBePresent" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeDesignatorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
+ *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="MustBePresent" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..5dcb1d0b64 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,17 +48,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributeSelectorType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
- *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="ContextSelectorId" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Path" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="MustBePresent" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeSelectorType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
+ *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="ContextSelectorId" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Path" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="MustBePresent" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..97be976e21 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -57,16 +58,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributeValueType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeValueType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..6d9d2929a9 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -53,18 +54,18 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Content" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}id"/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Content" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}id"/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..5704449bc9 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,13 +49,13 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="AttributesReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="ReferenceId" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributesReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="ReferenceId" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..59d0b9a48e 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,16 +48,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="CombinerParameterType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue"/>
- *       </sequence>
- *       <attribute name="ParameterName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CombinerParameterType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue"/>
+ *       </sequence>
+ *       <attribute name="ParameterName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..f196797bf7 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -49,15 +50,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="CombinerParametersType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParameter" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CombinerParametersType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParameter" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..08ed7ff8dc 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,15 +48,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ConditionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConditionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..252f5f69c0 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,15 +51,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ContentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ContentType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..afc584bc0d 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -43,16 +44,15 @@
  * 
                        Java class for DecisionType.
  * 
  * 
                        The following schema fragment specifies the expected content contained within this class.
- * 
                        
  * 
                        - * <simpleType name="DecisionType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Permit"/>
- *     <enumeration value="Deny"/>
- *     <enumeration value="Indeterminate"/>
- *     <enumeration value="NotApplicable"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="DecisionType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="Permit"/>
+ *     <enumeration value="Deny"/>
+ *     <enumeration value="Indeterminate"/>
+ *     <enumeration value="NotApplicable"/>
+ *   </restriction>
+ * </simpleType>
  * 
                        
  * 
  */
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..a2c488d435 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,17 +48,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="DefaultsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}XPathVersion"/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DefaultsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}XPathVersion"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..87c06e462d 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -43,14 +44,13 @@
  * 
                        Java class for EffectType.
  * 
  * 
                        The following schema fragment specifies the expected content contained within this class.
- * 
                        
  * 
                        - * <simpleType name="EffectType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Permit"/>
- *     <enumeration value="Deny"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="EffectType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="Permit"/>
+ *     <enumeration value="Deny"/>
+ *   </restriction>
+ * </simpleType>
  * 
                        
  * 
  */
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..74f7a27a05 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,12 +47,12 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ExpressionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ExpressionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..43666765b7 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,13 +48,13 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="FunctionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
- *       <attribute name="FunctionId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FunctionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
+ *       <attribute name="FunctionId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..eb7ae166cc 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="IdReferenceType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="Version" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionMatchType" />
- *       <attribute name="EarliestVersion" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionMatchType" />
- *       <attribute name="LatestVersion" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionMatchType" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="IdReferenceType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="Version" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionMatchType" />
+ *       <attribute name="EarliestVersion" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionMatchType" />
+ *       <attribute name="LatestVersion" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionMatchType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..f41d9b18b2 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,20 +49,20 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="MatchType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue"/>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeDesignator"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeSelector"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="MatchId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MatchType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue"/>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeDesignator"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeSelector"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="MatchId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..ec6bd68508 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,19 +51,19 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="MissingAttributeDetailType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MissingAttributeDetailType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Category" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="AttributeId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="DataType" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..c63e4d697b 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="MultiRequestsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}RequestReference" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MultiRequestsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}RequestReference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..0877463212 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,16 +51,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ObligationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignment" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ObligationId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObligationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignment" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ObligationId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..d6326ea5a2 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,17 +51,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ObligationExpressionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignmentExpression" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ObligationId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="FulfillOn" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}EffectType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObligationExpressionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributeAssignmentExpression" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ObligationId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="FulfillOn" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}EffectType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..23bd3aa6ae 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ObligationExpressionsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpression" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObligationExpressionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpression" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..fb04fb9566 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ObligationsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Obligation" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObligationsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Obligation" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..9cf0341eaa 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -52,30 +53,30 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="PolicyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIssuer" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyDefaults" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Target"/>
- *         <choice maxOccurs="unbounded">
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParameters" minOccurs="0"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}RuleCombinerParameters" minOccurs="0"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VariableDefinition"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Rule"/>
- *         </choice>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpressions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpressions" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="PolicyId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Version" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionType" />
- *       <attribute name="RuleCombiningAlgId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="MaxDelegationDepth" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PolicyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIssuer" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyDefaults" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Target"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParameters" minOccurs="0"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}RuleCombinerParameters" minOccurs="0"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VariableDefinition"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Rule"/>
+ *         </choice>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpressions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpressions" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="PolicyId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Version" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionType" />
+ *       <attribute name="RuleCombiningAlgId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="MaxDelegationDepth" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..b3068f003d 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,13 +48,13 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="PolicyCombinerParametersType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParametersType">
- *       <attribute name="PolicyIdRef" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PolicyCombinerParametersType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParametersType">
+ *       <attribute name="PolicyIdRef" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..9cfe6fabe1 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,16 +51,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="PolicyIdentifierListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIdReference"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetIdReference"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PolicyIdentifierListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIdReference"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetIdReference"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..c8cee12fd1 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,16 +49,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="PolicyIssuerType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Content" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PolicyIssuerType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Content" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attribute" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..5ebf8759a6 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -54,33 +55,33 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="PolicySetType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIssuer" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetDefaults" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Target"/>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySet"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Policy"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetIdReference"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIdReference"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParameters"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyCombinerParameters"/>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetCombinerParameters"/>
- *         </choice>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpressions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpressions" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="PolicySetId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Version" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionType" />
- *       <attribute name="PolicyCombiningAlgId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="MaxDelegationDepth" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PolicySetType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIssuer" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetDefaults" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Target"/>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySet"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Policy"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetIdReference"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIdReference"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParameters"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyCombinerParameters"/>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicySetCombinerParameters"/>
+ *         </choice>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpressions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpressions" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="PolicySetId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Version" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}VersionType" />
+ *       <attribute name="PolicyCombiningAlgId" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="MaxDelegationDepth" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..eb022c29df 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,13 +48,13 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="PolicySetCombinerParametersType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParametersType">
- *       <attribute name="PolicySetIdRef" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PolicySetCombinerParametersType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParametersType">
+ *       <attribute name="PolicySetIdRef" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..4f53ae4a2c 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -56,19 +57,19 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="RequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}RequestDefaults" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attributes" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}MultiRequests" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ReturnPolicyIdList" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="CombinedDecision" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}RequestDefaults" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attributes" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}MultiRequests" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ReturnPolicyIdList" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       <attribute name="CombinedDecision" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..e196d7f2bf 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,17 +48,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="RequestDefaultsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice>
- *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}XPathVersion"/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestDefaultsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}XPathVersion"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..b6df15535b 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="RequestReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributesReference" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AttributesReference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..525b723ec1 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,15 +47,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Result" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Result" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..6abfd20a33 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -49,20 +50,20 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="ResultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Decision"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Status" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Obligations" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AssociatedAdvice" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attributes" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIdentifierList" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Decision"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Status" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Obligations" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AssociatedAdvice" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Attributes" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}PolicyIdentifierList" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..c7dcb482a7 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,21 +48,21 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="RuleType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Target" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Condition" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpressions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpressions" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="RuleId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Effect" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}EffectType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RuleType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Description" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Target" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Condition" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ObligationExpressions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AdviceExpressions" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="RuleId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Effect" use="required" type="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}EffectType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..0b8e035976 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,13 +47,13 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="RuleCombinerParametersType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParametersType">
- *       <attribute name="RuleIdRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RuleCombinerParametersType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}CombinerParametersType">
+ *       <attribute name="RuleIdRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..82827fc057 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,17 +47,17 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="StatusType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusCode"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusMessage" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusDetail" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusCode"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusMessage" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusDetail" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..a4225edaa4 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,16 +49,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="StatusCodeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusCode" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusCodeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}StatusCode" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..113d1a91ff 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,15 +51,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="StatusDetailType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusDetailType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..1151f3abeb 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,15 +49,15 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="TargetType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AnyOf"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TargetType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}AnyOf"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..6c5c55fcb2 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,16 +49,16 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="VariableDefinitionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression"/>
- *       </sequence>
- *       <attribute name="VariableId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VariableDefinitionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}Expression"/>
+ *       </sequence>
+ *       <attribute name="VariableId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..6edea28b40 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,13 +47,13 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <complexType name="VariableReferenceType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
- *       <attribute name="VariableId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VariableReferenceType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:xacml:3.0:core:schema:wd-17}ExpressionType">
+ *       <attribute name="VariableId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
                        
  * 
  * 
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..2f8d43c58b 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,11 +47,11 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <simpleType name="VersionType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <pattern value="(\d+\.)*\d+"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="VersionType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <pattern value="(\d+\.)*\d+"/>
+ *   </restriction>
+ * </simpleType>
  * 
                        
  * 
  * 
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..b388255629 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
@@ -3,6 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,11 +47,11 @@
  * 
                        The following schema fragment specifies the expected content contained within this class.
  * 
  * 
                        - * <simpleType name="VersionMatchType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <pattern value="((\d+|\*)\.)*(\d+|\*|\+)"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="VersionMatchType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <pattern value="((\d+|\*)\.)*(\d+|\*|\+)"/>
+ *   </restriction>
+ * </simpleType>
  * 
                        
  * 
  * 
diff --git a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ChainedBindings.java b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ChainedBindings.java
index cb7c0570bb..927705f3d6 100644
--- a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ChainedBindings.java
+++ b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ChainedBindings.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.scripting;
@@ -31,7 +32,7 @@
  * the current scope first, and then in the parent scope. Setting a variable always does so in the current scope.
  * Each scope bindings object is held as a reference to the original bindings objects passed to the constructor.
  * Therefore any changes made to a variable will be reflected in the current scope.
- * 
                        
+ * 
                        
  * Note: chained scopes effectively act as a linked list. Therefore performance for getting/setting variables will
  * decrease roughly linearly with the number of chained scopes (assuming constant access times within each individual
  * scope).
diff --git a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEngineConfiguration.java b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEngineConfiguration.java
index 35fb675c5f..0554a72767 100644
--- a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEngineConfiguration.java
+++ b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEngineConfiguration.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.scripting;
@@ -57,7 +58,7 @@ public final class ScriptEngineConfiguration {
     /**
      * Constructs a script configuration with the given parameters.
      *
-     * @param scriptExecutionTimeout the maximum length of time to allow a script to run, in seconds. Must be >= 0.
+     * @param scriptExecutionTimeout the maximum length of time to allow a script to run, in seconds. Must be {@code >= 0}.
      * @param classWhiteList a list of patterns of allowed java classes that can be loaded or accessed by the script.
      *                       May not be null. May be empty to deny access to all Java classes (i.e., pure script only).
      * @param classBlackList a list of patterns of disallowed java classes that cannot be loaded or accessed by the
@@ -277,7 +278,7 @@ public static final class Builder {
          * Sets the maximum amount of time (in seconds) to allow a script to execute before interrupting it. Use
          * {@link #NO_TIMEOUT} for no timeout.
          *
-         * @param timeout the script execution timeout. Must be >= 0.
+         * @param timeout the script execution timeout. Must be {@code >= 0}.
          * @param unit the time units of the timeout.
          * @return this.
          */
@@ -339,7 +340,7 @@ public Builder withSystemSecurityManager() {
          * {@link org.forgerock.openam.scripting.ThreadPoolScriptEvaluator}). This is the number of threads that will
          * be created to service requests before new requests are queued.
          *
-         * @param coreSize the number of threads to keep in the thread pool. Must be >= 1.
+         * @param coreSize the number of threads to keep in the thread pool. Must be {@code >= 1}.
          * @return this.
          */
         public Builder withThreadPoolCoreSize(final int coreSize) {
diff --git a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEvaluator.java b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEvaluator.java
index 30f804e276..ab9b0c238d 100644
--- a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEvaluator.java
+++ b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ScriptEvaluator.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.scripting;
@@ -29,7 +30,7 @@ public interface ScriptEvaluator {
     /**
      * Evaluates the given script object using an appropriate script engine for the language of the script. Any
      * bindings associated with the script will be passed to the engine when the script is evaluated.
-     * 
                        
+     * 
                        
      * There are three scope levels at which variables can be set:
      * 
                          
      *     
                        1. Global variables are set using the {@link #bindVariableInGlobalScope(String, Object)} method,
diff --git a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluator.java b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluator.java
index 0229652d6c..b31e292a60 100644
--- a/openam-scripting/src/main/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluator.java
+++ b/openam-scripting/src/main/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluator.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.scripting;
@@ -123,7 +123,7 @@ public void bindVariableInGlobalScope(final String name, final Object object) {
      * requested so may resize over a period of time. If the thread pool is not reconfigurable, or if the new
      * configuration parameters are not valid, then an error is logged and the pool is left in its original
      * configuration.
-     * 
                          
+     * 
                          
      * NB: All settings can be changed without a restart and the pool will adjust over time to the new settings.
      */
     private static final class ThreadPoolConfigurator implements StandardScriptEngineManager.ConfigurationListener {
diff --git a/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/GroovyHttpClient.java b/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/GroovyHttpClient.java
index 372fb09d46..3d31459034 100644
--- a/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/GroovyHttpClient.java
+++ b/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/GroovyHttpClient.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2010-2016 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.scripting.api.http;
@@ -56,7 +56,7 @@ public GroovyHttpClient(@Named(SCRIPTING_HTTP_CLIENT_NAME) Client client) {
      * @param uri URI of resource to be accessed
      * @param requestData Data to be sent during the request
      * @return The response from the REST call
-     * @throws UnsupportedEncodingException
+     * @throws UnsupportedEncodingException if the request data cannot be encoded
      */
     public HttpClientResponse get(String uri, Map>> requestData)
             throws UnsupportedEncodingException {
@@ -69,7 +69,7 @@ public HttpClientResponse get(String uri, Map>>
      * @param body The body of the http request
      * @param requestData Data to be sent during the request
      * @return The response from the REST call
-     * @throws UnsupportedEncodingException
+     * @throws UnsupportedEncodingException if the request data cannot be encoded
      */
     public HttpClientResponse post(String uri, String body, Map>> requestData)
             throws UnsupportedEncodingException {
diff --git a/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/JavaScriptHttpClient.java b/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/JavaScriptHttpClient.java
index 1a009bd50c..0f8628d514 100644
--- a/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/JavaScriptHttpClient.java
+++ b/openam-scripting/src/main/java/org/forgerock/openam/scripting/api/http/JavaScriptHttpClient.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2010-2016 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openam.scripting.api.http;
@@ -57,7 +57,7 @@ public JavaScriptHttpClient(@Named(SCRIPTING_HTTP_CLIENT_NAME) Client client) {
      * @param uri URI of resource to be accessed
      * @param requestData Data to be sent during the request
      * @return The response from the REST call
-     * @throws UnsupportedEncodingException
+     * @throws UnsupportedEncodingException if the request data cannot be encoded
      */
     public HttpClientResponse get(String uri, NativeObject requestData) throws UnsupportedEncodingException {
         DEBUG.warning("'get' has been deprecated. Use 'send' instead");
@@ -69,7 +69,7 @@ public HttpClientResponse get(String uri, NativeObject requestData) throws Unsup
      * @param body The body of the http request
      * @param requestData Data to be sent during the request
      * @return The response from the REST call
-     * @throws UnsupportedEncodingException
+     * @throws UnsupportedEncodingException if the request data cannot be encoded
      */
     public HttpClientResponse post(String uri, String body, NativeObject requestData)
             throws UnsupportedEncodingException {
diff --git a/openam-scripting/src/main/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutter.java b/openam-scripting/src/main/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutter.java
index d1c88354b7..a1af6c6671 100644
--- a/openam-scripting/src/main/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutter.java
+++ b/openam-scripting/src/main/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutter.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.scripting.sandbox;
@@ -55,7 +56,7 @@ public RhinoSandboxClassShutter(final SecurityManager securityManager, final Lis
 
     /**
      * {@inheritDoc}
-     * 
                          
+     * 
                          
      * This implementation first checks whether the class/package is allowed by the configured security manager
      * (if one is set). Then it checks that the class name matches at least one white-list pattern. Finally, it
      * checks that the class name does not match any of the black-list patterns. Only if all three checks pass is the
diff --git a/openam-selfservice/src/main/java/org/forgerock/openam/selfservice/config/beans/SecurityQuestionTransformer.java b/openam-selfservice/src/main/java/org/forgerock/openam/selfservice/config/beans/SecurityQuestionTransformer.java
index 869d16b730..c045179232 100644
--- a/openam-selfservice/src/main/java/org/forgerock/openam/selfservice/config/beans/SecurityQuestionTransformer.java
+++ b/openam-selfservice/src/main/java/org/forgerock/openam/selfservice/config/beans/SecurityQuestionTransformer.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.selfservice.config.beans;
@@ -26,7 +27,7 @@
 
 /**
  * Security question transformer.
- * 
                          
+ * 
                          
  * Expected string format is 
                          id|locale|question
                          .
  *
  * @since 13.0.0
diff --git a/openam-server-auth-ui/src/main/java/com/sun/identity/authentication/UI/AuthenticationServletBase.java b/openam-server-auth-ui/src/main/java/com/sun/identity/authentication/UI/AuthenticationServletBase.java
index f46ccd64bf..abd7fc70cb 100644
--- a/openam-server-auth-ui/src/main/java/com/sun/identity/authentication/UI/AuthenticationServletBase.java
+++ b/openam-server-auth-ui/src/main/java/com/sun/identity/authentication/UI/AuthenticationServletBase.java
@@ -28,7 +28,7 @@
 
 /**
  * Portions Copyrighted 2012-2014 ForgeRock AS
- * Portions Copyrighted 2025 3A Systems LLC.
+ * Portions Copyrighted 2025-2026 3A Systems LLC.
  */
 package com.sun.identity.authentication.UI;
 
@@ -63,7 +63,7 @@ public AuthenticationServletBase() {
      *
      * @param requestContext - request context
      * @param handlerName - name of handler
-     * @throws ServletException
+     * @throws ServletException if an error occurs while forwarding to the authentication exception view bean
      */
     protected void onRequestHandlerNotFound(
         RequestContext requestContext,
@@ -83,7 +83,7 @@ protected void onRequestHandlerNotFound(
      * Forwards to login view bean, in case of no handler specified
      *
      * @param requestContext - request context
-     * @throws ServletException
+     * @throws ServletException if an error occurs while forwarding to the authentication exception view bean
      */
     protected void onRequestHandlerNotSpecified(RequestContext requestContext)
         throws ServletException
@@ -102,8 +102,8 @@ protected void onRequestHandlerNotSpecified(RequestContext requestContext)
      *
      * @param requestContext - request context
      * @param e Exception that was not handled by the application.
-     * @throws ServletException
-     * @throws IOException
+     * @throws ServletException if an error occurs while forwarding to the authentication exception view bean
+     * @throws IOException if an I/O error occurs while forwarding to the authentication exception view bean
      */
     protected void onUncaughtException(
         RequestContext requestContext,
diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml
index a27927ade9..4b575b3ce4 100644
--- a/openam-server-only/pom.xml
+++ b/openam-server-only/pom.xml
@@ -438,13 +438,6 @@
 
             
 
-            
-                org.apache.maven.plugins
-                maven-javadoc-plugin
-                
-                    true
-                
-            
             
                 org.apache.maven.plugins
                 maven-resources-plugin
diff --git a/openam-server-only/src/main/webapp/com_sun_web_ui/html/ja/help/tips_on_searching.html b/openam-server-only/src/main/webapp/com_sun_web_ui/html/ja/help/tips_on_searching.html
index d7d0d2f69b..476f9abbcc 100644
--- a/openam-server-only/src/main/webapp/com_sun_web_ui/html/ja/help/tips_on_searching.html
+++ b/openam-server-only/src/main/webapp/com_sun_web_ui/html/ja/help/tips_on_searching.html
@@ -1,38 +1,38 @@
-
-
- 
-
-    検索のヒント
-  
- 
-
-
-
-  
-  
                          検索のヒント
                          
-
-
                          より良い検索結果を得るには、以下のようにします。
                          
-
                            
-
                          • ヘルプトピックに含まれると思われる語句を入力する。
                            • 
-
-
                          • ワイルドカード (「*」など) は使用しない。検索は、ワイルドカードなしでも部分一致検索します。「libraries」を検索すると、「library」も検索されます。
                            • 
-   
-
                          • 検索結果のトピックが多すぎる場合は、入力する単語を増やして検索対象を絞り込む。
                            • 
-   
-
                          • 検索結果のトピックが少なすぎる場合は、「検索」フィールドの単語を削除または変更する。
                            • 
-
                          
-
                          
-注: 「検索」フィールドでは、AND や OR、NOT などのブール演算子は無視されます。
- 
                            
-
                          検索では、「検索」フィールドに入力された語句とヘルプトピック内の語句を比較します。検索結果は、「検索」フィールドおよびヘルプトピック内での語句の現れ方に従ってランク付けられます。
-
                          
-
-
                            
-
                          • 全語句が現れる
                            • 
-
                          • 同じ形式で現れる
                            • 
-
                          • 同じ順序で現れる
                            • 
-
                          • 単独で現れる
                            • 
-
                          
-
-
+
+
+ 
+
+    検索のヒント
+  
+ 
+
+
+
+  
+  
                          検索のヒント
                          
+
+
                          より良い検索結果を得るには、以下のようにします。
                          
+
                            
+
                          • ヘルプトピックに含まれると思われる語句を入力する。
                            • 
+
+
                          • ワイルドカード (「*」など) は使用しない。検索は、ワイルドカードなしでも部分一致検索します。「libraries」を検索すると、「library」も検索されます。
                            • 
+   
+
                          • 検索結果のトピックが多すぎる場合は、入力する単語を増やして検索対象を絞り込む。
                            • 
+   
+
                          • 検索結果のトピックが少なすぎる場合は、「検索」フィールドの単語を削除または変更する。
                            • 
+
                          
+
                          
+注: 「検索」フィールドでは、AND や OR、NOT などのブール演算子は無視されます。
+ 
                            
+
                          検索では、「検索」フィールドに入力された語句とヘルプトピック内の語句を比較します。検索結果は、「検索」フィールドおよびヘルプトピック内での語句の現れ方に従ってランク付けられます。
+
                          
+
+
                            
+
                          • 全語句が現れる
                            • 
+
                          • 同じ形式で現れる
                            • 
+
                          • 同じ順序で現れる
                            • 
+
                          • 単独で現れる
                            • 
+
                          
+
+
diff --git a/openam-server/pom.xml b/openam-server/pom.xml
index 7e45416d93..4f4502bf5d 100644
--- a/openam-server/pom.xml
+++ b/openam-server/pom.xml
@@ -71,13 +71,6 @@
                         
                     
                 
-                                      
-		   
-                org.apache.maven.plugins
-                maven-javadoc-plugin
-                
-                    true
-                
             
         
     
diff --git a/openam-shared/src/main/java/com/iplanet/am/util/Cache.java b/openam-shared/src/main/java/com/iplanet/am/util/Cache.java
index 49657818f3..600dfcf41f 100644
--- a/openam-shared/src/main/java/com/iplanet/am/util/Cache.java
+++ b/openam-shared/src/main/java/com/iplanet/am/util/Cache.java
@@ -25,6 +25,7 @@
  * $Id: Cache.java,v 1.4 2008/06/27 20:56:21 arviranga Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.iplanet.am.util;
 
@@ -86,13 +87,13 @@
  * Generally, the default load factor (.75) offers a good tradeoff between
  * time and space costs.  Higher values decrease the space overhead but
  * increase the time cost to look up an entry (which is reflected in most
- * Cache operations, including get and put).
                          
+ * Cache operations, including get and put).
                          
  *
  * The capacity controls a tradeoff between wasted space and the
  * need for rehash operations, which are time-consuming.
  * No rehash operations will ever occur if the 
  * capacity is greater than the maximum number of entries the
- * Cache will contain divided by its load factor.  However,
+ * Cache will contain divided by its load factor.  However,
  * setting the capacity too high can waste space.
                          
  *
  * If many entries are to be made into a Cache, 
@@ -202,7 +203,7 @@ public Cache(int capacity, float loadFactor) {
 
     /**
      * Constructs a new, empty Cache with the specified capacity and default
-     * load factor, which is 0.75.
+     * load factor, which is 0.75.
      * 
      * @param capacity
      *            the capacity of the Cache.
@@ -217,7 +218,7 @@ public Cache(int capacity) {
 
     /**
      * Constructs a new, empty Cache with a default capacity and load factor,
-     * which is 0.75.
+     * which is 0.75.
      */
     public Cache() {
         // Obtain the cache size
@@ -284,7 +285,7 @@ public synchronized Enumeration elements() {
      *            a value to search for.
      * @return true if and only if some key maps to the
      *         value argument in this Cache as determined by the
-     *         equals method; false otherwise.
+     *         equals method; false otherwise.
      * @exception NullPointerException
      *                if the value is null.
      * @see #containsKey(Object)
@@ -329,7 +330,7 @@ public boolean containsValue(Object value) {
      * @param key
      *            possible key.
      * @return true if and only if the specified object is a key
-     *         in this Cache, as determined by the equals method;
+     *         in this Cache, as determined by the equals method;
      *         false otherwise.
      * @see #contains(Object)
      */
@@ -544,14 +545,14 @@ public synchronized void clear() {
     }
 
     /**
-     * Returns a string representation of this Cache object in the
+     * Returns a string representation of this Cache object in the
      * form of a set of entries, enclosed in braces and separated by the ASCII
-     * characters ", " (comma and space). Each entry is
-     * rendered as the key, an equals sign =, and the associated
-     * element, where the toString method is used to convert the key
+     * characters ", " (comma and space). Each entry is
+     * rendered as the key, an equals sign =, and the associated
+     * element, where the toString method is used to convert the key
      * and element to strings.
      * 
                          
-     * Overrides to toString method of Object.
+     * Overrides to toString method of Object.
      * 
      * @return a string representation of this Cache.
      */
diff --git a/openam-shared/src/main/java/com/iplanet/security/util/BigInt.java b/openam-shared/src/main/java/com/iplanet/security/util/BigInt.java
index da9824ff20..2cac471ab8 100644
--- a/openam-shared/src/main/java/com/iplanet/security/util/BigInt.java
+++ b/openam-shared/src/main/java/com/iplanet/security/util/BigInt.java
@@ -24,6 +24,7 @@
  *
  * $Id: BigInt.java,v 1.2 2008/06/25 05:52:43 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.security.util;
@@ -39,7 +40,7 @@
  * 
                          
  * NOTE:  This class may eventually disappear, to
  * be supplanted by big-endian byte arrays which hold both signed
- * and unsigned arbitrary-precision integers.
+ * and unsigned arbitrary-precision integers.
  */
 public final class BigInt {
 
diff --git a/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayLexOrder.java b/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayLexOrder.java
index 0f1f397afa..af528642a9 100644
--- a/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayLexOrder.java
+++ b/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayLexOrder.java
@@ -24,6 +24,7 @@
  *
  * $Id: ByteArrayLexOrder.java,v 1.2 2008/06/25 05:52:43 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.security.util;
@@ -45,11 +46,10 @@ public class ByteArrayLexOrder implements Comparator {
      *            first byte array to compare.
      * @param obj2
      *            second byte array to compare.
-     * @return negative number if obj1 < obj2, 0 if obj1 == obj2, positive
-     *         number if obj1 > obj2.
-     * 
-     * @exception ClassCastException if either argument is not a
-     *                byte array.
+     * @return a negative number if {@code obj1 < obj2}, 0 if
+     *         {@code obj1 == obj2}, a positive number if {@code obj1 > obj2}.
+     *
+     * @exception ClassCastException if either argument is not a byte array.
      */
     public final int compare(Object obj1, Object obj2) {
 
diff --git a/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayTagOrder.java b/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayTagOrder.java
index d7d07b38e2..a7d7a6528f 100644
--- a/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayTagOrder.java
+++ b/openam-shared/src/main/java/com/iplanet/security/util/ByteArrayTagOrder.java
@@ -24,6 +24,7 @@
  *
  * $Id: ByteArrayTagOrder.java,v 1.2 2008/06/25 05:52:43 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.security.util;
@@ -41,11 +42,10 @@ public class ByteArrayTagOrder implements Comparator {
      *            first byte array to compare.
      * @param obj2
      *            second byte array to compare.
-     * @return negative number if obj1 < obj2, 0 if obj1 == obj2, positive
-     *         number if obj1 > obj2.
-     * 
-     * @exception ClassCastException if either argument is not a
-     *                byte array.
+     * @return a negative number if {@code obj1 < obj2}, 0 if
+     *         {@code obj1 == obj2}, a positive number if {@code obj1 > obj2}.
+     *
+     * @exception ClassCastException if either argument is not a byte array.
      */
 
     public final int compare(Object obj1, Object obj2) {
diff --git a/openam-shared/src/main/java/com/iplanet/security/x509/IssuingDistributionPointExtension.java b/openam-shared/src/main/java/com/iplanet/security/x509/IssuingDistributionPointExtension.java
index ad80318b94..0651ce4743 100644
--- a/openam-shared/src/main/java/com/iplanet/security/x509/IssuingDistributionPointExtension.java
+++ b/openam-shared/src/main/java/com/iplanet/security/x509/IssuingDistributionPointExtension.java
@@ -24,6 +24,7 @@
  *
  * $Id: IssuingDistributionPointExtension.java,v 1.2 2008/06/25 05:52:46 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.security.x509;
@@ -426,7 +427,7 @@ public void setIndirectCRL(boolean indirectCRL) {
      * Write the extension to the DerOutputStream.
      *
      * @param out the DerOutputStream to write the extension to.
-     * @exception IOException on encoding errors.
+     * @exception RuntimeException if an encoding error occurs.
      */
     public void encode(DerOutputStream out)  {
     	try {
diff --git a/openam-shared/src/main/java/com/iplanet/services/util/JCEEncryption.java b/openam-shared/src/main/java/com/iplanet/services/util/JCEEncryption.java
index e98b311b2c..57114e7c42 100644
--- a/openam-shared/src/main/java/com/iplanet/services/util/JCEEncryption.java
+++ b/openam-shared/src/main/java/com/iplanet/services/util/JCEEncryption.java
@@ -28,6 +28,7 @@
 
 /*
  * Portions Copyrighted 2010-2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.services.util;
@@ -133,8 +134,8 @@ public class JCEEncryption implements AMEncryption, ConfigurableKey {
 
     /**
      * Method declaration
-     * 
-     * @param clearText
+     *
+     * @param clearText the clear-text bytes to encrypt
      */
     public byte[] encrypt(byte[] clearText) {
         return pbeEncrypt(clearText);
@@ -142,8 +143,8 @@ public byte[] encrypt(byte[] clearText) {
 
     /**
      * Method declaration
-     * 
-     * @param encText
+     *
+     * @param encText the encrypted bytes to decrypt
      */
     public byte[] decrypt(byte[] encText) {
         return pbeDecrypt(encText);
diff --git a/openam-shared/src/main/java/com/iplanet/sso/SSOTokenEvent.java b/openam-shared/src/main/java/com/iplanet/sso/SSOTokenEvent.java
index 54b03fbbc3..3a0c594d23 100644
--- a/openam-shared/src/main/java/com/iplanet/sso/SSOTokenEvent.java
+++ b/openam-shared/src/main/java/com/iplanet/sso/SSOTokenEvent.java
@@ -24,6 +24,7 @@
  *
  * $Id: SSOTokenEvent.java,v 1.4 2008/08/15 01:05:20 veiming Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.iplanet.sso;
@@ -32,7 +33,6 @@
  * The SSOTokenEvent is an interface that represents an SSO token
  * event.The single sign on token event represents a change in 
  * SSOToken.
- * 
                          
  * The following are possible SSO token event types:
  * 
                            
  * 
                          • SSO_TOKEN_IDLE_TIMEOUT,
@@ -90,7 +90,7 @@ public interface SSOTokenEvent {
      *         
                              
      *         
                            • SSO_TOKEN_IDLE_TIMEOUT
                              • 
      *         
                            • SSO_TOKEN_MAX_TIMEOUT
                              • 
-     *         
                            • SSO_TOKEN_DESTROY
                              •  and
+     *         
                            • SSO_TOKEN_DESTROY and
                              • 
      *         
                            • SSO_TOKEN_PROPERTY_CHANGED
                              • 
      *         
                            
      * @throws SSOException if the SSOTokenEvent type is
diff --git a/openam-shared/src/main/java/com/sun/identity/saml/xmlsig/KeyProvider.java b/openam-shared/src/main/java/com/sun/identity/saml/xmlsig/KeyProvider.java
index 7a0cd097e2..21cf76ba9e 100644
--- a/openam-shared/src/main/java/com/sun/identity/saml/xmlsig/KeyProvider.java
+++ b/openam-shared/src/main/java/com/sun/identity/saml/xmlsig/KeyProvider.java
@@ -28,6 +28,7 @@
 
 /*
  * Portions Copyrighted 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.saml.xmlsig;
@@ -41,10 +42,7 @@
 /**
  * The class KeyProvider is an interface
  * that is implemented to retrieve X509Certificates and Private Keys from
- * user data store.  
- * 
                            
- *
- * 
+ * user data store.
  */
 
 public interface KeyProvider {
diff --git a/openam-shared/src/main/java/com/sun/identity/security/keystore/AMPassword.java b/openam-shared/src/main/java/com/sun/identity/security/keystore/AMPassword.java
index 249eff63fc..9ef4801a0f 100644
--- a/openam-shared/src/main/java/com/sun/identity/security/keystore/AMPassword.java
+++ b/openam-shared/src/main/java/com/sun/identity/security/keystore/AMPassword.java
@@ -24,6 +24,7 @@
  *
  * $Id: AMPassword.java,v 1.2 2008/06/25 05:52:58 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -107,8 +108,7 @@ public byte[] getByteCopy() {
      *        be wiped with zeroes.
      * @return A copy of the charArray, converted from Unicode to UTF8. It
      *         is the responsibility of the caller to clear the output byte
-     *         array; *	wipeBytes is ideal for this purpose.
-     * @see org.mozilla.jss.util.Password#wipeBytes
+     *         array; wipeBytes is ideal for this purpose.
      */
     public static byte[] charToByte(char[] charArray) {
 	byte bytearray[] = null;
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/Constants.java b/openam-shared/src/main/java/com/sun/identity/shared/Constants.java
index 33fb50140b..ee54cff93b 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/Constants.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/Constants.java
@@ -978,7 +978,7 @@ public interface Constants {
             "com.sun.identity.sm.enableDataStoreNotification";
 
     /**
-     * property string for controlling SMS, AMSDK & IdRepo cache
+     * property string for controlling SMS, AMSDK & IdRepo cache
      */
     static final String SDK_GLOBAL_CACHE_PROPERTY =
             "com.iplanet.am.sdk.caching.enabled";
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.java b/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.java
index 7051c8e560..942af37e81 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.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.shared.datastruct;
 
@@ -87,7 +87,7 @@ public static String getMapAttr(Map map, String name, String defaultValue) {
      * Return String from a map of strings to set of strings.
      * 
      * @param map Map of string of set of string.
-     * @param name Key of the map entry.
+     * @param key Key of the map entry.
      * @return the String value from a map of strings to set of strings.
      * @throws ValueNotFoundException if no value is found for the key.
      */
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/debug/Debug.java b/openam-shared/src/main/java/com/sun/identity/shared/debug/Debug.java
index 335068854f..af10416112 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/debug/Debug.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/debug/Debug.java
@@ -25,6 +25,7 @@
  * $Id: Debug.java,v 1.6 2009/08/19 05:41:17 veiming Exp $
  *
  * Portions Copyrighted 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  */
 
@@ -80,23 +81,17 @@
  * 'com.sun.identity.util.debug.provider' may be used to plugin a non-default
  * implementation of the debug service where necessary.
  * 
                            
- * 
                            
  * 
                            
- * 
                            
  * 
                              *  com.iplanet.services.debug.level
  *  com.iplanet.services.debug.directory
  *  com.sun.identity.util.debug.provider
  * 
                            
- * 
                            
  * 
                            
- * 
                            
  * If there is an error reading or loading the properties, Debug service will
  * redirect all debug information to System.out
- * 
                            
  * If these properties are changed, the server must be restarted for the changes
  * to take effect.
- * 
                            
  * 
                            
  * NOTE: Debugging is an IO intensive operation and may hurt application
  * performance when abused. Particularly, note that Java evaluates the arguments
@@ -298,7 +293,6 @@ public String getName() {
 
     /**
      * Checks if message debugging is enabled.
-     * 
                            
      * 
                            
      * NOTE: Debugging is an IO intensive operation and may hurt
      * application performance when abused. Particularly, note that Java
@@ -318,7 +312,6 @@ public boolean messageEnabled() {
 
     /**
      * Checks if warning debugging is enabled.
-     * 
                            
      * 
                            
      * NOTE: Debugging is an IO intensive operation and may hurt
      * application performance when abused. Particularly, note that Java
@@ -338,7 +331,6 @@ public boolean warningEnabled() {
 
     /**
      * Checks if error debugging is enabled.
-     * 
                            
      * 
                            
      * NOTE: Debugging is an IO intensive operation and may hurt
      * application performance when abused. Particularly, note that Java
@@ -375,7 +367,6 @@ public int getState() {
     /**
      * Prints messages only when the debug state is either Debug.MESSAGE or
      * Debug.ON.
-     * 
                            
      * 
                            
      * NOTE: Debugging is an IO intensive operation and may hurt
      * application performance when abused. Particularly, note that Java
@@ -402,20 +393,17 @@ public void message(String msg) {
      * debugging is enabled, the message along with a time stamp and thread info
      * will be printed on System.out.
      * 
                            
-     * 
                            
      * 
                            
      * This method creates the debug file if does not exist; otherwise it starts
      * appending to the existing debug file. When invoked for the first time on
      * this object, the method writes a line delimiter of '*'s.
      * 
                            
-     * 
                            
      * 
                            
      * Note that the debug file will remain open until destroy()
      * is invoked. To conserve file resources, you should invoke
      * destroy() explicitly rather than wait for the garbage
      * collector to clean up.
      * 
                            
-     * 
                            
      * 
                            
      * NOTE: Debugging is an IO intensive operation and may hurt
      * application performance when abused. Particularly, note that Java
@@ -472,7 +460,6 @@ public void message(String msg, Object... params) {
     /**
      * Prints warning messages only when debug level is greater than
      * Debug.ERROR.
-     * 
                            
      * 
                            
      * NOTE: Debugging is an IO intensive operation and may hurt
      * application performance when abused. Particularly, note that Java
@@ -498,7 +485,6 @@ public void warning(String msg) {
     /**
      * Prints warning messages only when debug level is greater than
      * Debug.ERROR.
-     * 
                            
      * 
                            
      * NOTE: Debugging is an IO intensive operation and may hurt
      * application performance when abused. Particularly, note that Java
@@ -508,19 +494,16 @@ public void warning(String msg) {
      * warning() methods to avoid unnecessary argument evaluation
      * and to maximize application performance.
      * 
                            
-     * 
                            
      * 
                            
      * If the debug file is not accessible and debugging is enabled, the message
      * along with a time stamp and thread info will be printed on
      * System.out.
      * 
                            
-     * 
                            
      * 
                            
      * This method creates the debug file if does not exist; otherwise it starts
      * appending to the existing debug file. When invoked for the first time on
      * this object, the method writes a line delimiter of '*'s.
      * 
                            
-     * 
                            
      * 
                            
      * Note that the debug file will remain open until destroy()
      * is invoked. To conserve file resources, you should invoke
@@ -588,14 +571,11 @@ public void error(String msg) {
      * the debug file is not accessible and debugging is enabled, the message
      * along with a time stamp and thread info will be printed on
      * System.out.
-     * 
                            
-     * 
                            
      * 
                            
      * This method creates the debug file if does not exist; otherwise it starts
      * appending to the existing debug file. When invoked for the first time on
      * this object, the method writes a line delimiter of '*'s.
      * 
                            
-     * 
                            
      * 
                            
      * Note that the debug file will remain open until destroy()
      * is invoked. To conserve file resources, you should invoke
@@ -695,7 +675,6 @@ public void setDebug(String debugType) {
      * destroy() is invoked. To conserve file resources, you
      * should invoke destroy() explicitly rather than wait for
      * the garbage collector to clean up.
-     * 
                            
      * 
                            
      * If this object is accessed after destroy() has been
      * invoked, the results are undefined.
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/debug/IDebugProvider.java b/openam-shared/src/main/java/com/sun/identity/shared/debug/IDebugProvider.java
index 1ff1514e17..c16b059901 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/debug/IDebugProvider.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/debug/IDebugProvider.java
@@ -28,6 +28,7 @@
 
 /**
  * Portions Copyrighted 2014 ForgeRock As
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.shared.debug;
@@ -37,7 +38,6 @@
  * Manager SDK. The implementation of this interface as well as the
  * com.sun.identity.util.IDebug interface togehter provide the
  * necessary functionality to replace or enhance the Debug service.
- * 
                            
  */
 public interface IDebugProvider {
     /**
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugConfiguration.java b/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugConfiguration.java
index 9d25b64d25..85815107ff 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugConfiguration.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugConfiguration.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.shared.debug.file;
 
@@ -30,7 +31,7 @@ public interface DebugConfiguration {
     /**
      * Get the debug suffix configuration
      * Suffix is an empty string or contains a date format if the
-     * rotation interval is enable (rotation interval > 0)
+     * rotation interval is enable ({@code rotation interval > 0})
      *
      * @return suffix
      */
@@ -38,9 +39,9 @@ public interface DebugConfiguration {
 
     /**
      * get rotation interval in minute
-     * Rotation interval can't be <= 0
+     * Rotation interval can't be {@code <= 0}
      *
-     * @return the number of minutes before rotating a file. If <= 0, the rotation is disable.
+     * @return the number of minutes before rotating a file. If {@code <= 0}, the rotation is disable.
      */
     public int getRotationInterval();
 
@@ -48,7 +49,7 @@ public interface DebugConfiguration {
     /**
      * get size rotation in byte
      *
-     * @return the maximum file size in byte. If <= 0, the rotation is disable.
+     * @return the maximum file size in byte. If {@code <= 0}, the rotation is disable.
      */
     public long getRotationFileSizeInByte();
 
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugFile.java b/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugFile.java
index 12cbf2327e..e1283a904e 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugFile.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/debug/file/DebugFile.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.shared.debug.file;
 
@@ -23,17 +24,13 @@
  * The implementation of this interface as well as the
  * com.sun.identity.shared.debug.file.DebugFileProvider interface together
  * provide the necessary functionality to replace or enhance the Debug File service.
- * 
                            
  * Because of specific features that are only related to the log file and not the debugger,
  * the debugger and the log file management can't be manage in a same class.
  * For example, two debugger could write on the same log file with the merge mapping.
  * They could have a different debug level but should have the same log rotation.
  * This interface manages the log rotation, and the debugger the log level.
- * 
                            
- * 
                            
  * Even if this interface was dedicated to debugger, it could be used for managing a
  * different kind of log file (example : access, statistics, etc.).
- * 
                            
  * Every features that are related to the file should be implemented by classes that
  * implement this interface.
  * 
                            
@@ -47,7 +44,7 @@ public interface DebugFile {
      * @param msg    Message to be recorded.
      * @param th     the optional java.lang.Throwable which if
      *               present will be used to record the stack trace.
-     * @throws IOException
+     * @throws IOException if an error occurs while writing the message to the file.
      */
     public void writeIt(String prefix, String msg, Throwable th) throws IOException;
 
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java b/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java
index ccbc28b8a6..13d6c97f75 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java
@@ -433,9 +433,9 @@ public static String checkDoubleQuote(String cookie) {
 
     /**
      * Add cookie to HttpServletResponse as custom header
-     * 
-     * @param response
-     * @param cookie 
+     *
+     * @param response the HttpServletResponse to add the cookie header to
+     * @param cookie the cookie to add to the response
      */
     public static void addCookieToResponse(HttpServletResponse response, Cookie cookie) {
         if (response==null || cookie == null) {
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/jaxrpc/SOAPClient.java b/openam-shared/src/main/java/com/sun/identity/shared/jaxrpc/SOAPClient.java
index 9d7f00539b..cac3fd921c 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/jaxrpc/SOAPClient.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/jaxrpc/SOAPClient.java
@@ -27,6 +27,7 @@
  */
 /**
  * Portions Copyrighted 2012-2013 ForgeRock Inc
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.shared.jaxrpc;
 
@@ -95,10 +96,8 @@ public class SOAPClient {
     
     /**
      * Constructor for applications that would like to dynamically set the SOAP
-     * endponts using 
-     * setUrls(String[] urls) before
-     * invoking either send() or 
-     * call().
+     * endponts using setUrls(String[] urls) before
+     * invoking either send() or call().
      */
     public SOAPClient() throws IOException {
         // do nothing
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/locale/Locale.java b/openam-shared/src/main/java/com/sun/identity/shared/locale/Locale.java
index 194d442935..1998423385 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/locale/Locale.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/locale/Locale.java
@@ -29,6 +29,7 @@
 /*
  * Portions Copyrighted 2014-2015 ForgeRock AS.
  * Portions Copyrighted 2014 Nomura Research Institute, Ltd.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.shared.locale;
 
@@ -377,7 +378,7 @@ public static Date parseDateString(String dateString,
 
     /**
      * Gets Date object from date string with specified locale. Syntax of date
-     * string is defined in amUser_<locale> properties file.
+     * string is defined in amUser_<locale> properties file.
      * 
      * @param dateString
      *            date string
@@ -677,7 +678,7 @@ public static String getString(ResourceBundle rb, String resource,
      * @param enc
      *            the encoding format.
      * @return the encoded string.
-     * @throws UnsupportedEncodingException
+     * @throws UnsupportedEncodingException if the named encoding is not supported.
      */
     public static String URLEncodeField(String input, String enc)
             throws UnsupportedEncodingException {
@@ -711,7 +712,7 @@ public static String URLEncodeField(String input, String enc)
     }
 
     /**
-     * This method is replacement function for URLEncoder Function
+     * This method is replacement function for URLEncoder Function
      * URL encoder function converts input string into URLencoded
      * byte stream after converting Unicode string into bytes using native
      * encoding. The URLEncoder does not work for Sun Java System
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/search/FileLookup.java b/openam-shared/src/main/java/com/sun/identity/shared/search/FileLookup.java
index f8326d8332..e9c9d57ef8 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/search/FileLookup.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/search/FileLookup.java
@@ -24,6 +24,7 @@
  *
  * $Id: FileLookup.java,v 1.4 2008/06/25 05:53:05 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.shared.search;
@@ -98,6 +99,7 @@ public class FileLookup {
      * Returns all possible paths for the specified file in an ordered array.
      * If all parameters specified are non-null, then the order of the
      * filepaths is generated in the following manner:
+     * 
                            {@code
      *   _///
      *   _//
      *   _////
@@ -108,7 +110,7 @@ public class FileLookup {
      *     of the locale.  For example, if the original  value
      *     was "jp_JP_WIN", then the above would be _jp_JP_WIN.
      *     The next groups would be _jp_JP and _jp.
-     *   
+     *
      *     If the platform locale is different from the specified locale,
      *     then the pattern for  is repeated with the platform
      *     locale, with the addition of using no "_" (i.e.,
@@ -116,8 +118,8 @@ public class FileLookup {
      *
      *     Additionally, "default" is used as "", and the above
      *     patterns are repeated.
+     * }
                            
      *
-     * 
      * @param type The base filepath to begin the search. If null, "default"
      *        is the start of the filepath.
      * @param locale The locale for the file of interest.
@@ -125,7 +127,7 @@ public class FileLookup {
      * @param orgPath The organization part of the filepath, if any.
      * @param clientPath The client type for that part of the filepath
      * @param filename The filename of interest
-     * @throws FileLookupException
+     * @throws FileLookupException if an error occurs while locating the files.
      * @return File[] of ordered search paths.
      */
     public static File[] getOrderedPaths(
@@ -370,10 +372,10 @@ public static File[] getOrderedPaths(
      * @param component The component part of the filepath, if any.
      * @param clientPath The client type for that part of the filepath
      * @param filename The filename of interest
-     * @param templateDir
-     * @param enableCache
+     * @param templateDir The base template filepath to prepend.
+     * @param enableCache True if the File object is to be cached.
      * @return first existing file in the ordered search paths.
-     * @throws FileLookupException
+     * @throws FileLookupException if an error occurs while locating the file.
      */
     public static File getFirstExisting(
         String type,
@@ -400,7 +402,7 @@ public static File getFirstExisting(
      * @param templateDir The base template filepath to prepend.
      * @param enableCache True if the File object is to be cached.
      * @return first existing file in the ordered search paths.
-     * @throws FileLookupException
+     * @throws FileLookupException if an error occurs while locating the file.
      */
     public static File getFirstExisting(
         String type,
@@ -470,7 +472,7 @@ public static File getFirstExisting(
      * @param locale The locale for the file of interest.
      * @param filename The filename of interest.
      * @return url of document, or null if no document was found.
-     * @throws FileLookupException
+     * @throws FileLookupException if an error occurs while locating the file.
      */
     public static String getFirstExistingRemote(
         String server,
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/stats/Stats.java b/openam-shared/src/main/java/com/sun/identity/shared/stats/Stats.java
index 3ca11b8cda..340debe1e9 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/stats/Stats.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/stats/Stats.java
@@ -25,6 +25,7 @@
  * $Id: Stats.java,v 1.5 2008/08/08 00:40:59 ww203982 Exp $
  *
  * Portions Copyrighted 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.shared.stats;
@@ -63,10 +64,12 @@
  * 
                            
  * Allows a uniform interface to statistics information in a uniform format.
  * Stats supports different states of filing stats information:
- * OFF, FILE and CONSOLE. 
                            
- * 
                          •  OFF statistics is turned off.
- * 
                          •  FILE statistics information is written to a file
- * 
                          •  CONSOLE statistics information is written on console
+ * OFF, FILE and CONSOLE.
+ * 
                              
+ * 
                            •  OFF statistics is turned off.
                              • 
+ * 
                            •  FILE statistics information is written to a file
                              • 
+ * 
                            •  CONSOLE statistics information is written on console
                              • 
+ * 
                            
  * 
                            
  * Stats service uses the property file, AMConfig.properties, to
  * set the default stats level and the output directory where the stats files
@@ -418,12 +421,9 @@ private synchronized void write(String msg) {
      *            
                            
      *            Stats.OFF
      *            
                            
-     *            
                            
      *            Stats.FILE
      *            
                            
-     *            
                            
      *            Stats.CONSOLE
-     *            
                            
      */
     public void setStats(int statsType) {
         switch (statsType) {
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/test/CollectionUtils.java b/openam-shared/src/main/java/com/sun/identity/shared/test/CollectionUtils.java
index e3409df1c8..d9a2694820 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/test/CollectionUtils.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/test/CollectionUtils.java
@@ -24,6 +24,7 @@
  *
  * $Id: CollectionUtils.java,v 1.2 2008/06/25 05:53:05 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.shared.test;
@@ -42,9 +43,9 @@ private CollectionUtils() {
     }
 
     /**
-     * Returns set of string. This is a convenient method for adding a set of 
-     * string into a map. In this project, we usually have the 
-     * Map<String, Set<String>> and many times, we just 
+     * Returns set of string. This is a convenient method for adding a set of
+     * string into a map. In this project, we usually have the
+     * Map<String, Set<String>> and many times, we just
      * want to add a string to the map.
      *
      * @param key Key to the entry in the map.
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/test/tools/ReportGenerator.java b/openam-shared/src/main/java/com/sun/identity/shared/test/tools/ReportGenerator.java
index 68c3b8aa75..c1ec8c94e7 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/test/tools/ReportGenerator.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/test/tools/ReportGenerator.java
@@ -24,6 +24,7 @@
  *
  * $Id: ReportGenerator.java,v 1.2 2008/06/25 05:53:06 qcheng Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.shared.test.tools;
@@ -54,7 +55,7 @@ public class ReportGenerator {
     /**
      * Creates an instance of ReportGenerator object.
      *
-     * @param dataDir Directory where code>testNG result XML resides.
+     * @param dataDir Directory where testNG result XML resides.
      * @param templateDir Directory where HTML templates reside.
      * @param outputDir Directory to place the HTML reports.
      */
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/whitelist/HttpURLResourceName.java b/openam-shared/src/main/java/com/sun/identity/shared/whitelist/HttpURLResourceName.java
index fa1acabc46..5796b28020 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/whitelist/HttpURLResourceName.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/whitelist/HttpURLResourceName.java
@@ -24,6 +24,7 @@
  *
  * $Id: HttpURLResourceName.java,v 1.1 2009/11/24 21:42:35 madan_ranganath Exp $
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -45,7 +46,7 @@
   * Behaviour of existing URLResourceName was not changed to
   * maintain backward compatibility.
   *
-  * @see {@see BaseURLResourceName}
+  * @see org.forgerock.openam.shared.resourcename.BaseURLResourceName
   */
 
 public class HttpURLResourceName extends URLResourceName {
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..472d6b2f28 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;
 
@@ -370,7 +370,7 @@ public static Map> parseAttributeValuePairTags(Node parentNo
      * Obtains a new instance of a DOM Document object
      * 
      * @return a new instance of a DOM Document object
-     * @exception Exception
+     * @exception ParserConfigurationException
      *                if an error occurs while constructing a new document
      */
     public static Document newDocument() throws ParserConfigurationException {
@@ -585,7 +585,7 @@ public static Set getAttributeValuePair(Node node) {
 
     /**
      * Method to get Values within AttributeValuePair as a java.util.Set
-     * If unescape is set to false, xml escaped chars will not
+     * If unescape is set to false, xml escaped chars will not
      * be unescaped.
      */
     public static Set getAttributeValuePair(Node node, boolean unescape) {
@@ -613,7 +613,7 @@ public static String getValueOfValueNode(Node n) {
 
     /**
      * Method to get the value of "Value" node
-     * If unescape is set to false, xml escaped chars will not
+     * If unescape is set to false, xml escaped chars will not
      * be unescaped.
      */
     public static String getValueOfValueNode(Node n, boolean unescape) {
@@ -629,7 +629,7 @@ public static String getValueOfValueNodeNoTrim(Node n) {
 
     /**
      * Method to get the value of "Value" node
-     * If unescape is set to false, xml escaped chars will not
+     * If unescape is set to false, xml escaped chars will not
      * be unescaped.
      */
     public static String getValueOfValueNodeNoTrim(Node n, boolean unescape) {
@@ -788,7 +788,7 @@ public static String unescapeSpecialCharacters(String text) {
     }
 
     /**
-     * Removes invalid XML characters from the input text and then replaces XML special character &,
+     * Removes invalid XML characters from the input text and then replaces XML special character &,
      * <, >, ", ' with corresponding entity references.
      *
      * @param text The input that needs to be escaped. May be null.
diff --git a/openam-shared/src/main/java/com/sun/identity/shared/xml/XPathAPI.java b/openam-shared/src/main/java/com/sun/identity/shared/xml/XPathAPI.java
index 4fec065c3b..5851e94bb2 100644
--- a/openam-shared/src/main/java/com/sun/identity/shared/xml/XPathAPI.java
+++ b/openam-shared/src/main/java/com/sun/identity/shared/xml/XPathAPI.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.shared.xml;
@@ -71,7 +72,7 @@ private XPathAPI() {
    * @param str XPath string.
    * @return The first node found that matches the XPath, or null.
    *
-   * @throws XPathException
+   * @throws XPathException if the XPath expression cannot be evaluated.
    */
    public static Node selectSingleNode(Node doc, String str) throws XPathException {
        return selectSingleNode(doc, str, doc);
@@ -85,7 +86,7 @@ public static Node selectSingleNode(Node doc, String str) throws XPathException
    * @param nsNode Node where namespace prefix in XPath is resolved from.
    * @return The first node found that matches the XPath, or null.
    *
-   * @throws XPathException
+   * @throws XPathException if the XPath expression cannot be evaluated.
    */
    public static Node selectSingleNode(Node doc, String str, Node nsNode) throws XPathException {
        SimpleNamespaceContext nsctx = new SimpleNamespaceContext(nsNode);
@@ -100,7 +101,7 @@ public static Node selectSingleNode(Node doc, String str, Node nsNode) throws XP
    * @param nsctx Namespace where the prefix in XPath is resolved from.
    * @return The first node found that matches the XPath, or null.
    *
-   * @throws XPathException
+   * @throws XPathException if the XPath expression cannot be evaluated.
    */
    public static Node selectSingleNode(Node doc, String str, NamespaceContext nsctx) throws XPathException {
        NodeList nl = selectNodeList(doc, str, nsctx);
@@ -118,7 +119,7 @@ public static Node selectSingleNode(Node doc, String str, NamespaceContext nsctx
    * @param str XPath string.
    * @return a NodeList of the matched result.
    *
-   * @throws XPathException
+   * @throws XPathException if the XPath expression cannot be evaluated.
    */
    public static NodeList selectNodeList(Node doc, String str) throws XPathException {
        return selectNodeList(doc, str, doc);
@@ -132,7 +133,7 @@ public static NodeList selectNodeList(Node doc, String str) throws XPathExceptio
    * @param nsNode Node where namespace prefix in XPath is resolved from.
    * @return a NodeList of the matched result.
    *
-   * @throws XPathException
+   * @throws XPathException if the XPath expression cannot be evaluated.
    */
    public static NodeList selectNodeList(Node doc, String str, Node nsNode) throws XPathException {
        SimpleNamespaceContext nsctx = new SimpleNamespaceContext(nsNode);
@@ -148,7 +149,7 @@ public static NodeList selectNodeList(Node doc, String str, Node nsNode) throws
    * @param nsctx Namespace where the prefix in XPath is resolved from.
    * @return a NodeList.
    *
-   * @throws XPathException
+   * @throws XPathException if the XPath expression cannot be evaluated.
    */
    public static NodeList selectNodeList(Node doc, String str, NamespaceContext nsctx) throws XPathException {
        XPathFactory xpf = xpathFactoryCache.getInstanceForCurrentThread();
diff --git a/openam-shared/src/main/java/com/sun/identity/tools/objects/MapFormat.java b/openam-shared/src/main/java/com/sun/identity/tools/objects/MapFormat.java
index a1096d7232..3a62373308 100644
--- a/openam-shared/src/main/java/com/sun/identity/tools/objects/MapFormat.java
+++ b/openam-shared/src/main/java/com/sun/identity/tools/objects/MapFormat.java
@@ -37,6 +37,8 @@
  * However, if you add GPL Version 2 code and therefore, elected the GPL
  * Version 2 license, then the option applies only if the new code is
  * made subject to such option by the copyright holder.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.tools.objects;
 
@@ -157,7 +159,7 @@ private void process(String pattern, String lmark, String rmark)
     }
      */
     /** Returns the value for given key. Subclass may define its own beahvior of
-     * this method. For example, if key is not defined, subclass can return 
+     * this method. For example, if key is not defined, subclass can return {@code }
      * string.
      *
      * @param key Key.
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/LockFactory.java b/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/LockFactory.java
index 5c86e2ac3f..d1a4bf73e7 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/LockFactory.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/LockFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.shared.concurrency;
@@ -27,7 +28,7 @@
  * Lock factory is responsible for delivering up locks that are shared for a given key. This allows locking to be more
  * fine grained as opposed to blocking all threads for all circumstances. K represents the key type used to index the
  * lock instance. Given that K is used to indirectly index the lock, it must satisfy the hash code and equals methods.
- * 
                            
+ * 
                            
  * To alleviate the responsibility of the developer and avoid potential memory leaks, the factory manages the internal
  * clean up of unreferenced locks. Locks are cached within a {@link WeakHashMap} against a key. Each lock has a strong
  * reference to its key, so that once all consumers of a lock give up their strong references to the lock, the single
@@ -123,7 +124,7 @@ public String toString() {
 
     /**
      * The key reference lock is an re-entrant lock that maintains the only strong reference to its associated key.
-     * 
                            
+     * 
                            
      * Once all consumers give up their strong reference to the lock, no strong references remain on the lock
      * and the lock is now garbage collected. After this no strong references remain on the associated key and
      * so the lock cache can now clear out its cached entry
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ResizableSemaphore.java b/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ResizableSemaphore.java
index 53622aa9ed..7710e3fcdc 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ResizableSemaphore.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ResizableSemaphore.java
@@ -12,6 +12,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2015 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC
 */
 package org.forgerock.openam.shared.concurrency;
 
@@ -56,7 +57,7 @@ public ResizableSemaphore(int permits) {
      * Overridden method to stop it being protected.
      * Decrease the number of available permits by the amount in the supplied argument.
      *
-     * @param reduction {@inheritdoc}
+     * @param reduction the number of permits to remove
      */
     @Override
     protected void reducePermits(int reduction) {
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ThreadMonitor.java b/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ThreadMonitor.java
index a5809d1568..2068924d18 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ThreadMonitor.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/concurrency/ThreadMonitor.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.shared.concurrency;
@@ -65,7 +65,7 @@
  * The ThreadMonitor will use its own internal WatchDog class, itself runnable and a
  * thread pool to provide the monitoring.
  *
- * 
                            Thread Policy
                            : All {@link java.lang.Runnable} tasks provided to this
+ * 
                            Thread Policy: All {@link java.lang.Runnable} tasks provided to this
  * ThreadMonitor should respond to the standard {@link Thread#interrupt()} signal.
  * This mechanism will be used for coordinating shutdown of the task. All
  * ExecutorServices provided to this framework are assumed to respond to the system
@@ -74,7 +74,7 @@
  * Sadly though the question of "Who will guard the guards themselves?" is intentionally
  * avoided by this class and should be considered out of scope.
  *
- * @link https://en.wikipedia.org/wiki/Quis_custodiet_ipsos_custodes%3F
+ * @see Quis custodiet ipsos custodes?
  * @see com.sun.identity.common.ShutdownManager
  * @see org.forgerock.util.thread.listener.ShutdownManager
  */
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/monitoring/RateWindow.java b/openam-shared/src/main/java/org/forgerock/openam/shared/monitoring/RateWindow.java
index 52194debcf..1be9277924 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/monitoring/RateWindow.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/monitoring/RateWindow.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.openam.shared.monitoring;
 
@@ -23,7 +24,7 @@
 
 /**
  * This class maintains the rate of an event for a sample rate over a window of a particular size.
- * 
                            
+ * 
                            
  * The window is constructed with a given size and sample rate and the window will move continuously at interval
  * defined by the sample rate. The min, max and average will always be of the current window position, ie as the window
  * moves and sample are not covered by the window the sample will not be included in the  min, max and average
@@ -105,7 +106,7 @@ private void fillInWindow(long index) {
 
     /**
      * Gets the average rate for the sample rate averaged across the whole window.
-     * 
                            
+     * 
                            
      * Does not include the latest window slot if time has not passed beyond it yet as otherwise could skew the average
      * as that time slot has not yet completed and may get more events made in it.
      *
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/resourcename/BasePrefixResourceName.java b/openam-shared/src/main/java/org/forgerock/openam/shared/resourcename/BasePrefixResourceName.java
index bec562b54b..c7791afd7f 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/resourcename/BasePrefixResourceName.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/resourcename/BasePrefixResourceName.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2009 Sun Microsystems Inc.
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.shared.resourcename;
@@ -652,8 +653,10 @@ public String[] split(String res) {
      * one level wild card appears is same resource String.
      * Also removes ( purges) mutiple consecutive delimiters to 1,
      * in the URI.
+     * 
                              
      * 
                            • So http://xyz.com///abc///d becomes http://xyz.com/abc/d
      * where "/" is the delimiter.
                              • 
+     * 
                            
      *
      * @param res the prefix resource string to be canonicalized
      * @return the prefix resource string in its canonicalized form.
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/AESWrapEncryption.java b/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/AESWrapEncryption.java
index 61ec454dfe..be29d7139d 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/AESWrapEncryption.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/AESWrapEncryption.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.shared.security.crypto;
@@ -90,7 +91,7 @@ public AESWrapEncryption() {
 
     /**
      * Sets the encryption key from a password. The actual encryption key will be derived from the password using
-     * the PBKDF2 key derivation algorithm. Use the system properties
+     * the PBKDF2 key derivation algorithm. Use the system properties
      * {@code org.forgerock.openam.encryption.key.salt}, {@code org.forgerock.openam.encryption.key.iterations} and
      * {@code org.forgerock.openam.encryption.key.size} to set the salt (no default, must be set), number of
      * iterations (defaults to 250,000) and output key size (defaults to 128-bits, can be 128, 192 or 256).
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/KeyStoreType.java b/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/KeyStoreType.java
index 0a7e88d8a9..1f353a01f5 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/KeyStoreType.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/security/crypto/KeyStoreType.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.shared.security.crypto;
@@ -25,18 +26,14 @@ public enum KeyStoreType {
     /**
      * The Sun proprietary Java Key Store format. May not be supported on non-Oracle JREs.
      *
-     * @see Keystore Implementation
+     * @see Keystore Implementation
      */
     JKS,
     /**
      * Alternative Sun proprietary Key Store format. Provides stronger cryptographic protections than {@link #JKS}
      * format. May not be supported on all platforms.
      *
-     * @see Keystore Implementation
+     * @see Keystore Implementation
      */
     JCEKS,
     /**
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/sts/SharedSTSConstants.java b/openam-shared/src/main/java/org/forgerock/openam/shared/sts/SharedSTSConstants.java
index 97d55df006..b54a40354f 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/sts/SharedSTSConstants.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/sts/SharedSTSConstants.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.shared.sts;
@@ -32,7 +33,7 @@ private SharedSTSConstants() {
      * invocations via the client stk classes, which will publish with state generated by calling toJson() on an
      * instance of the {Rest|Soap}STSInstanceConfig class, and the {Rest|Soap}SecurityTokenServiceViewBean, which
      * will publish with state harvested from the ViewBean property sheet, and will thus be in the format of
-     * Map>.
+     * {@code Map>}.
      */
     public static final String STS_PUBLISH_INVOCATION_CONTEXT = "invocation_context";
 
@@ -43,7 +44,7 @@ private SharedSTSConstants() {
     public static final String STS_PUBLISH_INVOCATION_CONTEXT_VIEW_BEAN = "invocation_context_view_bean";
 
     /**
-     * Used as the key to the JsonValue corresponding to a wrapped Map> or the output of
+     * Used as the key to the JsonValue corresponding to a wrapped {@code Map>} or the output of
      * {Rest|Soap}STSInstanceConfig#toJson(), depending upon the invocation context.
      */
     public static final String STS_PUBLISH_INSTANCE_STATE = "instance_state";
diff --git a/openam-shared/src/main/java/org/forgerock/openam/utils/DocumentBuilderProvider.java b/openam-shared/src/main/java/org/forgerock/openam/utils/DocumentBuilderProvider.java
index 4175fa5379..b060cd7144 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/utils/DocumentBuilderProvider.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/utils/DocumentBuilderProvider.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.utils;
@@ -22,7 +23,7 @@
 /**
  * Abstract factory interface for supplying configured {@link javax.xml.parsers.DocumentBuilder} instances. The
  * underlying implementation may cache or pool instances for performance.
- * 
                            
+ * 
                            
  * Note: usually you will want to use the {@link PerThreadDocumentBuilderProvider} wrapped around a
  * {@link SafeDocumentBuilderProvider}.
  */
diff --git a/openam-shared/src/main/java/org/forgerock/openam/utils/MappingUtils.java b/openam-shared/src/main/java/org/forgerock/openam/utils/MappingUtils.java
index 6b23c3e916..58d9d48513 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/utils/MappingUtils.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/utils/MappingUtils.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.utils;
@@ -37,7 +38,7 @@ private MappingUtils() {
 
     /**
      * This method parses out the local_attribute=source_attributes as they are encapsulated in the authN module
-     * configurations into a more usable, Map format.
+     * configurations into a more usable, {@code Map} format.
      * @param configuredMappings The set of local=source mappings.
      * @return The derived Map instance.
      */
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..062a2717e2 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,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.utils;
@@ -33,8 +34,6 @@
  * Use the methods on this class where you would have otherwise used {@code System.currentTimeMillis()},
  * {@code new Date()}, {@code Calendar.getInstance()} or the various constructors and {@code now} methods
  * in {@code org.joda.time.DateTime}.
- * 
                            
- *
  */
 @SuppressWarnings({"PMD.AvoidCalenderGetInstance"})
 public enum Time implements DateTimeUtils.MillisProvider {
diff --git a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/MapMarshallUtils.java b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/MapMarshallUtils.java
index dfa3e0cac9..13cf5cbb6c 100644
--- a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/MapMarshallUtils.java
+++ b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/MapMarshallUtils.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts;
@@ -25,10 +26,10 @@
 
 /**
  * This class encapsulates a set of public static methods to aid in marshalling Rest and Soap STS instance config state,
- * ultimately a json native format, into the Map> of attributes required for SMS persistence. As part
- * of this conversion, a Map, returned from JsonValue.asMap, must be transformed into a Map>.
- * Likewise, when going in the other direction (SMS map to JsonValue), the Map> needs to be converted
- * back to a Map so that a JsonValue can be constructed therefrom.
+ * ultimately a json native format, into the {@code Map>} of attributes required for SMS persistence. As part
+ * of this conversion, a {@code Map}, returned from JsonValue.asMap, must be transformed into a {@code Map>}.
+ * Likewise, when going in the other direction (SMS map to JsonValue), the {@code Map>} needs to be converted
+ * back to a {@code Map} so that a JsonValue can be constructed therefrom.
  *
  * Static methods cannot be mocked (without bcel), and thus should be kept to a minimum. The preferred guice interface/implementation
  * method was not adopted because this method is consumed from the config/user classes, like RestSTSInstanceConfig, which
@@ -37,7 +38,7 @@
  */
 public class MapMarshallUtils {
     /**
-     * Marshals from a Map produced by jsonValue.asMap to the Map> expected by the
+     * Marshals from a {@code Map} produced by jsonValue.asMap to the {@code Map>} expected by the
      * SMS.
      * It is tempting to make this generic much more generic, and change the parameter to a JsonValue, as that would
      * preserve the types of the values, and then handle each of the Values differently, depending upon whether the
@@ -46,9 +47,9 @@ public class MapMarshallUtils {
      * types implement custom string parsing schemes, as they must be entered in the AdminConsole. So this method is
      * pretty basic, and works correctly for the primitive value types, but all custom value types must be handled
      * specifically by the marshalToAttributeMap callers.
-
-     * @param jsonMap
-     * @return the Map> attributes expected by the SMS
+     *
+     * @param jsonMap the {@code Map} produced by jsonValue.asMap to be marshalled
+     * @return the {@code Map>} attributes expected by the SMS
      */
     public static Map> toSmsMap(Map jsonMap) {
         Map> smsMap = new HashMap>(jsonMap.size());
@@ -63,14 +64,14 @@ public static Map> toSmsMap(Map jsonMap) {
     }
 
     /**
-     * Note that this method will only return the first element in the Set. Its intent is only to aid in the
-     * conversion between String and Set for non-complex values. I would like to exclude Set instances with
-     * a cardinality != 1, but encapsulated complex types will be passed the Map> corresponding to the
+     * Note that this method will only return the first element in the {@code Set}. Its intent is only to aid in the
+     * conversion between String and {@code Set} for non-complex values. I would like to exclude Set instances with
+     * a cardinality != 1, but encapsulated complex types will be passed the {@code Map>} corresponding to the
      * top-level object when the object hierarchy is re-constituted from SMS state, which means that some Map entries
-     * will have Set instances with a cardinality != 1. Yet this should not affect the leaf objects, as they do
+     * will have {@code Set} instances with a cardinality != 1. Yet this should not affect the leaf objects, as they do
      * not encapsulate any other complex objects.
-     * @param attributeMap The map of STS instance attributes obtained from the SMS
-     * @return the Map format which can be used to construct a JsonValue
+     * @param attributeMap the map of STS instance attributes obtained from the SMS
+     * @return the {@code Map} format which can be used to construct a JsonValue
      */
     public static Map toJsonValueMap(Map> attributeMap) {
         Map jsonValueMap = new HashMap(attributeMap.size());
@@ -85,18 +86,18 @@ public static Map toJsonValueMap(Map> attrib
     }
 
     /**
-     * This method is called by AuthTargetMapping to marshal the contextMap from the Map returned by the
-     * jsonValue.asMap to the Map stored by the AuthTargetMapping. The AuthTargetMapping specifies the
+     * This method is called by AuthTargetMapping to marshal the contextMap from the {@code Map} returned by the
+     * jsonValue.asMap to the {@code Map} stored by the AuthTargetMapping. The AuthTargetMapping specifies the
      * authIndexType and authIndexValue for each type of token validated by an STS instance, and the contextMap provides
      * any additional context required to consume the rest authN to invoke the particular target defined by the authIndexType
      * and authIndexValue. For example the OpenID Connect ID Token authN module allows the user to specify the header name
      * which will reference the token. This information must be reflected in the AuthTargetMapping if it is to validate
      * OIDC tokens against this authN module. The contextMap is used to provide this information. Because this state must
-     * ultimately be stored in the SMS as a String, I cannot store the Map native to json maps, but rather
-     * must marshal this representation to a Map.
+     * ultimately be stored in the SMS as a String, I cannot store the {@code Map} native to json maps, but rather
+     * must marshal this representation to a {@code Map}.
      * @param objectMap  The Map, representing the AuthTargetMapping context, as returned from jsonValue.asMap. Can
      *                   possibly be null, in case the AuthTarget in the AuthTargetMapping does not have a context value.
-     * @return The Map transformation of the objectMap.
+     * @return the {@code Map} transformation of the objectMap.
      */
     public static Map objectValueToStringValueMap(Map objectMap) {
         if (objectMap == null) {
diff --git a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/CustomTokenOperation.java b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/CustomTokenOperation.java
index 99ea586a76..0dc3b16aa3 100644
--- a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/CustomTokenOperation.java
+++ b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/CustomTokenOperation.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.config.user;
@@ -109,7 +110,7 @@ public String toSMSString() {
 
     /**
      * Called to marshal back to an instance of the CustomTokenOperation from the format supported by the AdminUI
-     * @param smsString
+     * @param smsString the SMS string representation of a {@code CustomTokenOperation}, of the format token_name'|'implementation_class
      * @throws IllegalArgumentException if the smsString is not of the format token_name'|'implementation_class.
      * @return a CustomTokenOperation instance constituted from the parsed string
      */
diff --git a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/SAML2Config.java b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/SAML2Config.java
index d6239794d3..7a2ecb379b 100644
--- a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/SAML2Config.java
+++ b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/config/user/SAML2Config.java
@@ -12,6 +12,7 @@
 * information: "Portions Copyrighted [year] [name of copyright owner]".
 *
 * Copyright 2014-2016 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC
 */
 
 package org.forgerock.openam.sts.config.user;
@@ -893,7 +894,7 @@ public JsonValue toJson() {
      *
      * @param json the {@link JsonValue} representation.
      * @return a SAML2Config object
-     * @throws IllegalStateException
+     * @throws IllegalStateException if the {@code JsonValue} cannot be marshalled into a {@code SAML2Config} instance
      */
     public static SAML2Config fromJson(JsonValue json) throws IllegalStateException {
         try {
diff --git a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/rest/config/user/RestSTSInstanceConfig.java b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/rest/config/user/RestSTSInstanceConfig.java
index ba83068dce..5cc33cfb36 100644
--- a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/rest/config/user/RestSTSInstanceConfig.java
+++ b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/rest/config/user/RestSTSInstanceConfig.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.rest.config.user;
@@ -43,8 +44,8 @@
  * see https://weblogs.java.net/blog/emcmanus/archive/2010/10/25/using-builder-pattern-subclasses
  *
  * Also attempted to marshal the RestSTSInstanceConfig to/from json with the jackson ObjectMapper. But I was adding
- * @JsonSerialize and @JsonDeserialize annotations, and because builder-based classes don't expose ctors which
- * take the complete field set, I would have to create @JsonCreator instances which would have to pull all of the
+ * {@code @JsonSerialize} and {@code @JsonDeserialize} annotations, and because builder-based classes don't expose ctors which
+ * take the complete field set, I would have to create {@code @JsonCreator} instances which would have to pull all of the
  * values out of a map anyway, which is 75% of the way towards a hand-rolled json marshalling implementation based on
  * json-fluent. So a hand-rolled implementation it is.
  */
diff --git a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapDeploymentConfig.java b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapDeploymentConfig.java
index a8ad8b5da9..f42d414a05 100644
--- a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapDeploymentConfig.java
+++ b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapDeploymentConfig.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.soap.config.user;
@@ -312,7 +313,7 @@ public static SoapDeploymentConfig fromJson(JsonValue json) {
     }
 
     /**
-     * Used by the sts-publish serviceQName to marshal a SoapDeploymentConfig instance to the Map>
+     * Used by the sts-publish serviceQName to marshal a SoapDeploymentConfig instance to the {@code Map>}
      * representation required by the SMS.
      * @return a Map containing the state of the SoapDeploymentConfig instance in the format consumed by the SMS.
      */
@@ -329,7 +330,7 @@ public Map> marshalToAttributeMap() {
     }
 
     /**
-     * Used by the sts-publish serviceQName to marshal the Map> returned by the SMS to a SoapDeploymentConfig
+     * Used by the sts-publish serviceQName to marshal the {@code Map>} returned by the SMS to a SoapDeploymentConfig
      * instance. Used as part of generating the json representation of published soap-sts instances returned by the
      * sts-publish serviceQName.
      * @return A SoapDeploymentConfig instance corresponding to Map state.
diff --git a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/token/model/OpenAMSessionToken.java b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/token/model/OpenAMSessionToken.java
index 10ae564d6b..bab44cd776 100644
--- a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/token/model/OpenAMSessionToken.java
+++ b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/token/model/OpenAMSessionToken.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.token.model;
@@ -20,7 +21,7 @@
 
 /**
  * This class represents an OpenAM session token, built around the OpenAM session id. It will be used as the token type
- * for TokenAuthenticationRequestDispatcher and AuthenticationHandler implementations.
+ * for {@code TokenAuthenticationRequestDispatcher} and {@code AuthenticationHandler} implementations.
  */
 public class OpenAMSessionToken {
     private final String sessionId;
diff --git a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/ProofTokenState.java b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/ProofTokenState.java
index c7725c2183..529407d30f 100644
--- a/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/ProofTokenState.java
+++ b/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/ProofTokenState.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.user.invocation;
@@ -77,7 +78,7 @@ public ProofTokenStateBuilder x509Certificate(X509Certificate certificate) {
         /**
          * Builds the {@code ProofTokenState}
          * @return the {@code ProofTokenState}
-         * @throws TokenMarshalException
+         * @throws TokenMarshalException if the {@code X509Certificate} has not been set on the builder
          */
         public ProofTokenState build() throws TokenMarshalException {
             return new ProofTokenState(this);
@@ -136,7 +137,7 @@ public static ProofTokenStateBuilder builder() {
      *
      * @param jsonValue the {@code JsonValue} representation to construct the {@code ProofTokenState} from.
      * @return a {@code ProofTokenState}
-     * @throws TokenMarshalException
+     * @throws TokenMarshalException if the certificate cannot be marshalled from its base64-encoded {@code JsonValue} representation
      */
     public static ProofTokenState fromJson(JsonValue jsonValue) throws TokenMarshalException {
         final String certString = jsonValue.get(BASE_64_ENCODED_CERTIFICATE).asString();
@@ -156,7 +157,7 @@ public static ProofTokenState fromJson(JsonValue jsonValue) throws TokenMarshalE
     /**
      * Gets the {@code JsonValue} representation of the {@code ProofTokenState}
      * @return the {@code JsonValue} of the {@code ProofTokenState}
-     * @throws IllegalStateException
+     * @throws IllegalStateException if the base64 representation of the certificate cannot be obtained
      */
     public JsonValue toJson() throws IllegalStateException {
         try {
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/InstanceConfigMarshaller.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/InstanceConfigMarshaller.java
index 748cebf471..8deb93d069 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/InstanceConfigMarshaller.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/InstanceConfigMarshaller.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts;
@@ -24,12 +26,12 @@
 
 /**
  * Interface to represent the concerns of marshalling to RestSTSInstanceConfig and SoapSTSInstanceConfig instances to/from either
- * the Map> SMS representation or the json representation. Simply wraps the static methods in the
+ * the {@code Map>} SMS representation or the json representation. Simply wraps the static methods in the
  * RestSTSInstanceConfig and SoapSTSInstanceConfig classes, so that they can be easily mocked.
  */
 public interface InstanceConfigMarshaller {
     /**
-     * Called to marshal an STSInstanceConfig subclass instance to the Map> required for SMS persistence.
+     * Called to marshal an STSInstanceConfig subclass instance to the {@code Map>} required for SMS persistence.
      * @param instance the to-be-marshaled instance
      * @return the SMS-persistence-ready representation of STSInstanceConfig state.
      * @throws STSPublishException if an exception occurs during the marshalling
@@ -47,10 +49,10 @@ public interface InstanceConfigMarshaller {
     /**
      * Marshal STSInstanceConfig subclass instance from the SMS representation, wrapped in json. The ViewBean classes
      * which allow AdminConsole users to configure Soap and Rest STS instances ultimately call the sts publish service
-     * to publish the Rest or Soap STS instance. The invocation payload is the SMS Map> representation
+     * to publish the Rest or Soap STS instance. The invocation payload is the SMS {@code Map>} representation
      * native to the ViewBean context, wrapped in a JsonValue, so that it may be posted to CREST. This method defines the
      * contract to marshal this representation back to a STSInstanceConfig subclass.
-     * @param jsonMapAttributes the Map> native to the ViewBean context and to SMS persistence, wrapped
+     * @param jsonMapAttributes the {@code Map>} native to the ViewBean context and to SMS persistence, wrapped
      *                          in a JsonValue
      * @return a STSInstanceConfig subclass
      * @throws STSPublishException if an exception occurs during the marshalling
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/STSPublishException.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/STSPublishException.java
index f1c7c65c4a..8e2e4ec042 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/STSPublishException.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/STSPublishException.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts;
@@ -23,14 +25,14 @@
  */
 public class STSPublishException extends ResourceException {
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code and detail message.
      */
     public STSPublishException(int code, String message) {
         super(code, message);
     }
 
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code, detail message and underlying cause.
      */
     public STSPublishException(int code, String message, Throwable cause) {
         super(code, message, cause);
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCancellationException.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCancellationException.java
index b122d0458e..5988c0fad6 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCancellationException.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCancellationException.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts;
@@ -23,14 +25,14 @@
  */
 public class TokenCancellationException extends ResourceException {
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code and detail message.
      */
     public TokenCancellationException(int code, String message) {
         super(code, message);
     }
 
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code, detail message and underlying cause.
      */
     public TokenCancellationException(int code, String message, Throwable cause) {
         super(code, message, cause);
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCreationException.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCreationException.java
index 2b4d51bd12..a12781f2a1 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCreationException.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenCreationException.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts;
@@ -25,14 +27,14 @@
  */
 public class TokenCreationException extends ResourceException {
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code and detail message.
      */
     public TokenCreationException(int code, String message) {
         super(code, message);
     }
 
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code, detail message and underlying cause.
      */
     public TokenCreationException(int code, String message, Throwable cause) {
         super(code, message, cause);
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenIdGenerationException.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenIdGenerationException.java
index 9ae61ed4de..1c06f4afdd 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenIdGenerationException.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenIdGenerationException.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts;
@@ -24,14 +26,14 @@
  */
 public class TokenIdGenerationException extends ResourceException {
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code and detail message.
      */
     public TokenIdGenerationException(int code, String message) {
         super(code, message);
     }
 
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code, detail message and underlying cause.
      */
     public TokenIdGenerationException(int code, String message, Throwable cause) {
         super(code, message, cause);
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenValidationException.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenValidationException.java
index f4e7d49b2a..e30fb61f7e 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenValidationException.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/TokenValidationException.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts;
@@ -26,14 +28,14 @@
 public class TokenValidationException extends ResourceException {
 
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code and detail message.
      */
     public TokenValidationException(int code, String message) {
         super(code, message);
     }
 
     /**
-     * {@inheritDoc}
+     * Constructs an exception with the given error code, detail message and underlying cause.
      */
     public TokenValidationException(int code, String message, Throwable cause) {
         super(code, message, cause);
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/AMSessionInvalidator.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/AMSessionInvalidator.java
index 078e75e09a..c967d036fa 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/AMSessionInvalidator.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/AMSessionInvalidator.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.token.provider;
@@ -28,7 +30,7 @@ public interface AMSessionInvalidator {
     /**
      *
      * @param sessionIds the to-be-invalidated session ids. Can be empty. Will not be null.
-     * @throws TokenCreationException
+     * @throws TokenCreationException if one or more of the OpenAM sessions could not be invalidated
      */
     void invalidateAMSessions(Set sessionIds) throws TokenCreationException;
 }
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/TokenServiceConsumer.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/TokenServiceConsumer.java
index 268480947c..261c3e5c1e 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/TokenServiceConsumer.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/provider/TokenServiceConsumer.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.token.provider;
@@ -105,7 +107,7 @@ String getOpenIdConnectToken(String ssoTokenString, String stsInstanceId, String
      * @param callerSSOTokenString The session id corresponding to the caller. The TokenService will be protected
      *                             by an authz module.
      * @return true if the token is valid.
-     * @throws TokenCancellationException in case the TokenService could not be invoked, or threw an exception in the context
+     * @throws TokenValidationException in case the TokenService could not be invoked, or threw an exception in the context
      * of validating the token.
      */
     boolean validateToken(String tokenId, String callerSSOTokenString) throws TokenValidationException;
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/disp/TokenAuthenticationRequestDispatcher.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/disp/TokenAuthenticationRequestDispatcher.java
index c5b3500cd6..18f2e35e3b 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/disp/TokenAuthenticationRequestDispatcher.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/disp/TokenAuthenticationRequestDispatcher.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.token.validator.disp;
@@ -28,7 +30,7 @@ public interface TokenAuthenticationRequestDispatcher {
     /**
      *
      * @param url The URL against which the request should be dispatched.
-     * @param authTarget Necessary to access the Map which can contain necessary context information - e.g. configured
+     * @param authTarget Necessary to access the {@code Map} which can contain necessary context information - e.g. configured
      *                   parameters for the targeted authN module. This reference can be null.
      * @param token The token which will be dispatched to the OpenAM authN context.
      * @return The state corresponding to a successful invocation. Produced by the OpenAM rest-authN context.
diff --git a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/url/AuthenticationUrlProvider.java b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/url/AuthenticationUrlProvider.java
index eb96b92cb7..541e47abe9 100644
--- a/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/url/AuthenticationUrlProvider.java
+++ b/openam-sts/openam-common-sts/src/main/java/org/forgerock/openam/sts/token/validator/url/AuthenticationUrlProvider.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.token.validator.url;
@@ -35,7 +37,7 @@ public interface AuthenticationUrlProvider {
      * Returns the String representing the URL against which the authentication invocation will be made.
      * @param tokenTypeId The to-be-validated Token.
      * @return The URL targeted by the authentication request - e.g. with the appropriate
-     * ?realm=phill&authIndexType=service&authIndexValue=[SERVICE_NAME] elements appended onto the httpBasePath.
+     * {@code ?realm=phill&authIndexType=service&authIndexValue=[SERVICE_NAME]} elements appended onto the httpBasePath.
      */
     URL authenticationUrl(TokenTypeId tokenTypeId) throws TokenValidationException;
 }
diff --git a/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisher.java b/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisher.java
index 1ae97f0175..502814a72f 100644
--- a/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisher.java
+++ b/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisher.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.publish.rest;
@@ -41,7 +43,7 @@ public interface RestSTSInstancePublisher {
      * @param republish Determines whether this is an initial publish, or a re-publish. If re-publish, instanceConfig
      *                  not written to the SMS.
      * @return the urlElement, including the realm, at which the Rest STS instance has been published.
-     * @throws STSPublishException
+     * @throws STSPublishException if the Rest STS instance could not be published
      */
     String publishInstance(RestSTSInstanceConfig instanceConfig, RestSTS instance, boolean republish) throws STSPublishException;
 
@@ -53,7 +55,7 @@ public interface RestSTSInstancePublisher {
      *                             on another server, and thus removed from the SMS, but requiring removal from the CREST router.
      *                             Set to false in all other cases.
      *
-     * @throws STSPublishException
+     * @throws STSPublishException if the Rest STS instance could not be removed
      */
     void removeInstance(String stsId, String realm, boolean removeOnlyFromRouter) throws STSPublishException;
 
@@ -133,7 +135,7 @@ public interface RestSTSInstancePublisher {
      * @param stsId The sts id, obtained from RestSTSInstanceConfig#getDeploymentSubPath
      * @param realm The realm in which the Rest STS is to be deployed.
      * @return The RestSTSInstanceConfig corresponding to this published instance
-     * @throws STSPublishException
+     * @throws STSPublishException if the published instance state could not be obtained
      */
     RestSTSInstanceConfig getPublishedInstance(String stsId, String realm) throws STSPublishException;
 
@@ -162,7 +164,7 @@ public interface RestSTSInstancePublisher {
      * @param stsId The sts id, obtained from RestSTSInstanceConfig#getDeploymentSubPath
      * @param realm The realm in which the Rest STS is to be deployed.
      *
-     * @throws STSPublishException
+     * @throws STSPublishException if the SMS could not be queried for the instance
      */
     boolean isInstancePersistedInSMS(String stsId, String realm) throws STSPublishException;
 
diff --git a/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisherImpl.java b/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisherImpl.java
index 708ddacaf7..90b0224261 100644
--- a/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisherImpl.java
+++ b/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/rest/RestSTSInstancePublisherImpl.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
- * Portions Copyrighted 2025 3A Systems, LLC.
+ * Portions Copyrighted 2025-2026 3A Systems, LLC.
  */
 
 package org.forgerock.openam.sts.publish.rest;
@@ -216,7 +216,7 @@ public synchronized void removeInstance(String stsId, String realm, boolean remo
     }
 
     /**
-     * {@InheritDoc}
+     * {@inheritDoc}
      * The method is synchronized primarily as a sanity check, as excluding concurrent updates to published rest-sts instance
      * state makes the system easier to reason about.
      */
@@ -233,7 +233,7 @@ public synchronized void updateInstanceInSMS(String stsId, String realm, RestSTS
     }
 
     /**
-     * {@InheritDoc}
+     * {@inheritDoc}
      * The method is synchronized so that two instances are not updated concurrently, as multiple configurations must be
      * completed atomically.
      */
diff --git a/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/soap/SoapSTSInstancePublisher.java b/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/soap/SoapSTSInstancePublisher.java
index 47d5e1edd1..d37676561f 100644
--- a/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/soap/SoapSTSInstancePublisher.java
+++ b/openam-sts/openam-publish-sts/src/main/java/org/forgerock/openam/sts/publish/soap/SoapSTSInstancePublisher.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.publish.soap;
@@ -35,7 +37,7 @@ public interface SoapSTSInstancePublisher {
      * means persisting it to the SMS and exposing it via CREST.
      * @param instanceConfig The configuration state for the to-be-published Soap STS instance.
      * @return the urlElement, including the realm, at which the Soap STS instance has been published.
-     * @throws org.forgerock.openam.sts.STSPublishException
+     * @throws org.forgerock.openam.sts.STSPublishException if the Soap STS instance could not be published
      */
     String publishInstance(SoapSTSInstanceConfig instanceConfig) throws STSPublishException;
 
@@ -44,7 +46,7 @@ public interface SoapSTSInstancePublisher {
      * @param stsId The sts id, obtained from SoapSTSInstanceConfig#getDeploymentSubPath
      * @param realm The realm in which the Soap STS is to be deployed.
      *
-     * @throws STSPublishException
+     * @throws STSPublishException if the Soap STS instance could not be removed
      */
     void removeInstance(String stsId, String realm) throws STSPublishException;
 
@@ -70,7 +72,7 @@ public interface SoapSTSInstancePublisher {
      * @param stsId The sts id, obtained from SoapSTSInstanceConfig#getDeploymentSubPath
      * @param realm The realm in which the Soap STS is to be deployed.
      * @return The SoapSTSInstanceConfig corresponding to this published instance
-     * @throws STSPublishException
+     * @throws STSPublishException if the published instance state could not be obtained
      */
     SoapSTSInstanceConfig getPublishedInstance(String stsId, String realm) throws STSPublishException;
 
diff --git a/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/token/validator/RestUsernameTokenTransformValidator.java b/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/token/validator/RestUsernameTokenTransformValidator.java
index c7f9e2a833..44e03d5c43 100644
--- a/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/token/validator/RestUsernameTokenTransformValidator.java
+++ b/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/token/validator/RestUsernameTokenTransformValidator.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.rest.token.validator;
@@ -25,7 +27,7 @@
 import org.forgerock.openam.sts.token.validator.ValidationInvocationContext;
 
 /**
- * Responsible for validating RestUsernameToken instances, which is simply a  combination.
+ * Responsible for validating RestUsernameToken instances, which is simply a {@code } combination.
  */
 public class RestUsernameTokenTransformValidator implements RestTokenTransformValidator {
     private final AuthenticationHandler authenticationHandler;
diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/SoapSTSConsumer.java b/openam-sts/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/SoapSTSConsumer.java
index 4945ddfefc..47d057af77 100644
--- a/openam-sts/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/SoapSTSConsumer.java
+++ b/openam-sts/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/SoapSTSConsumer.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.soap;
@@ -273,7 +273,7 @@ public SecurityToken issueToken(EndpointSpecification endpointSpecification, Tok
      * Invokes the soap-sts Validate operation
      * @param endpointSpecification port and service qname of soap-sts instance to be invoked
      * @param toBeValidatedToken the to-be-validated SecurityToken instance returned from the Issue operation
-     * @throws SoapSTSConsumerException
+     * @throws SoapSTSConsumerException if an exception occurred when validating the token
      */
     public boolean validateToken(EndpointSpecification endpointSpecification,
                                  SecurityToken toBeValidatedToken) throws SoapSTSConsumerException {
diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/audit/AuditContextFilter.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/audit/AuditContextFilter.java
index 29185f87ba..b3c4a15e36 100644
--- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/audit/AuditContextFilter.java
+++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/audit/AuditContextFilter.java
@@ -12,6 +12,8 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.soap.audit;
@@ -31,11 +33,11 @@
 
 /**
  * Servlet filter for initializing thread local RequestContext when request handling begins
- * and discarding it when handling completes. This is a copy of the AuditContextFilter -
- * @see {@link org.forgerock.openam.audit.context.AuditContextFilter}. The code is duplicated because the original
+ * and discarding it when handling completes. This is a copy of the
+ * {@code org.forgerock.openam.audit.context.AuditContextFilter}. The code is duplicated because the original
  * AuditContextFilter resolved some dependencies via the InjectorHolder,
- * and given the current Guice complexity, we did not want to add additional @GuiceModule instances and the ServletContextListener
- * which would populate the InjectorHolder with the bindings in the @GuiceModule instances.
+ * and given the current Guice complexity, we did not want to add additional {@code @GuiceModule} instances and the ServletContextListener
+ * which would populate the InjectorHolder with the bindings in the {@code @GuiceModule} instances.
  *
  * @since 13.0.0
  */
diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/bootstrap/SoapSTSAccessTokenProvider.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/bootstrap/SoapSTSAccessTokenProvider.java
index 3e7468d781..9a77882e3c 100644
--- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/bootstrap/SoapSTSAccessTokenProvider.java
+++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/bootstrap/SoapSTSAccessTokenProvider.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.soap.bootstrap;
@@ -39,8 +41,7 @@ public interface SoapSTSAccessTokenProvider {
     public void invalidateAccessToken(String accessToken);
 
     /**
-     * Retrieves soap-sts agent token with retry. 
-     * @param accessToken the accessToken returned fom getAccessToken.
+     * Retrieves soap-sts agent token with retry.
      * @return the SSOToken identifier corresponding to the authN of this soap-sts deployment. Won't return null.
      * @throws org.forgerock.json.resource.ResourceException if authentication failed for any reason.
      */
diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/oidc/SoapOpenIdConnectTokenAuthnContextMapper.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/oidc/SoapOpenIdConnectTokenAuthnContextMapper.java
index 8933ca1276..93df1bf962 100644
--- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/oidc/SoapOpenIdConnectTokenAuthnContextMapper.java
+++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/oidc/SoapOpenIdConnectTokenAuthnContextMapper.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.soap.token.provider.oidc;
@@ -38,7 +38,7 @@ public interface SoapOpenIdConnectTokenAuthnContextMapper {
      * @param securityPolicyBindingTraversalYield The yield of SecurityPolicy binding verification, as generated by apache
      *                                            wss4j. See the DefaultSaml2XmlTokenAuthnContextMapper for details on
      *                                            how to parse the classes corresponding to this processing.
-     * @return  @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
+     * @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
      */
     String getAuthnContext(List securityPolicyBindingTraversalYield);
 
@@ -51,7 +51,7 @@ public interface SoapOpenIdConnectTokenAuthnContextMapper {
      *                                            wss4j. See the DefaultSaml2XmlTokenAuthnContextMapper for details on
      *                                            how to parse the classes corresponding to this processing.
      * @param delegatedToken The token provided as part of the ActAs/OnBehalfOf element specified in the RequestSecurityToken.
-     * @return  @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
+     * @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
      */
     String getAuthnContextForDelegatedToken(List securityPolicyBindingTraversalYield, ReceivedToken delegatedToken);
 }
diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/saml2/Saml2XmlTokenAuthnContextMapper.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/saml2/Saml2XmlTokenAuthnContextMapper.java
index 41089299e5..5c4ea203b1 100644
--- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/saml2/Saml2XmlTokenAuthnContextMapper.java
+++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/provider/saml2/Saml2XmlTokenAuthnContextMapper.java
@@ -12,7 +12,7 @@
 * information: "Portions Copyrighted [year] [name of copyright owner]".
 *
 * Copyright 2014-2015 ForgeRock AS.
-* Portions Copyrighted 2025 3A-Systems LLC.
+* Portions Copyrighted 2025-2026 3A-Systems LLC.
 */
 
 package org.forgerock.openam.sts.soap.token.provider.saml2;
@@ -38,7 +38,7 @@ public interface Saml2XmlTokenAuthnContextMapper {
      * @param securityPolicyBindingTraversalYield The yield of SecurityPolicy binding verification, as generated by apache
      *                                            wss4j. See the DefaultSaml2XmlTokenAuthnContextMapper for details on
      *                                            how to parse the classes corresponding to this processing.
-     * @return  @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
+     * @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
      */
     String getAuthnContext(List securityPolicyBindingTraversalYield);
 
@@ -51,7 +51,7 @@ public interface Saml2XmlTokenAuthnContextMapper {
      *                                            wss4j. See the DefaultSaml2XmlTokenAuthnContextMapper for details on
      *                                            how to parse the classes corresponding to this processing.
      * @param delegatedToken The token provided as part of the ActAs/OnBehalfOf element specified in the RequestSecurityToken.
-     * @return  @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
+     * @return A valid AuthnContext value, as defined here: http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
      */
     String getAuthnContextForDelegatedToken(List securityPolicyBindingTraversalYield, ReceivedToken delegatedToken);
 }
diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/validator/wss/OpenAMWSSUsernameTokenValidator.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/validator/wss/OpenAMWSSUsernameTokenValidator.java
index 8609efadfa..bec8bc8d82 100644
--- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/validator/wss/OpenAMWSSUsernameTokenValidator.java
+++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/java/org/forgerock/openam/sts/soap/token/validator/wss/OpenAMWSSUsernameTokenValidator.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
- * Portions Copyrighted 2025 3A-Systems LLC.
+ * Portions Copyrighted 2025-2026 3A-Systems LLC.
  */
 
 package org.forgerock.openam.sts.soap.token.validator.wss;
@@ -32,7 +32,7 @@
  * The org.apache.cxf.sts.token.validator.UsernameTokenValidator class ultimately calls a org.apache.ws.security.validate.Validator
  * instance (set via a setter) to perform the actual token validation. This class implements the ws.security.validate.Validator
  * interface and will be set in the cxf.sts.token.validator.UsernameTokenValidator class. It will perform the actual
- * UsernameToken validation by calling the OpenAM REST interface via bound TokenAuthenticationRequestDispacher
+ * UsernameToken validation by calling the OpenAM REST interface via bound {@code TokenAuthenticationRequestDispacher}
  *
  */
 public class OpenAMWSSUsernameTokenValidator extends org.apache.wss4j.dom.validate.UsernameTokenValidator {
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGeneration.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGeneration.java
index 40617ec857..43c709d970 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGeneration.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGeneration.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2;
@@ -36,7 +38,7 @@ public interface SAML2TokenGeneration {
      * @param stsInstanceState The STS-instance-specific state necessary to generate the assertion
      * @param invocationState The parameters with which the TokenGenerationService was invoked.
      * @return The String representation of the assertion
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the assertion could not be generated
      */
     String generate(SSOToken subjectToken, STSInstanceState stsInstanceState,
                     TokenGenerationServiceInvocationState invocationState) throws TokenCreationException;
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/StatementProvider.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/StatementProvider.java
index 7d88c04ad2..af3c49a878 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/StatementProvider.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/StatementProvider.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2;
@@ -35,7 +37,7 @@ public interface StatementProvider {
      * @param saml2Config The SAML2Config corresponding to the STS instance consuming the TokenGenerationService
      * @return The ConditionsProvider instance which will be invoked to obtain the Conditions included in the generated SAML2
      * assertion
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the configured ConditionsProvider could not be instantiated
      */
     ConditionsProvider getConditionsProvider(SAML2Config saml2Config) throws TokenCreationException;
 
@@ -44,7 +46,7 @@ public interface StatementProvider {
      * @param saml2Config The SAML2Config corresponding to the STS instance consuming the TokenGenerationService
      * @return The SubjectProvider instance which will be invoked to obtain the Subject included in the generated SAML2
      * assertion
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the configured SubjectProvider could not be instantiated
      */
     SubjectProvider getSubjectProvider(SAML2Config saml2Config) throws TokenCreationException;
 
@@ -53,7 +55,7 @@ public interface StatementProvider {
      * @param saml2Config The SAML2Config corresponding to the STS instance consuming the TokenGenerationService
      * @return The AuthenticationStatementsProvider instance which will be invoked to obtain the AuthenticationStatements included in the generated SAML2
      * assertion
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the configured AuthenticationStatementsProvider could not be instantiated
      */
     AuthenticationStatementsProvider getAuthenticationStatementsProvider(SAML2Config saml2Config) throws TokenCreationException;
 
@@ -62,7 +64,7 @@ public interface StatementProvider {
      * @param saml2Config The SAML2Config corresponding to the STS instance consuming the TokenGenerationService
      * @return The AttributeStatementsProvider instance which will be invoked to obtain the AttributeStatements included in the generated SAML2
      * assertion
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the configured AttributeStatementsProvider could not be instantiated
      */
     AttributeStatementsProvider getAttributeStatementsProvider(SAML2Config saml2Config) throws TokenCreationException;
 
@@ -71,7 +73,7 @@ public interface StatementProvider {
      * @param saml2Config The SAML2Config corresponding to the STS instance consuming the TokenGenerationService
      * @return The AuthzDecisionStatementsProvider instance which will be invoked to obtain the AuthzDecisionStatements included in the generated SAML2
      * assertion
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the configured AuthzDecisionStatementsProvider could not be instantiated
      */
     AuthzDecisionStatementsProvider getAuthzDecisionStatementsProvider(SAML2Config saml2Config) throws TokenCreationException;
 
@@ -80,7 +82,7 @@ public interface StatementProvider {
      * @param saml2Config The SAML2Config corresponding to the STS instance consuming the TokenGenerationService
      * @return The AttributeMapper instance which will be invoked to obtain the Attributes included in the generated SAML2
      * assertion
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the configured AttributeMapper could not be instantiated
      */
     AttributeMapper getAttributeMapper(SAML2Config saml2Config) throws TokenCreationException;
 
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AttributeStatementsProvider.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AttributeStatementsProvider.java
index 218298c671..9b6a03a2fa 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AttributeStatementsProvider.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AttributeStatementsProvider.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2.statements;
@@ -40,7 +42,7 @@ public interface AttributeStatementsProvider {
      *                        any attributes, then an empty list should be returned.
      * @return The list of AttributeStatement instances containing the mapped attributes, or an empty list, if no attributes could
      * be mapped.
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the attribute statements could not be generated
      */
     List get(SSOToken ssoToken, SAML2Config saml2Config, AttributeMapper attributeMapper) throws TokenCreationException;
 }
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AuthenticationStatementsProvider.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AuthenticationStatementsProvider.java
index 0d7525f4ab..c3cf516d93 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AuthenticationStatementsProvider.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/AuthenticationStatementsProvider.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2.statements;
@@ -37,7 +39,7 @@ public interface AuthenticationStatementsProvider {
      * @param saml2Config The STS-instance-specific SAML2 configurations
      * @param authnContextClassRef The AuthNContext class ref pulled out of the TokenGenerationServiceInvocationState.
      * @return The list of AuthnStatements
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the authentication statements could not be generated
      */
     List get(SAML2Config saml2Config, String authnContextClassRef) throws TokenCreationException;
 }
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/ConditionsProvider.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/ConditionsProvider.java
index 2ae877f141..18d5099f1b 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/ConditionsProvider.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/ConditionsProvider.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2.statements;
@@ -37,7 +39,7 @@ public interface ConditionsProvider {
      * @param issueInstant The instant at which the enclosing assertion was issued
      * @param saml2SubjectConfirmation The subject confirmation specification
      * @return The generated Conditions instance.
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the Conditions instance could not be generated
      */
     Conditions get(SAML2Config saml2Config, Date issueInstant,
                    SAML2SubjectConfirmation saml2SubjectConfirmation) throws TokenCreationException;
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/DefaultAttributeMapper.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/DefaultAttributeMapper.java
index 364e2631d2..92e4f80124 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/DefaultAttributeMapper.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/DefaultAttributeMapper.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2.statements;
@@ -59,7 +61,7 @@ public DefaultAttributeMapper(Map attributeMap) {
      *                     This implementation detail should not change the specifics of the contract, however, in which
      *                     the attributeMap is a fundamental constituent.
      * @return The list of SAML2 Attribute instances to be included in the AttributeStatement.
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the attributes could not be retrieved for the subject
      */
     public List getAttributes(SSOToken token, Map attributeMap) throws TokenCreationException {
         try {
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/SubjectProvider.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/SubjectProvider.java
index 44939353b2..ab1e79cdf8 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/SubjectProvider.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/statements/SubjectProvider.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2.statements;
@@ -40,7 +42,7 @@ public interface SubjectProvider {
      * @param assertionIssueInstant The issue instant assertion
      * @param proofTokenState The instance containing the proof token necessary for HoK assertions.
      * @return The to-be-included Subject instance
-     * @throws TokenCreationException
+     * @throws TokenCreationException if the Subject instance could not be generated
      */
     Subject get(String subjectId, String audienceId, SAML2Config saml2Config,
                 SAML2SubjectConfirmation subjectConfirmation, Date assertionIssueInstant,
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/xmlsig/KeyInfoFactory.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/xmlsig/KeyInfoFactory.java
index 1e7713449d..8ce5ba6a4b 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/xmlsig/KeyInfoFactory.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/saml2/xmlsig/KeyInfoFactory.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS. All rights reserved.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.saml2.xmlsig;
@@ -32,8 +34,8 @@ public interface KeyInfoFactory {
      * @param recipientCert The cert, passed in the invocation to the TokenGenerationService, for which KeyInfo will
      *                      be generated for inclusion in the SubjectConfirmationData for HoK assertions.
      * @return The KeyInfo Element
-     * @throws ParserConfigurationException
-     * @throws XMLSecurityException
+     * @throws ParserConfigurationException if a document builder to hold the KeyInfo element could not be created
+     * @throws XMLSecurityException if the KeyInfo element could not be generated from the certificate
      */
     public Element generatePublicKeyInfo(X509Certificate recipientCert) throws ParserConfigurationException, XMLSecurityException;
 }
diff --git a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/state/STSInstanceStateFactory.java b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/state/STSInstanceStateFactory.java
index bb966c5e18..a112060d8c 100644
--- a/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/state/STSInstanceStateFactory.java
+++ b/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/state/STSInstanceStateFactory.java
@@ -12,6 +12,8 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.sts.tokengeneration.state;
@@ -24,7 +26,7 @@
  * interface is an encapsulation of the STSInstanceConfig state, and a SAML2CryptoProvider and OpenIdConnectTokenPKIProvider
  * driven by this state.
  * This factory will be consulted to produce the instance state, which is then cached. Implementations of this interface
- * will, in turn, consume a STSInstanceConfigStore instance to access the SMS, in order to obtain the STSInstanceConfig
+ * will, in turn, consume a {@code STSInstanceConfigStore} instance to access the SMS, in order to obtain the STSInstanceConfig
  * necessary to produce an STSInstanceState instance.
  */
 public interface STSInstanceStateFactory {
diff --git a/openam-test/pom.xml b/openam-test/pom.xml
index f1967ed4e6..618cce2021 100755
--- a/openam-test/pom.xml
+++ b/openam-test/pom.xml
@@ -47,14 +47,6 @@
                     
                 
             
-
-            
-                org.apache.maven.plugins
-                maven-javadoc-plugin
-                
-                    true
-                
-            
         
     
 
diff --git a/openam-tokens/src/main/java/org/forgerock/openam/tokens/CoreTokenField.java b/openam-tokens/src/main/java/org/forgerock/openam/tokens/CoreTokenField.java
index 383fa81439..f4601c1268 100644
--- a/openam-tokens/src/main/java/org/forgerock/openam/tokens/CoreTokenField.java
+++ b/openam-tokens/src/main/java/org/forgerock/openam/tokens/CoreTokenField.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openam.tokens;
 
@@ -25,10 +26,9 @@
  * only attributes available to populate for any Token that is to be stored.
  *
  * Other enumerations may exist for the convenience of development, however
- * they must link to these enumerated values.
- *
- * @see org.forgerock.openam.cts.api.fields.SAMLTokenField
- * @see org.forgerock.openam.cts.api.fields.OAuthTokenField
+ * they must link to these enumerated values; examples include
+ * {@code org.forgerock.openam.cts.api.fields.SAMLTokenField} and
+ * {@code org.forgerock.openam.cts.api.fields.OAuthTokenField}.
  */
 public enum CoreTokenField {
     /**
diff --git a/openam-tokens/src/main/java/org/forgerock/openam/tokens/package-info.java b/openam-tokens/src/main/java/org/forgerock/openam/tokens/package-info.java
index f495a4e600..cac2957b9f 100644
--- a/openam-tokens/src/main/java/org/forgerock/openam/tokens/package-info.java
+++ b/openam-tokens/src/main/java/org/forgerock/openam/tokens/package-info.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 /**
@@ -26,7 +27,7 @@
  *     @Field(CoreTokenField.STRING_ONE)
  *     private String name;
  *     @Field(CoreTokenField.BLOB, converter = MapToJsonBytesConverter.class)
- *     private Map<String,?> complexData;
+ *     private Map<String,?> complexData;
  *
  *     // getters and setters follow...
  * }
diff --git a/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java b/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java
index 39ce1f56b8..cabaac1220 100644
--- a/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java
+++ b/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/CLIDefinitionGenerator.java
@@ -27,6 +27,7 @@
  */
 /**
  * Portions Copyrighted 2012 ForgeRock Inc
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.maven.plugins;
 
@@ -48,33 +49,30 @@
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
 /**
  *
  * @author Peter Major
- * @goal generate-cli
  */
+@Mojo(name = "generate-cli")
 public class CLIDefinitionGenerator extends AbstractMojo {
     
     private static Map mapLongToShortOptionName =
             new HashMap();
     /**
      * A list of fully qualified classnames of CLI definitions.
-     * @parameter
      */
+    @Parameter
     private List definitions = new ArrayList();
     /**
      * The directory where the generated properties files should be written to.
-     * @parameter
-     * @required
      */
+    @Parameter(required = true)
     private String outputDir;
-    /**
-     * @parameter default-value="${project}"
-     * @required
-     * @readonly
-     */
+    @Parameter(defaultValue = "${project}", required = true, readonly = true)
     protected MavenProject project = new MavenProject();
     
     public void execute() throws MojoExecutionException, MojoFailureException {
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/admin/BaseToolsResolver.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/admin/BaseToolsResolver.java
index 20c388a676..97066b6a8a 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/admin/BaseToolsResolver.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/admin/BaseToolsResolver.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -77,7 +78,7 @@ public ArrayList getDefaultOptions() {
      * Gets all the supported options. This method needs be implemented by all
      * the installer implementations, to specify the list of custom supproted 
      * options. 
-     * @return an ArrayList of ToolsOptionsInfo objects, in the
+     * @return an ArrayList of ToolsOptionsInfo objects, in the
      * desired order.
      */
     public abstract ArrayList getSupportedOptions();
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/BaseInteraction.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/BaseInteraction.java
index d10e80d8dc..79437a3dd0 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/BaseInteraction.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/BaseInteraction.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,7 +51,7 @@ public BaseInteraction() {
     /**
      * Method that needs to be implemented by the sub-classes to return 
      * the ResponseOption's and return the appropriate BaseOptions. * viz., 
-     * SingleLineOptions & MutliLineOptions. 
+     * SingleLineOptions & MutliLineOptions.
      *   
      * @param state IStateAccess
      * 
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ChoiceValidator.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ChoiceValidator.java
index 6ead2365ec..3b5afa55b6 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ChoiceValidator.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ChoiceValidator.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,9 +49,9 @@ public ChoiceValidator() throws InstallException {
      * Method isChoiceValid
      *
      *
-     * @param choice
-     * @param props
-     * @param IStateAccess
+     * @param choice the choice value entered by the user to validate
+     * @param props the map of configured valid choice values
+     * @param state the installer state access
      *
      * @return ValidationResult
      *
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/FileSystemValidator.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/FileSystemValidator.java
index fd1380996e..05d9885caa 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/FileSystemValidator.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/FileSystemValidator.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -129,7 +130,7 @@ public ValidationResult isDirectoryReadWrite(String dirname, Map props,
      *
      * @param filename File path
      * @param props Map for name value pairs
-     * @param IStateAccess 
+     * @param state the installer state access
      *
      * @return ValidationResult
      *
@@ -165,7 +166,7 @@ public ValidationResult isFileValid(String filename, Map props,
      *
      * @param filename File path
      * @param props Map for name value pairs
-     * @param IStateAccess 
+     * @param state the installer state access
      *
      * @return ValidationResult
      *
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/InstallException.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/InstallException.java
index 91b3c7fa1e..cd76875d32 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/InstallException.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/InstallException.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -47,7 +48,7 @@ public class InstallException extends Exception {
      * 
      * @param localizedMessage
      *            The message indicating the nature of the failure.
-     * @param ex
+     * @param e
      *            The exception that originally caused the failure.
      */
     public InstallException(LocalizedMessage localizedMessage, Exception e) {
@@ -58,7 +59,7 @@ public InstallException(LocalizedMessage localizedMessage, Exception e) {
     /**
      * This constructor takes a message indicating the nature of the failure.
      * 
-     * @param msg
+     * @param localizedMessage
      *            The message indicating the nature of the failure.
      */
     public InstallException(LocalizedMessage localizedMessage) {
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MigrateFromInstFinderStore.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MigrateFromInstFinderStore.java
index 56de3c16ea..93f2e135a3 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MigrateFromInstFinderStore.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MigrateFromInstFinderStore.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -82,10 +83,10 @@ public static synchronized MigrateFromInstFinderStore getInstance()
     /**
      * return the instance name to be migrated from.
      *
-     * @param map
-     * @param keysToUse
-     * @return
-     * @throws InstallException
+     * @param map the instance finder data map to look up
+     * @param keysToUse the list of keys used to build the unique lookup key
+     * @return the instance name to be migrated from
+     * @throws InstallException if the instance name cannot be found in the store
      */
     public String getInstanceName(Map map, ArrayList keysToUse)
     throws InstallException {
@@ -114,9 +115,9 @@ public String getInstanceName(Map map, ArrayList keysToUse)
     /**
      * get all instances' instance finder data.
      *
-     * @param mapKeys
+     * @param mapKeys the list of instance finder keys to extract for each product
      * @return Map of all product's install details.
-     * @throws InstallException
+     * @throws InstallException if the product details cannot be read from the store
      */
     public Map getAllProductDetails(ArrayList mapKeys) throws InstallException {
         int count = size();
@@ -219,7 +220,7 @@ public String toString() {
     
     /**
      * get product home of previous product.
-     * @return 
+     * @return the product home directory of the previous product
      */
     public static String getProductHome() {
         return productHome;
@@ -227,7 +228,7 @@ public static String getProductHome() {
     
     /**
      * set product home of previous product.
-     * @oldProductHome product home of previous product.
+     * @param oldProductHome product home of previous product.
      */
     public static void setProductHome(String  oldProductHome) {
         productHome = oldProductHome;
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MultipleMigrateDriver.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MultipleMigrateDriver.java
index 52996df615..691942b01e 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MultipleMigrateDriver.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/MultipleMigrateDriver.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2008 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -56,7 +57,7 @@ public MultipleMigrateDriver() throws InstallException {
     
     /**
      * start migrate product instances.
-     * @param migrateLog
+     * @param migrateLog the installer log used to record migration progress
      */
     public void migrate(InstallLogger migrateLog) throws InstallException {
         migrate(null, INT_OPERATION_TYPE_REGULAR, migrateLog);
@@ -66,9 +67,9 @@ public void migrate(InstallLogger migrateLog) throws InstallException {
      * start migrate product instances. keep this method's signature for 
      * future expansion.
      *
-     * @param fileName
-     * @param operationType
-     * @param migrateLog
+     * @param fileName the file name of the instances to migrate (reserved for future use)
+     * @param operationType the type of migration operation to perform
+     * @param migrateLog the installer log used to record migration progress
      */
     public void migrate(String fileName, int operationType,
             InstallLogger migrateLog) throws InstallException {
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/NetworkValidator.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/NetworkValidator.java
index 3c5fa3250b..92554a29a4 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/NetworkValidator.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/NetworkValidator.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -83,12 +84,12 @@ public ValidationResult isPortValid(String port, Map props,
     }
 
     /**
-     * Checks whether the given host is a valid host or not It allows IP
-     * addresses &
-     * 
-     * @param host
-     * @param props
-     * @param state
+     * Checks whether the given host is a valid host or not. It allows IP
+     * addresses and host names.
+     *
+     * @param host the host name or IP address to validate
+     * @param props the map of name/value validation properties
+     * @param state the installer state access
      * 
      * @return ValidationResult
      * 
@@ -140,10 +141,10 @@ public ValidationResult isHostValid(String host, Map props,
 
     /**
      * Checks whether the host name is fully qualified
-     * 
-     * @param host
-     * @param props
-     * @param state
+     *
+     * @param host the host name to check for full qualification
+     * @param props the map of name/value validation properties
+     * @param state the installer state access
      * 
      * @return ValidationResult
      * 
@@ -176,10 +177,10 @@ public ValidationResult isFullyQualifiedHost(String host, Map props,
 
     /**
      * Checks if the host name is local
-     * 
-     * @param host
-     * @param props
-     * @param state
+     *
+     * @param host the host name to check
+     * @param props the map of name/value validation properties
+     * @param state the installer state access
      * 
      * @return ValidationResult
      * 
@@ -220,11 +221,11 @@ public ValidationResult isLocalHost(String host, Map props,
 
     /**
      * Method validateProtocol
-     * 
-     * 
-     * @param proto
-     * @param props
-     * @param state
+     *
+     *
+     * @param proto the protocol string to validate
+     * @param props the map of name/value validation properties
+     * @param state the installer state access
      * 
      * @return ValidationResult
      * 
@@ -257,11 +258,11 @@ public ValidationResult isValidProtocol(String proto, Map props,
 
     /**
      * Method validateURI
-     * 
-     * 
-     * @param uri
-     * @param props
-     * @param state
+     *
+     *
+     * @param uri the URI to validate
+     * @param props the map of name/value validation properties
+     * @param state the installer state access
      * 
      * @return ValidationResult
      * 
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserDataInteraction.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserDataInteraction.java
index 3d0924c317..660b94706e 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserDataInteraction.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserDataInteraction.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -55,9 +56,9 @@ public UserDataInteraction(InteractionInfo info) throws InstallException {
      * An abstract method to be implemented by child class to process user data
      * for interactive input 
      * 
-     * @pararm userInput User Input 
+     * @param userInput User Input
      * @param state IStateAccess state
-     * 
+     *
      * @return InteractionResult
      */
     abstract public InteractionResult processData(String userInput,
@@ -67,9 +68,9 @@ abstract public InteractionResult processData(String userInput,
      * abstract method to be implemented by child class to process user options
      * for interactive input 
      * 
-     * @pararm userInput User Input 
+     * @param option the user option selected for the interactive input
      * @param state IStateAccess state
-     * 
+     *
      * @return InteractionResult
      */
     abstract public InteractionResult processOption(UserOptionItem option,
@@ -135,8 +136,8 @@ public InteractionResult interactSilent(IStateAccess state, Map map)
      * 
      * @return String processedInput
      * 
-     * @throws InstallException
-     * 
+     * @throws InstallException if the silent input cannot be pre-processed
+     *
      */
     public String preProcessSilentInput(Map userResponseMap)
             throws InstallException {
@@ -262,8 +263,8 @@ protected InteractionResult confirmOnExitStatus(InteractionResult result,
      * 
      * Is required flag @return String Processed input result string
      * 
-     * @throws InstallException
-     * 
+     * @throws InstallException if the user input cannot be pre-processed
+     *
      */
     public String preProcessUserInput(String userInput, IStateAccess state,
             boolean isReq) throws InstallException {
@@ -345,8 +346,8 @@ String preProcUserInputIfOptional(String userInput, IStateAccess state)
      * 
      * @return CumulativeValResult
      * 
-     * @throws InstallException
-     * 
+     * @throws InstallException if validation of the processed input fails
+     *
      */
     public CumulativeValResult processValidators(String procInput,
             IStateAccess state, boolean isInter) throws InstallException {
@@ -460,8 +461,8 @@ private IValidation loadValidatorObject(ValidationInfo validInfo)
      * 
      * @return String default value for the interaction
      * 
-     * @throws InstallException
-     * 
+     * @throws InstallException if the default value cannot be resolved
+     *
      */
     public String processDefaultValFromAllSources(IStateAccess state)
             throws InstallException {
@@ -509,8 +510,8 @@ public String processDefaultValFromAllSources(IStateAccess state)
      * 
      * @return String default value for the interaction
      * 
-     * @throws InstallException
-     * 
+     * @throws InstallException if the default value cannot be read from state
+     *
      */
     public String processDefaultValFromStateOnly(IStateAccess state)
             throws InstallException {
@@ -527,8 +528,8 @@ public String processDefaultValFromStateOnly(IStateAccess state)
      * 
      * @param state IStateAccess interface @return boolean
      * 
-     * @throws InstallException
-     * 
+     * @throws InstallException if the value cannot be cleared from state
+     *
      */
     public void clearValueInState(IStateAccess state) throws InstallException {
         state.put(getKey(), STR_IN_EMPTY_STRING);
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserOptionItem.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserOptionItem.java
index 6fde8b3521..cdf4c36997 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserOptionItem.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserOptionItem.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -44,12 +45,12 @@
  * 
  * 
  * 
                            
- * Here 1, 2 & 3 are display items and the rest of the Strings are localized
+ * Here 1, 2 & 3 are display items and the rest of the Strings are localized
  * messages for each of those option. The localized message will be of the
  * format: 
                            
  * {0}. Continue with installation 
                            
- * Interaction Example 2: 
                             [ ? : Help, < : Back, ] 
                            
- * Here ? and < are display items. The localized messages will looks like 
                            
+ * Interaction Example 2: 
                             [ ? : Help, < : Back, ] 
                            
+ * Here ? and < are display items. The localized messages will looks like 
                            
  * 
  * 
                              *   {0} : Help
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserResponseInteraction.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserResponseInteraction.java
index 2fdc7b9efa..1dadf5a922 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserResponseInteraction.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/UserResponseInteraction.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -45,8 +46,8 @@ public UserResponseInteraction() {
      * of a UserOption with value of InteractionResultStatus object that
      * corresponds to that UserOption.
      * 
-     * @return a Map constructed with .
+     * @return a Map constructed with {@code }.
      */
     abstract protected Map getResultStatusMap();
 
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ValidatorBase.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ValidatorBase.java
index 4edcaa10e8..20d14cf026 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ValidatorBase.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/configurator/ValidatorBase.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -60,8 +61,8 @@ public ValidatorBase() throws InstallException {
      *            IStateAccess state
      * 
      * @return ValidationResult Object
-     * @throws InstallException
-     * 
+     * @throws InstallException if the named validator cannot be found or invoked
+     *
      */
     public ValidationResult validate(String name, String value, Map props,
             IStateAccess state) throws InstallException {
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/handler/MigrateHandler.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/handler/MigrateHandler.java
index deb2293b83..a1cab8219f 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/handler/MigrateHandler.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/handler/MigrateHandler.java
@@ -28,6 +28,7 @@
 
 /*
  * Portions Copyrighted [2010] [ForgeRock AS]
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.install.tools.handler;
 
@@ -58,7 +59,7 @@ public MigrateHandler() {
     
     /**
      * to make sure that migrate has no additional parameter.
-     * @param arguments
+     * @param arguments the command-line arguments passed to the migrate option
      * @return true if there's no additional parameter, false otherwise.
      */
     public boolean checkArguments(List arguments) {
@@ -78,7 +79,7 @@ public boolean checkArguments(List arguments) {
     
     /**
      * handle the request of migration.
-     * @param arguments
+     * @param arguments the command-line arguments passed to the migrate option
      */
     public void handleRequest(List arguments) {
         
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/Base64.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/Base64.java
index eb819220aa..d384079ccc 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/Base64.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/Base64.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -75,7 +76,7 @@ static public String encode(byte[] data) {
      * Returns an array of decoded bytes which were encoded in the passed byte
      * array.
      * 
-     * @param data
+     * @param encdata
      *            the array of base64-encoded characters
      * @return byte[] the decoded data array
      */
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/ExecuteCommand.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/ExecuteCommand.java
index a4cddbcfb5..534906cbcc 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/ExecuteCommand.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/ExecuteCommand.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -77,11 +78,11 @@ public static String executeJavaCommand(String jarName,
      * Method executeCommand
      *
      *
-     * @param commandArray
-     * @param environment
-     * @param resultBuffer
+     * @param commandArray the command and its arguments to execute
+     * @param environment the environment variable settings for the command
+     * @param resultBuffer the buffer that receives the command output
      *
-     * @return
+     * @return the exit status code returned by the executed command
      *
      */
     public static int executeCommand(
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileEditor.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileEditor.java
index 8f09037c8a..f34f901c5e 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileEditor.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileEditor.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -62,7 +63,7 @@ public FileEditor(String fileName) {
      * @return true if all the patterns were found and deleted. False if some
      *         patterns were not found. In such cases no changes are made to 
      *         the file.
-     * @throws Exception
+     * @throws Exception if an error occurs while reading or writing the file
      */
     public boolean deleteLines(Set matchPatterns) throws Exception {
         boolean success = false;
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileUtils.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileUtils.java
index f755f2de7f..84883c5043 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileUtils.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/FileUtils.java
@@ -26,6 +26,7 @@
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
  * Portions Copyrighted 2014 Nomura Research Institute, Ltd.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.install.tools.util;
 
@@ -115,9 +116,9 @@ public static boolean copyFile(String source, String destination)
     /**
      * Method copyJarFile to destination directory
      *
-     * @param srcDir
-     * @param destDir
-     * @param filename
+     * @param srcDir the source directory containing the jar file
+     * @param destDir the destination directory to copy the jar file to
+     * @param filename the name of the jar file to copy
      *
      */
     public static void copyJarFile(String srcDir, String destDir,
@@ -174,8 +175,8 @@ public static void copyJarFile(String srcDir, String destDir,
     /**
      * Method copyDirContents
      *
-     * @param srcDir
-     * @param destDir
+     * @param srcDir the source directory whose contents are copied
+     * @param destDir the destination directory to copy contents into
      *
      */
     public static void copyDirContents(File srcDir, File destDir)
@@ -360,9 +361,9 @@ public static boolean isFileValid(String filename) {
      * Method replaceBackWithForward
      *
      *
-     * @param str
+     * @param str the string in which back slashes are replaced
      *
-     * @return
+     * @return the string with all back slashes replaced by forward slashes
      *
      */
     public static String replaceBackWithForward(String str) {
@@ -400,10 +401,10 @@ public static boolean isDirValid(String directory) {
      * Method getLineByNumber
      *
      *
-     * @param filePath
-     * @param lineNum
+     * @param filePath the path of the file to read
+     * @param lineNum the 1-based line number to retrieve
      *
-     * @return
+     * @return the contents of the specified line, or null if it cannot be read
      *
      */
     public static String getLineByNumber(String filePath, int lineNum) {
@@ -437,13 +438,13 @@ public static String getLineByNumber(String filePath, int lineNum) {
      * Method matchPattern
      *
      *
-     * @param line
-     * @param pattern
-     * @param matchBegin
-     * @param matchEnd
-     * @param ignoreCase
+     * @param line the line of text to test
+     * @param pattern the pattern to match within the line
+     * @param matchBegin whether the pattern must match at the beginning of the line
+     * @param matchEnd whether the pattern must match at the end of the line
+     * @param ignoreCase whether the match should be case-insensitive
      *
-     * @return
+     * @return true if the line matches the pattern according to the given options
      *
      */
     public static boolean matchPattern(String line, String pattern,
@@ -494,14 +495,14 @@ public static boolean matchPattern(String line, String pattern,
      * Method getLineWithPattern
      *
      *
-     * @param filePath
-     * @param pattern
-     * @param matchBegin
-     * @param matchEnd
-     * @param ignoreCase
-     * @param beginAtLine
+     * @param filePath the path of the file to search
+     * @param pattern the pattern to search for
+     * @param matchBegin whether the pattern must match at the beginning of a line
+     * @param matchEnd whether the pattern must match at the end of a line
+     * @param ignoreCase whether the match should be case-insensitive
+     * @param beginAtLine the line number at which to start searching
      *
-     * @return
+     * @return the first line that matches the pattern, or null if none is found
      *
      */
     public static String getLineWithPattern(String filePath, String pattern,
@@ -555,14 +556,14 @@ public static String getLineWithPattern(String filePath, String pattern,
      * Method getFirstOccurence
      *
      *
-     * @param filePath
-     * @param pattern
-     * @param matchBegin
-     * @param matchEnd
-     * @param ignoreCase
-     * @param beginAtLine
+     * @param filePath the path of the file to search
+     * @param pattern the pattern to search for
+     * @param matchBegin whether the pattern must match at the beginning of a line
+     * @param matchEnd whether the pattern must match at the end of a line
+     * @param ignoreCase whether the match should be case-insensitive
+     * @param beginAtLine the line number at which to start searching
      *
-     * @return
+     * @return the line number of the first match, or -1 if none is found
      *
      */
     public static int getFirstOccurence(String filePath, String pattern,
@@ -615,13 +616,13 @@ public static int getFirstOccurence(String filePath, String pattern,
      * Method getFirstOccurence
      *
      *
-     * @param filePath
-     * @param pattern
-     * @param matchBegin
-     * @param matchEnd
-     * @param ignoreCase
+     * @param filePath the path of the file to search
+     * @param pattern the pattern to search for
+     * @param matchBegin whether the pattern must match at the beginning of a line
+     * @param matchEnd whether the pattern must match at the end of a line
+     * @param ignoreCase whether the match should be case-insensitive
      *
-     * @return
+     * @return the line number of the first match, or -1 if none is found
      *
      */
     public static int getFirstOccurence(String filePath, String pattern,
@@ -634,13 +635,13 @@ public static int getFirstOccurence(String filePath, String pattern,
      * Method getLastOccurence
      *
      *
-     * @param filePath
-     * @param pattern
-     * @param matchBegin
-     * @param matchEnd
-     * @param ignoreCase
+     * @param filePath the path of the file to search
+     * @param pattern the pattern to search for
+     * @param matchBegin whether the pattern must match at the beginning of a line
+     * @param matchEnd whether the pattern must match at the end of a line
+     * @param ignoreCase whether the match should be case-insensitive
      *
-     * @return
+     * @return the line number of the last match, or -1 if none is found
      *
      */
     public static int getLastOccurence(String filePath, String pattern,
@@ -920,11 +921,10 @@ private static String isPropertyValid(String line) {
      * Method declaration
      *
      *
-     * @param fileName
+     * @param fileName the path of the file whose lines are counted
      *
-     * @return
+     * @return the total number of lines in the file
      *
-     * @see
      */
     public static int getTotalLineNums(String fileName) {
         int lineNum = 0;
@@ -952,11 +952,11 @@ public static int getTotalLineNums(String fileName) {
      * Method insertLineByNumber
      *
      *
-     * @param filePath
-     * @param lineNum
-     * @param line
+     * @param filePath the path of the file to modify
+     * @param lineNum the 1-based line number at which to insert
+     * @param line the line of text to insert
      *
-     * @return
+     * @return true if the line was inserted successfully
      *
      */
     public static boolean insertLineByNumber(String filePath, int lineNum,
@@ -1007,6 +1007,7 @@ public static boolean insertLineByNumber(String filePath, int lineNum,
      *
      *
      * @param filePath
+     *            the path of the file to modify
      * @param lineNum
      *            begining line number
      * @param numLines
@@ -1035,10 +1036,13 @@ public static boolean removeLinesByNum(String filePath, int lineNum,
      *
      *
      * @param filePath
+     *            the path of the file to modify
      * @param lineNum
+     *            the beginning line number (1-based)
      * @param numLines
+     *            the number of lines to remove
      *
-     * @return
+     * @return the last removed line, or {@code null} if the removal failed
      *
      */
     public static String removeLinesByNumber(String filePath, int lineNum,
@@ -1089,8 +1093,8 @@ public static String removeLinesByNumber(String filePath, int lineNum,
     /**
      * Appends the given set of lines to the specified file.
      *
-     * @param filePath
-     * @param linesToAppend
+     * @param filePath the path of the file to append to
+     * @param linesToAppend the lines to append to the file
      * @return true for success, false otherwise
      */
     public static boolean appendLinesToFile(String filePath,
@@ -1101,8 +1105,8 @@ public static boolean appendLinesToFile(String filePath,
     /**
      * Appends the given set of lines to the specified file.
      *
-     * @param filePath
-     * @param linesToAppend
+     * @param filePath the path of the file to append to
+     * @param linesToAppend the lines to append to the file
      * @param create should the file be created if it does not exist
      * @return true for success, false otherwise
      */
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/OSChecker.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/OSChecker.java
index 9a76d82648..12532fed8d 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/OSChecker.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/OSChecker.java
@@ -25,6 +25,7 @@
  * $Id: OSChecker.java,v 1.2 2008/06/25 05:51:29 qcheng Exp $
  *
  * Portions Copyrighted 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package com.sun.identity.install.tools.util;
@@ -101,12 +102,13 @@ public static boolean match(String name, int majorVersion, int minorVersion) {
 
     /**
      * Method matchApprox
-     * 
-     * 
+     *
+     *
      * @param name
-     * 
-     * @return
-     * 
+     *            the operating system name to match against
+     *
+     * @return true if the current OS name begins with the given name
+     *
      */
     public static boolean matchApprox(String name) {
         return (osName.regionMatches(true, 0, name, 0, name.length()));
@@ -139,11 +141,10 @@ public static boolean atleast(String name, int majorVersion, int minorVersion) {
      * Check if current operating system architecture matches with a given
      * architecture
      * 
-     * @param name
-     * 
-     * @return
-     * 
-     * @see
+     * @param name the architecture name to compare against
+     *
+     * @return true if the current OS architecture matches the given name
+     *
      */
     public static boolean matchArch(String name) {
         return osArchitecture.equalsIgnoreCase(name);
@@ -151,10 +152,10 @@ public static boolean matchArch(String name) {
 
     /**
      * Method isSolaris
-     * 
-     * 
-     * @return
-     * 
+     *
+     *
+     * @return true if the current operating system is Solaris
+     *
      */
     public static boolean isSolaris() {
         return matchApprox(SUNOS);
@@ -162,10 +163,10 @@ public static boolean isSolaris() {
 
     /**
      * Method isWindows
-     * 
-     * 
-     * @return
-     * 
+     *
+     *
+     * @return true if the current operating system is Windows
+     *
      */
     static public boolean isWindows() {
         return matchApprox(WINDOWS);
@@ -173,10 +174,10 @@ static public boolean isWindows() {
 
     /**
      * Method isUnix
-     * 
-     * 
-     * @return
-     * 
+     *
+     *
+     * @return true if the current operating system is a Unix variant
+     *
      */
     public static boolean isUnix() {
         return (isSolaris() || isHPUX() || isLinux() || isAIX() || isOSX());
@@ -231,10 +232,10 @@ public static void parseVersion(String version) {
 
     /**
      * Method isHPUX
-     * 
-     * 
-     * @return
-     * 
+     *
+     *
+     * @return true if the current operating system is HP-UX
+     *
      */
     public static boolean isHPUX() {
         return (matchApprox(HPUX));
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/RESTEndpoint.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/RESTEndpoint.java
index cf2e0e5066..3f6315f422 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/RESTEndpoint.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/RESTEndpoint.java
@@ -14,6 +14,7 @@
  * Copyright 2016 ForgeRock AS.
  *
  * Portions Copyright 2008 Sun Microsystems Inc.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package com.sun.identity.install.tools.util;
 
@@ -75,7 +76,7 @@ private RESTEndpoint(RESTEndpointBuilder builder) {
     /**
      * Call a REST endpoint, returning its response.
      * @return RESTResponse object containing status and text of returned value.
-     * @throws IOException
+     * @throws IOException if an I/O error occurs while calling the endpoint
      */
     public RESTResponse call() throws IOException {
 
@@ -242,17 +243,17 @@ public RESTEndpointBuilder() {
          * This is where we assemble the path (straightforward in itself) but substitute the realm.  For a number of
          * URLs we use, the realm is not involved (none of the OIDC calls use it) but for others (like the identity
          * endpoint) it is very important.  Unfortunately substituting it is painful as we can accidentally change
-         * 
                            
+         * 
                            
          * path1/{REALM}/path2
-         * 
                            
+         * 
                            
          * to
-         * 
                            
+         * 
                            
          * path1//path2
-         * 
                            
+         * 
                            
          * when the realm is undefined (i.e. it is the root realm), or even worse:
-         * 
                            
+         * 
                            
          * path1///path2
-         * 
                            
+         * 
                            
          * when the realm is set to "/".
          *
          * @return the carefully assembled path
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/BoundedToken.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/BoundedToken.java
index 23145d35e7..4ba0ea6506 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/BoundedToken.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/BoundedToken.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -30,8 +31,8 @@
 
 /**
  * Represents a bounded string fragment of an XML document. A bounded string
- * framgement is defined as a set of characters that begins with a '<' and end
- * with '>' character.
+ * framgement is defined as a set of characters that begins with a {@code '<'} and end
+ * with {@code '>'} character.
  */
 public class BoundedToken extends Token {
 
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/Token.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/Token.java
index 6c80b31020..cf9c7cab9e 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/Token.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/Token.java
@@ -61,8 +61,8 @@ public String toString() {
 
     /**
      * Returns the string representation of the token
-     * 
-     * @return
+     *
+     * @return the string representation of the token
      */
     protected String getTokenString() {
         return tokenString;
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLDocument.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLDocument.java
index b36ac3cf03..e032fa3ef4 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLDocument.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLDocument.java
@@ -246,8 +246,8 @@ public void setValueIndent() {
      * Returns the DOCTYPE string associated with the first DOCTYPE element
      * present in this document. This method may return null if no DOCTYPE 
      * token is already present in the document.
-     * 
-     * @return
+     *
+     * @return the DOCTYPE string, or {@code null} if the document has no DOCTYPE token
      */
     public String getDoctypeString() {
         String result = null;
@@ -264,10 +264,10 @@ public String getDoctypeString() {
      * throw an Exception if the given document does not contain a predefined
      * DOCTYPE element.
      * 
-     * @param newDoctypeString
-     * @throws Exception
+     * @param newDoctypeString the new DOCTYPE string to set on the document
+     * @throws Exception if the document does not contain a predefined DOCTYPE element
      */
-    public void updatedDoctypeString(String newDoctypeString) throws Exception 
+    public void updatedDoctypeString(String newDoctypeString) throws Exception
     {
         DoctypeToken dctoken = getDoctypeToken();
         if (dctoken != null) {
diff --git a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLElement.java b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLElement.java
index 45e41819c1..576bf03d9e 100644
--- a/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLElement.java
+++ b/openam-tools/openam-installtools/src/main/java/com/sun/identity/install/tools/util/xml/XMLElement.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2006 Sun Microsystems Inc. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -83,9 +84,9 @@ public String getAttributeValue(String name) {
     /**
      * Adds the given child element at the given index.
      * 
-     * @param child
-     * @param index
-     * @throws Exception
+     * @param child the child element to add
+     * @param index the index at which to insert the child element
+     * @throws Exception if the child element cannot be added
      */
     public void addChildElementAt(XMLElement child, int index) throws Exception
     {
@@ -166,9 +167,9 @@ private void insertEndToken() throws Exception {
      * Appends the given child element to the end of the list of existing child
      * elements.
      * 
-     * @param child
-     * @param addAfterNewLine
-     * @throws Exception
+     * @param child the child element to append
+     * @param addAfterNewLine whether to append a new line after the child element
+     * @throws Exception if the child element cannot be added
      */
     public void addChildElement(XMLElement child, boolean addAfterNewLine)
             throws Exception {
@@ -248,8 +249,6 @@ public void updateValue(String value) throws Exception {
      *            the name of the attribute to be updated or added
      * @param value
      *            the value of the attirbute
-     * @throws Exception
-     *             if the update was not successful
      */
     public void updateAttribute(String name, String value) {
         updateAttribute(name, value, true);
diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/PolicySearch.java b/openam-uma/src/main/java/org/forgerock/openam/uma/PolicySearch.java
index 3e4017f36b..934cce30db 100644
--- a/openam-uma/src/main/java/org/forgerock/openam/uma/PolicySearch.java
+++ b/openam-uma/src/main/java/org/forgerock/openam/uma/PolicySearch.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.uma;
@@ -34,7 +35,7 @@ public final class PolicySearch {
     /**
      *
      *
-     * @param policies
+     * @param policies the collection of UMA policies this search is based on
      */
     public PolicySearch(Collection policies) {
         this.policies = policies;
@@ -51,9 +52,9 @@ public PolicySearch() {
     /**
      *
      *
-     * @param field
-     * @param value
-     * @return
+     * @param field the JSON pointer identifying the field to match on
+     * @param value the value the field must equal
+     * @return a new {@code PolicySearch} containing the policies whose field matches the value
      */
     public PolicySearch equals(JsonPointer field, Object value) {
         PolicySearch policySearch = new PolicySearch();
@@ -84,7 +85,7 @@ private void add(UmaPolicy policy) {
     /**
      *
      *
-     * @return
+     * @return the collection of UMA policies held by this search
      */
     public Collection getPolicies() {
         return policies;
@@ -93,8 +94,8 @@ public Collection getPolicies() {
     /**
      *
      *
-     * @param search
-     * @return
+     * @param search the search whose policies should be combined with this one
+     * @return a new {@code PolicySearch} containing the union of both sets of policies
      */
     public PolicySearch combine(PolicySearch search) {
         HashSet combinedPolicies = new HashSet(this.policies);
@@ -105,8 +106,8 @@ public PolicySearch combine(PolicySearch search) {
     /**
      *
      *
-     * @param search
-     * @return
+     * @param search the search whose policies should be removed from this one
+     * @return a new {@code PolicySearch} with the given search's policies removed
      */
     public PolicySearch remove(PolicySearch search) {
         Set subPolicies = new HashSet(this.policies);
diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/UmaPolicyService.java b/openam-uma/src/main/java/org/forgerock/openam/uma/UmaPolicyService.java
index d2731804a9..1f52ccddc9 100644
--- a/openam-uma/src/main/java/org/forgerock/openam/uma/UmaPolicyService.java
+++ b/openam-uma/src/main/java/org/forgerock/openam/uma/UmaPolicyService.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.uma;
@@ -71,11 +72,12 @@ public interface UmaPolicyService {
     Promise deletePolicy(Context context, String resourceSetId);
 
     /**
+     * Queries the UMA policies in the backend store.
      *
-     *
-     * @param context
-     * @param request
-     * @return
+     * @param context the request context
+     * @param request the query request describing which policies to return
+     * @return a promise containing a pair of the query response and the matching {@code UmaPolicy}
+     *         collection, or a {@code ResourceException}
      */
     Promise>, ResourceException> queryPolicies(Context context,
             QueryRequest request);
diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/UmaSettings.java b/openam-uma/src/main/java/org/forgerock/openam/uma/UmaSettings.java
index 4cd82d6c61..0b801c2832 100644
--- a/openam-uma/src/main/java/org/forgerock/openam/uma/UmaSettings.java
+++ b/openam-uma/src/main/java/org/forgerock/openam/uma/UmaSettings.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.uma;
@@ -69,8 +70,8 @@ public interface UmaSettings {
 
     /**
      * 
                            Gets the config file to be used to store Uma audit
                            
-     * @return
-     * @throws ServerException
+     * @return the name of the config file used to store UMA audit records
+     * @throws ServerException if there is a problem reading the configuration
      */
     String getAuditLogConfig() throws ServerException, SMSException, SSOException;
 
diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/audit/UmaAuditQueryFilterVisitor.java b/openam-uma/src/main/java/org/forgerock/openam/uma/audit/UmaAuditQueryFilterVisitor.java
index 95e2364ede..61fc768d4a 100644
--- a/openam-uma/src/main/java/org/forgerock/openam/uma/audit/UmaAuditQueryFilterVisitor.java
+++ b/openam-uma/src/main/java/org/forgerock/openam/uma/audit/UmaAuditQueryFilterVisitor.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.uma.audit;
@@ -29,7 +30,7 @@
 import java.util.TimeZone;
 
 /**
- * A visitor that returns a Map containing fieldname -> value representing fieldname==value style filters
+ * A visitor that returns a Map containing {@code fieldname -> value} representing {@code fieldname==value} style filters
  * @since 13.0.0
  */
 public class UmaAuditQueryFilterVisitor implements QueryFilterVisitor, Void, JsonPointer> {
diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetResource.java b/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetResource.java
index 445d7010ad..db21caf039 100644
--- a/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetResource.java
+++ b/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetResource.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.uma.rest;
@@ -142,7 +142,7 @@ public ResourceSetResource(ResourceSetService resourceSetService, ContextHelper
     }
 
     /**
-     * {@inheritDoc}
+     * Reads a single resource set instance, optionally augmenting it with its associated policies.
      */
     @Read(operationDescription = @Operation(
             errors = {
@@ -176,8 +176,8 @@ public Promise apply(ResourceSetDescription
     /**
      * "revokeAll" action supported, which will delete all a user's resource set UMA policies.
      *
-     * @param context {@inheritDoc}
-     * @param request {@inheritDoc}
+     * @param context the request context
+     * @param request the action request identifying the action to perform
      */
     @Action(name = "revokeAll",
             operationDescription = @Operation(
@@ -205,8 +205,8 @@ public Promise apply(Void value) throws Resou
     /**
      * Support for querying by equals for /name and /resourceServer with AND only.
      *
-     * @param context {@inheritDoc}
-     * @param request {@inheritDoc}
+     * @param context the request context
+     * @param request the query request describing the filter to apply
      */
     @Query(operationDescription = @Operation(
                     errors = {
@@ -570,8 +570,8 @@ private UnsupportedOperationException unsupportedFilterOperation(String filterTy
     /**
      * Update the none system labels on a resource set only
      *
-     * @param context {@inheritDoc}
-     * @param request {@inheritDoc}
+     * @param context the request context
+     * @param request the update request containing the new resource set content
      */
     @Update(operationDescription = @Operation(
             errors = {
diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetService.java b/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetService.java
index 3a0d08c60c..7f4094ecc9 100644
--- a/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetService.java
+++ b/openam-uma/src/main/java/org/forgerock/openam/uma/rest/ResourceSetService.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.uma.rest;
@@ -173,7 +173,7 @@ public Collection filterPolicies(SetUpgradeException                             if there is an error.
+     * @throws UpgradeException if there is an error.
      * 
      */
     public static void addAttributeDefaultValues(
@@ -874,7 +875,7 @@ public static void addAttributeDefaultValues(
      * @param choiceValuesMap a set of choice values values to
      *        be added to the attribute, the key is the i18NKey and
      *        the values it the choice value
-     * @throws UpgradeException if there is an error.
+     * @throws UpgradeException if there is an error.
      */
 
     public static void addAttributeChoiceValues(
@@ -1083,7 +1084,7 @@ public static void replaceAttributeSchema(
      *
      * @param serviceName name of the service.
      * @param value the i18NFileName attribute value.
-     * @throws UpgradeException when there is an error.
+     * @throws UpgradeException when there is an error.
      */
     public static void seti18NFileName(
             String serviceName,
@@ -1108,7 +1109,7 @@ public static void seti18NFileName(
      *
      * @param serviceName name of the service.
      * @param revisionNumber the revisionNumber of the service.
-     * @throws UpgradeException if there is an error.
+     * @throws UpgradeException if there is an error.
      */
     public static void setServiceRevision(
             String serviceName,
@@ -1484,7 +1485,7 @@ public void shutdown() {
     /**
      * Imports service data.
      * @param fileName the file containing the data in xml format.
-     * @throws UpgradeException on error
+     * @throws UpgradeException on error
      */
     public static void importServiceData(
             String fileName)
@@ -1530,7 +1531,7 @@ public static void importServiceData(
      * Imports service data
      *
      * @param fileList list of files to be imported.
-     * @throws UpgradeException
+     * @throws UpgradeException if the service data cannot be imported.
      */
     public static void importServiceData(List fileList)
             throws UpgradeException {
@@ -1602,7 +1603,7 @@ public static void importNewServiceSchema(
      * Imports new service schema.
      *
      * @param fileList list of files
-     * @throws UpgradeException
+     * @throws UpgradeException if the new service schema cannot be imported.
      */
     public static void importNewServiceSchema(
             List fileList) throws UpgradeException {
@@ -1970,7 +1971,6 @@ public static String getServerInstance(String serverName) {
      *
      * @param serverInstance the server instance value
      * @param serverId the server identifier
-     * @throws UpgradeException if there is an error.
      */
     public static void createServiceInstance(
             String serverInstance, String serverId) {
@@ -1993,7 +1993,6 @@ public static void createServiceInstance(
      *
      * @param serverInstance the server instance value
      * @param serverId the server identifier
-     * @throws UpgradeException if there is an error.
      */
     public static void createServiceInstance(
             String serverInstance, String serverId,
@@ -2294,7 +2293,7 @@ private static SchemaType getSchemaType(String schemaTypeName) {
      * Returns the ServiceManager.
      *
      * @return the ServiceManager object.
-     * @throws UpgradeException if there is an error.
+     * @throws UpgradeException if there is an error.
      */
     private static ServiceManager getServiceManager() throws UpgradeException {
         ServiceManager ssm = null;
@@ -2318,7 +2317,7 @@ private static ServiceManager getServiceManager() throws UpgradeException {
      *
      * @param adminToken admin SSOToken
      * @return the ServiceManager object.
-     * @throws UpgradeException if there is an error.
+     * @throws UpgradeException if there is an error.
      */
     private static ServiceManager getServiceManager(SSOToken adminToken)
     throws UpgradeException {
@@ -2945,7 +2944,7 @@ public static void storeProperties(Properties props) {
     /**
      * Returns the serverconfig.xml file contents as a string.
      *
-     * @return a string representing the serverconfig.xml file.
+     * @return a string representing the serverconfig.xml file.
      */
     public static String getServerConfigXML() {
         String fileName =
diff --git a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStep.java b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStep.java
index 3ee9f728c1..da02cd2658 100644
--- a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStep.java
+++ b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStep.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.upgrade.steps;
 
@@ -58,7 +58,7 @@
  * Upgrade step looks at the delegation XML (amDelegation.xml) and compares it against the current service model to
  * identify any additions. Additions include new permission or privilege entries, or additional permissions that have
  * been added to a preexisting privilege. These additions are then reflected in the service model during upgrade.
- * 
                            
+ * 
                            
  * This upgrade logic makes assumptions that the XML is in a consistent format as well as the the service model. It also
  * makes an assumption that for each listed permission under a privilege that there is a corresponding permission entry.
  *
diff --git a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStep.java b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStep.java
index 3c1b9b8f7e..b66d36c752 100644
--- a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStep.java
+++ b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStep.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.upgrade.steps;
 
@@ -108,7 +108,7 @@ protected void setDefaultValues(Properties props) {
     }
 
     /**
-     * Will check if {@link CoreTokenConstant.CTS_STORE_HOSTNAME} property will need to be updated and need the host
+     * Will check if {@link CoreTokenConstants#CTS_STORE_HOSTNAME} property will need to be updated and need the host
      * port appended to the connection string.
      * 
      * @param serverName the name of the server Instance.
diff --git a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeLDAPAuthModulesStep.java b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeLDAPAuthModulesStep.java
index 133b4cf5b7..44ba15e143 100644
--- a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeLDAPAuthModulesStep.java
+++ b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeLDAPAuthModulesStep.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 package org.forgerock.openam.upgrade.steps;
 
@@ -43,13 +43,13 @@
 
 /**
  * This upgrade step upgrades LDAP and AD auth module instances.
- * 
                            
+ * 
                            
  * If module instances have value true set for property iplanet-am-auth-ldap-ssl-enabled,
  * the property openam-auth-ldap-connection-mode with value LDAPS will be set.
- * 
                            
+ * 
                            
  * If module instances have value false set for property iplanet-am-auth-ldap-ssl-enabled,
  * the property openam-auth-ldap-connection-mode with value LDAP will be set.
- * 
                            
+ * 
                            
  * If needed property iplanet-am-auth-ldap-ssl-enabled will be removed.
  */
 @UpgradeStepInfo(dependsOn = "org.forgerock.openam.upgrade.steps.UpgradeServiceSchemaStep")
diff --git a/pom.xml b/pom.xml
index 53f6484f65..4051224d90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,8 @@
     false
     1.3.15
     2.0.69.Final
-    -Xdoclint:none
+    all,-missing
+    -Xdoclint:${doclint}
     
       -Xmx1g
       --add-opens java.base/java.lang=ALL-UNNAMED
@@ -1940,7 +1941,7 @@
             
 			  org.apache.maven.plugins
 			  maven-javadoc-plugin
-              3.11.2
+              3.12.0
 			  
 			    
 			      attach-javadocs
@@ -1950,12 +1951,24 @@
 			    
 			  
 			  
-                8
-			  	none
+                11
+			  	${doclint}
+			  	true
                 true
                 
                   org.apache.click;org.openidentityplatform.openam.click;org.openidentityplatform.openam.velocity;*.taglib*;*.taglib
                 
+                
+                
+                  --add-exports java.base/sun.security.util=ALL-UNNAMED
+                  --add-exports java.base/sun.security.x509=ALL-UNNAMED
+                  --add-exports java.base/sun.net.www.protocol.https=ALL-UNNAMED
+                  --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED
+                
 			  
 			
       

From d0383b9e837b5df3b87c9457504d44d8ddf019eb Mon Sep 17 00:00:00 2001
From: Valera V Harseko 
Date: Mon, 13 Jul 2026 11:06:42 +0300
Subject: [PATCH 2/2] Fix doclint in
 openam-samples/custom-authentication-module (merged from master)

SampleAuth.init: author the three empty @param descriptions so the newly
merged openam-samples module passes failOnWarnings.
---
 .../java/org/forgerock/openam/examples/SampleAuth.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openam-samples/custom-authentication-module/src/main/java/org/forgerock/openam/examples/SampleAuth.java b/openam-samples/custom-authentication-module/src/main/java/org/forgerock/openam/examples/SampleAuth.java
index 3d8bb3624b..c2a6953cca 100644
--- a/openam-samples/custom-authentication-module/src/main/java/org/forgerock/openam/examples/SampleAuth.java
+++ b/openam-samples/custom-authentication-module/src/main/java/org/forgerock/openam/examples/SampleAuth.java
@@ -19,6 +19,7 @@
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.openam.examples;
@@ -88,9 +89,9 @@ public SampleAuth() {
     /**
      * This method stores service attributes and localized properties for later
      * use.
-     * @param subject
-     * @param sharedState
-     * @param options
+     * @param subject the subject being authenticated
+     * @param sharedState the state shared between authentication modules
+     * @param options the configuration options for this authentication module
      */
     @Override
     public void init(Subject subject, Map sharedState, Map options) {

                  Servlet deployment configuration modes
                  ModeDescription