[java-idp-oidc] 01/02: JOIDC-17 Repackaging into the net.shibboleth.* -namespace
Henri Mikkonen
henri.mikkonen at iki.fi
Wed Dec 30 14:40:24 UTC 2020
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=02d217616e4fa17e4858d767af4c9a5779bfbc3a
commit 02d217616e4fa17e4858d767af4c9a5779bfbc3a
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Dec 30 16:35:11 2020 +0200
JOIDC-17 Repackaging into the net.shibboleth.* -namespace
https://issues.shibboleth.net/jira/browse/JOIDC-17
Renaming/repackaging with the following logic:
POMs:
before: org.geant : idp-oidc-extension-(parent/api/impl/distribution)
now: net.shibboleth.oidc : idp-plugin-oidc-op-(parent/api/impl/distribution)
Java packages:
org.geant.idpextension.oidc -> net.shibboleth.idp.plugin.oidc.op
---
idp-oidc-extension-api/pom.xml | 9 +-
.../idp/plugin/oidc/op}/audit/AuditFields.java | 0
.../oidc/op}/messaging/JSONErrorResponse.java | 0
.../oidc/op}/messaging/JSONSuccessResponse.java | 0
.../oidc/op}/messaging/OIDCWebFingerRequest.java | 0
.../oidc/op}/messaging/OIDCWebFingerResponse.java | 0
.../OIDCAuthenticationResponseConsentContext.java | 0
.../context/OIDCAuthenticationResponseContext.java | 0
...DCAuthenticationResponseTokenClaimsContext.java | 0
.../OIDCClientRegistrationResponseContext.java | 0
.../op}/messaging/context/OIDCMetadataContext.java | 0
...tRegistrationRequestMetadataLookupFunction.java | 0
...RegistrationResponseMetadataLookupFunction.java | 0
.../messaging/context/navigate/package-info.java | 0
.../oidc/op}/messaging/context/package-info.java | 0
.../plugin/oidc/op}/messaging/package-info.java | 0
.../metadata/resolver/MetadataValueResolver.java | 0
.../resolver/ProviderMetadataResolver.java | 0
.../resolver/RefreshableMetadataValueResolver.java | 0
.../RefreshableProviderMetadataResolver.java | 0
.../ServiceableProviderMetadataProvider.java | 0
.../oidc/op}/metadata/resolver/package-info.java | 0
.../idp/plugin/oidc/op}/profile/OidcEventIds.java | 0
.../op}/profile/api/OIDCSecurityConfiguration.java | 0
.../profile/config/OIDCProfileConfiguration.java | 0
.../oidc/op}/profile/config/package-info.java | 0
...bstractAuthenticationRequestLookupFunction.java | 0
.../AbstractTokenClaimsLookupFunction.java | 0
.../AbstractTokenRequestLookupFunction.java | 0
.../navigate/DefaultAuthTimeLookupFunction.java | 0
.../navigate/DefaultClientIDLookupFunction.java | 0
.../DefaultOIDCMetadataContextLookupFunction.java | 0
.../DefaultRequestCodeChallengeLookupFunction.java | 0
...ltRequestCodeChallengeMethodLookupFunction.java | 0
.../DefaultRequestCodeVerifierLookupFunction.java | 0
.../DefaultRequestLoginHintLookupFunction.java | 0
.../DefaultRequestMaxAgeLookupFunction.java | 0
.../DefaultRequestNonceLookupFunction.java | 0
.../DefaultRequestRedirectURILookupFunction.java | 0
.../DefaultRequestResponseModeLookupFunction.java | 0
.../DefaultRequestResponseTypeLookupFunction.java | 0
.../DefaultRequestStateLookupFunction.java | 0
.../DefaultRequestedAcrLookupFunction.java | 0
.../DefaultRequestedClaimsLookupFunction.java | 0
.../DefaultRequestedPromptLookupFunction.java | 0
.../DefaultRequestedScopeLookupFunction.java | 0
.../DefaultResponseClaimsSetLookupFunction.java | 0
.../DefaultUserInfoSigningAlgLookupFunction.java | 0
.../DefaultValidRedirectUrisLookupFunction.java | 0
.../navigate/MetadataStatementsLookupFunction.java | 0
...uthenticationResponseContextLookupFunction.java | 0
...CRegistrationResponseContextLookupFunction.java | 0
.../navigate/ProfileResponderIdLookupFunction.java | 0
.../navigate/SectorIdentifierLookupFunction.java | 0
.../TokenRequestAuthTimeLookupFunction.java | 0
.../TokenRequestClientIDLookupFunction.java | 0
...RequestConsentableAttributesLookupFunction.java | 0
...enRequestConsentedAttributesLookupFunction.java | 0
.../TokenRequestDeliveryClaimsLookupFunction.java | 0
...RequestIDTokenDeliveryClaimsLookupFunction.java | 0
.../navigate/TokenRequestNonceLookupFunction.java | 0
.../TokenRequestRedirectURILookupFunction.java | 0
.../TokenRequestRequestedClaimsLookupFunction.java | 0
.../navigate/TokenRequestScopeLookupFunction.java | 0
.../TokenRequestSubjectLookupFunction.java | 0
...equestUserInfoDeliveryClaimsLookupFunction.java | 0
...TokenRequestValidRequestURIsLookupFunction.java | 0
.../UserInfoRequestClientIDLookupFunction.java | 0
.../UserInfoResponseClaimsSetLookupFunction.java | 0
.../ValidatedRedirectURILookupFunction.java | 0
.../op}/profile/context/navigate/package-info.java | 0
.../idp/plugin/oidc/op}/profile/package-info.java | 0
.../plugin/oidc/op}/storage/RevocationCache.java | 0
.../oidc/op}/storage/RevocationCacheContexts.java | 0
.../op}/token/support/AccessTokenClaimsSet.java | 0
.../op}/token/support/AuthorizeCodeClaimsSet.java | 0
.../op}/token/support/RefreshTokenClaimsSet.java | 0
.../oidc/op}/token/support/TokenClaimsSet.java | 0
.../support/TokenDeliveryClaimsClaimsSet.java | 0
.../AbstractOIDCAttributeTranscoder.java | 228 ------------------
.../transcoding/OIDCAttributeTranscoder.java | 46 ----
.../oidc/attribute/transcoding/package-info.java | 19 --
.../oidc/op}/messaging/JSONErrorResponseTest.java | 0
.../op}/messaging/JSONSuccessResponseTest.java | 0
...DCAuthenticationResponseConsentContextTest.java | 0
.../OIDCAuthenticationResponseContextTest.java | 0
...thenticationResponseTokenClaimsContextTest.java | 0
.../ServiceableProviderMetadataProviderTest.java | 0
.../profile/api/OIDCSecurityConfigurationTest.java | 0
...actAuthenticationRequestLookupFunctionTest.java | 0
.../AbstractTokenClaimsLookupFunctionTest.java | 0
.../AbstractTokenRequestLookupFunctionTest.java | 0
.../BaseDefaultRequestLookupFunctionTest.java | 0
.../BaseTokenRequestLookupFunctionTest.java | 0
.../DefaultAuthTimeLookupFunctionTest.java | 0
.../DefaultClientIDLookupFunctionTest.java | 0
...faultOIDCMetadataContextLookupFunctionTest.java | 0
.../DefaultRequestLoginHintLookupFunctionTest.java | 0
.../navigate/DefaultRequestMaxAgeFunctionTest.java | 0
.../DefaultRequestNonceLookupFunctionTest.java | 0
...efaultRequestRedirectURILookupFunctionTest.java | 0
...faultRequestResponseModeLookupFunctionTest.java | 0
...faultRequestResponseTypeLookupFunctionTest.java | 0
.../DefaultRequestStateLookupFunctionTest.java | 0
.../DefaultRequestedAcrLookupFunctionTest.java | 0
.../DefaultRequestedClaimsLookupFunctionTest.java | 0
.../DefaultRequestedPromptLookupFunctionTest.java | 0
.../DefaultRequestedScopeLookupFunctionTest.java | 0
...DefaultResponseClaimsSetLookupFunctionTest.java | 0
...efaultUserInfoSigningAlgLookupFunctionTest.java | 0
...DefaultValidRedirectUrisLookupFunctionTest.java | 0
...nticationResponseContextLookupFunctionTest.java | 0
...istrationResponseContextLookupFunctionTest.java | 0
.../ProfileResponderIdLookupFunctionTest.java | 0
.../SectorIdentifierLookupFunctionTest.java | 0
.../TokenRequestAuthTimeLookupFunctionTest.java | 0
.../TokenRequestClientIDLookupFunctionTest.java | 0
...estConsentableAttributesLookupFunctionTest.java | 0
...questConsentedAttributesLookupFunctionTest.java | 0
...kenRequestDeliveryClaimsLookupFunctionTest.java | 0
...estIDTokenDeliveryClaimsLookupFunctionTest.java | 0
.../TokenRequestNonceLookupFunctionTest.java | 0
.../TokenRequestRedirectURILookupFunctionTest.java | 0
...enRequestRequestedClaimsLookupFunctionTest.java | 0
.../TokenRequestScopeLookupFunctionTest.java | 0
.../TokenRequestSubjectLookupFunctionTest.java | 0
...stUserInfoDeliveryClaimsLookupFunctionTest.java | 0
...nRequestValidRequestURIsLookupFunctionTest.java | 0
.../UserInfoRequestClientIDLookupFunctionTest.java | 0
...serInfoResponseClaimsSetLookupFunctionTest.java | 0
.../ValidatedRedirectURILookupFunctionTest.java | 0
.../oidc/op}/storage/RevocationCacheTest.java | 0
.../token/support/AccessTokenClaimsSetTest.java | 0
.../token/support/AuthorizeCodeClaimsSetTest.java | 0
.../token/support/RefreshTokenClaimsSetTest.java | 0
.../oidc/op}/token/support/TokenClaimsSetTest.java | 0
.../support/testing/BaseTokenClaimsSetTest.java | 0
.../op}/token/support/testing/package-info.java | 0
.../src/test/resources/logback-test.xml | 2 +-
idp-oidc-extension-distribution/pom.xml | 9 +-
idp-oidc-extension-impl/pom.xml | 25 +-
.../AttributeInOIDCRequestedClaimsMatcher.java | 0
.../filter/matcher/impl/package-info.java | 0
.../impl/AttributeFilterNamespaceHandler.java | 0
.../attribute/filter/spring/impl/package-info.java | 0
.../AttributeInOIDCRequestedClaimsRuleParser.java | 0
.../filter/spring/matcher/impl/package-info.java | 0
.../impl/AttributeOIDCScopePolicyRule.java | 0
.../filtercontext/impl/package-info.java | 0
.../impl/AttributeOIDCScopeRuleParser.java | 0
.../spring/policyrule/impl/package-info.java | 0
.../enc/impl/AttributeEncoderNamespaceHandler.java | 0
.../enc/impl/BaseOIDCAttributeEncoderParser.java | 0
.../spring/enc/impl/OIDCByteEncoderParser.java | 0
.../enc/impl/OIDCScopedStringEncoderParser.java | 0
.../spring/enc/impl/OIDCStringEncoderParser.java | 0
.../resolver/spring/enc/impl/package-info.java | 0
...thenticationContextReferenceAuditExtractor.java | 0
.../oidc/op}/audit/impl/ClaimsAuditExtractor.java | 0
.../impl/ClientIdRegistrationAuditExtractor.java | 0
.../op}/audit/impl/ForceAuthnAuditExtractor.java | 0
.../impl/InboundMessageClassLookupFunction.java | 0
.../op}/audit/impl/IsPassiveAuditExtractor.java | 0
.../impl/OutboundMessageClassLookupFunction.java | 0
.../op}/audit/impl/RevokedTokenAuditExtractor.java | 0
.../op}/audit/impl/SubjectTypeAuditExtractor.java | 0
.../op}/audit/impl/SubjectValueAuditExtractor.java | 0
...thenticationContextClassReferencePrincipal.java | 0
.../oidc/op}/authn/principal/package-info.java | 0
...IDCClientAuthenticableProfileConfiguration.java | 0
.../AbstractOIDCFlowAwareProfileConfiguration.java | 0
.../op}/config/OIDCCoreProtocolConfiguration.java | 0
.../OIDCDynamicRegistrationConfiguration.java | 0
.../OIDCProviderInformationConfiguration.java | 0
.../op}/config/OIDCPublishKeySetConfiguration.java | 0
.../oidc/op}/config/OIDCUserInfoConfiguration.java | 0
.../AuthorizationCodeFlowEnabledPredicate.java | 0
.../config/logic/HybridFlowEnabledPredicate.java | 0
.../config/logic/ImplicitFlowEnabledPredicate.java | 0
.../logic/RefreshTokensEnabledPredicate.java | 0
.../plugin/oidc/op}/config/logic/package-info.java | 0
.../AcrClaimAlwaysEssentialLookupFunction.java | 0
.../AlwaysIncludedAttributesLookupFunction.java | 0
.../AudienceRestrictionsLookupFunction.java | 0
.../DataEncryptionAlgorithmsLookupFunction.java | 0
.../DeniedUserInfoAttributesLookupFunction.java | 0
.../navigate/EncodedAttributesLookupFunction.java | 0
...ransportEncryptionAlgorithmsLookupFunction.java | 0
.../RegistrationValidityPeriodLookupFunction.java | 0
...bjectDecryptionConfigurationLookupFunction.java | 0
...atureValidationConfigurationLookupFunction.java | 0
.../SecretExpirationPeriodLookupFunction.java | 0
.../SignatureAlgorithmsLookupFunction.java | 0
.../TokenEndpointAuthMethodLookupFunction.java | 0
...atureValidationConfigurationLookupFunction.java | 0
.../oidc/op}/config/navigate/package-info.java | 0
.../idp/plugin/oidc/op}/config/package-info.java | 0
.../op}/criterion/ClientInformationCriterion.java | 0
.../plugin/oidc/op}/criterion/IssuerCriterion.java | 0
.../plugin/oidc/op}/criterion/package-info.java | 0
.../impl/OIDCAuthenticationRequestDecoder.java | 0
.../impl/OIDCClientRegistrationRequestDecoder.java | 0
.../op}/decoding/impl/OIDCTokenRequestDecoder.java | 0
.../decoding/impl/OIDCUserInfoRequestDecoder.java | 0
.../decoding/impl/OIDCWebFingerRequestDecoder.java | 0
.../plugin/oidc/op}/decoding/impl/RequestUtil.java | 0
.../oidc/op}/decoding/impl/package-info.java | 0
.../op}/encoding/impl/NimbusResponseEncoder.java | 0
.../encoding/impl/OIDCResponseEncoderFactory.java | 0
.../oidc/op}/encoding/impl/ResponseUtil.java | 0
.../oidc/op}/encoding/impl/package-info.java | 0
.../messaging/impl/OIDCWebFingerRequestImpl.java | 0
.../messaging/impl/OIDCWebFingerResponseImpl.java | 0
.../impl/OIDCWebFingerResponseLinkImpl.java | 0
.../oidc/op}/messaging/impl/package-info.java | 0
.../impl/AlgorithmInfoMetadataValueResolver.java | 0
.../metadata/impl/ArrayMetadataValueResolver.java | 0
.../impl/CredentialMetadataValueResolver.java | 0
.../DynamicFilesystemProviderMetadataResolver.java | 0
.../impl/FilesystemMetadataValueResolver.java | 0
.../impl/FilesystemProviderMetadataResolver.java | 0
.../oidc/op}/metadata/impl/package-info.java | 0
.../OAuth2TokenIntrospectionConfiguration.java | 0
.../config/OAuth2TokenRevocationConfiguration.java | 0
.../oidc/op}/oauth2/config/package-info.java | 0
.../impl/OAuth2IntrospectionRequestDecoder.java | 0
.../impl/OAuth2RevocationRequestDecoder.java | 0
.../op}/oauth2/decoding/impl/package-info.java | 0
.../impl/OAuth2RevocationErrorResponse.java | 0
.../impl/OAuth2RevocationSuccessResponse.java | 0
.../op}/oauth2/messaging/impl/package-info.java | 0
.../BuildIntrospectionErrorResponseFromEvent.java | 0
.../BuildRevokeTokenErrorResponseFromEvent.java | 0
.../FormOutboundIntrospectionResponseMessage.java | 0
.../FormOutboundRevokeTokenResponseMessage.java | 0
...eOutboundRevokeTokenResponseMessageContext.java | 0
...ndTokenIntrospectionResponseMessageContext.java | 0
.../oidc/op}/oauth2/profile/impl/RevokeToken.java | 0
.../oidc/op}/oauth2/profile/impl/package-info.java | 0
.../impl/AbstractBuildErrorResponseFromEvent.java | 0
...ctInitializeOutboundResponseMessageContext.java | 0
.../AbstractOIDCAuthenticationRequestAction.java | 0
.../AbstractOIDCAuthenticationResponseAction.java | 0
...AbstractOIDCClientMetadataPopulationAction.java | 0
.../profile/impl/AbstractOIDCRequestAction.java | 0
.../profile/impl/AbstractOIDCResponseAction.java | 0
.../impl/AbstractOIDCSigningResponseAction.java | 0
.../impl/AbstractOIDCTokenRequestAction.java | 0
.../impl/AbstractOIDCTokenResponseAction.java | 0
.../impl/AbstractOIDCUserInfoRequestAction.java | 0
.../impl/AbstractOIDCUserInfoResponseAction.java | 0
...stractOIDCUserInfoValidationResponseAction.java | 0
.../op}/profile/impl/AbstractSignJWTAction.java | 0
.../profile/impl/AddAccessTokenHashToIDToken.java | 0
.../oidc/op}/profile/impl/AddAcrToIDToken.java | 0
.../impl/AddApplicationTypeToClientMetadata.java | 0
.../op}/profile/impl/AddAttributesToClaimsSet.java | 0
.../op}/profile/impl/AddAuthTimeToIDToken.java | 0
.../impl/AddAuthorizationCodeHashToIDToken.java | 0
.../impl/AddClientNameToClientMetadata.java | 0
.../profile/impl/AddContactsToClientMetadata.java | 0
.../profile/impl/AddGrantTypeToClientMetadata.java | 0
.../oidc/op}/profile/impl/AddIDTokenShell.java | 0
.../op}/profile/impl/AddJwksToClientMetadata.java | 0
.../profile/impl/AddLogoUrisToClientMetadata.java | 0
.../impl/AddMetadataStatementToClientMetadata.java | 0
.../oidc/op}/profile/impl/AddNonceToIDToken.java | 0
.../impl/AddPolicyUrisToClientMetadata.java | 0
.../impl/AddRedirectUrisToClientMetadata.java | 0
...bjectSecurityConfigurationToClientMetadata.java | 0
.../impl/AddResponseTypesToClientMetadata.java | 0
.../op}/profile/impl/AddScopeToClientMetadata.java | 0
.../AddSecurityConfigurationToClientMetadata.java | 0
.../impl/AddSubjectTypeToClientMetadata.java | 0
.../AddTokenDeliveryAttributesToClaimsSet.java | 0
...ddTokenEndpointAuthMethodsToClientMetadata.java | 0
.../profile/impl/AddTosUrisToClientMetadata.java | 0
.../oidc/op}/profile/impl/AddUserInfoShell.java | 0
.../BuildAuthenticationErrorResponseFromEvent.java | 0
.../op}/profile/impl/BuildClientInformation.java | 0
.../impl/BuildJSONErrorResponseFromEvent.java | 0
.../BuildRegistrationErrorResponseFromEvent.java | 0
.../impl/BuildTokenErrorResponseFromEvent.java | 0
.../impl/BuildUserInfoErrorResponseFromEvent.java | 0
.../op}/profile/impl/BuildWebFingerResponse.java | 0
.../oidc/op}/profile/impl/CheckRedirectURIs.java | 0
.../oidc/op}/profile/impl/CheckWebFingerRel.java | 0
.../op}/profile/impl/CheckWebFingerResource.java | 0
.../op}/profile/impl/DecryptRequestObject.java | 0
.../op}/profile/impl/EncryptProcessedToken.java | 0
.../FormOutboundAuthenticationResponseMessage.java | 0
.../impl/FormOutboundDiscoveryResponse.java | 0
.../impl/FormOutboundKeySetResponseMessage.java | 0
.../impl/FormOutboundTokenResponseMessage.java | 0
.../impl/FormOutboundUserInfoResponseMessage.java | 0
.../oidc/op}/profile/impl/GenerateClientID.java | 0
.../op}/profile/impl/GenerateClientSecret.java | 0
.../impl/InitializeAuthenticationContext.java | 0
...tboundAuthenticationResponseMessageContext.java | 0
...OutboundRegistrationResponseMessageContext.java | 0
.../InitializeOutboundResponseMessageContext.java | 0
...tializeOutboundTokenResponseMessageContext.java | 0
...lizeOutboundUserInfoResponseMessageContext.java | 0
.../impl/InitializeRelyingPartyContext.java | 0
.../op}/profile/impl/InitializeSubjectContext.java | 0
.../InitializeUnverifiedRelyingPartyContext.java | 0
.../profile/impl/OIDCMetadataLookupHandler.java | 0
.../impl/PopulateOIDCEncryptionParameters.java | 0
.../profile/impl/PopulateOIDCMetadataContext.java | 0
.../PopulateOIDCSignatureSigningParameters.java | 0
...ulateOIDCSignatureSigningParametersHandler.java | 0
.../profile/impl/ProcessRequestedAuthnContext.java | 0
.../op}/profile/impl/ReduceValidatedScope.java | 0
.../oidc/op}/profile/impl/RevokeConsent.java | 0
.../impl/SetAccessTokenToResponseContext.java | 0
...assReferenceFromAuthzCodeToResponseContext.java | 0
...tionContextClassReferenceToResponseContext.java | 0
.../SetAuthenticationTimeToResponseContext.java | 0
.../SetAuthorizationCodeToResponseContext.java | 0
.../impl/SetConsentFromTokenToResponseContext.java | 0
.../profile/impl/SetConsentToResponseContext.java | 0
.../impl/SetEntityIdToSAMLPeerEntityContext.java | 0
.../impl/SetRefreshTokenToResponseContext.java | 0
.../impl/SetRequestObjectToResponseContext.java | 0
.../impl/SetRequestedClaimsToResponseContext.java | 0
.../impl/SetRequestedSubjectToResponseContext.java | 0
.../impl/SetResponseStatusCodeFromEvent.java | 0
.../SetSectorIdentifierForAttributeResolution.java | 0
.../profile/impl/SetSubjectToResponseContext.java | 0
...liveryAttributesFromTokenToResponseContext.java | 0
...etTokenDeliveryAttributesToResponseContext.java | 0
.../plugin/oidc/op}/profile/impl/SignIDToken.java | 0
.../op}/profile/impl/SignRegistrationResponse.java | 0
.../op}/profile/impl/SignUserInfoResponse.java | 0
.../op}/profile/impl/StoreClientInformation.java | 0
.../oidc/op}/profile/impl/ValidateAccessToken.java | 0
.../impl/ValidateEndpointAuthentication.java | 0
.../oidc/op}/profile/impl/ValidateGrant.java | 0
.../oidc/op}/profile/impl/ValidateGrantType.java | 0
.../plugin/oidc/op}/profile/impl/ValidatePKCE.java | 0
.../oidc/op}/profile/impl/ValidateRedirectURI.java | 0
.../op}/profile/impl/ValidateRequestObject.java | 0
.../op}/profile/impl/ValidateResponseType.java | 0
.../oidc/op}/profile/impl/ValidateScope.java | 0
.../impl/VerifyRequestedSubjectIdentifier.java | 0
.../plugin/oidc/op}/profile/impl/package-info.java | 0
.../AttributeResolutionSubjectLookupFunction.java | 0
.../profile/logic/DefaultSubjectTypeStrategy.java | 0
.../logic/PairwiseSubjectActivationCondition.java | 0
.../logic/PublicSubjectActivationCondition.java | 0
.../profile/logic/SubjectActivationCondition.java | 0
.../oidc/op}/profile/logic/package-info.java | 0
.../factory/BasicJWKCredentialFactoryBean.java | 0
.../op}/profile/spring/factory/package-info.java | 0
.../ProviderMetadataResolverServiceStrategy.java | 0
.../relyingparty/metadata/impl/package-info.java | 0
...entInformationEncryptionParametersResolver.java | 0
...ormationSignatureSigningParametersResolver.java | 0
...ationSignatureValidationParametersResolver.java | 0
.../oidc/filter/impl/ClientInformationParser.java | 69 ------
.../oidc/impl/MetadataNamespaceHandler.java | 39 ----
.../impl/OIDCByteAttributeTranscoder.java | 105 ---------
.../impl/OIDCScopedStringAttributeTranscoder.java | 103 ---------
.../impl/OIDCStringAttributeTranscoder.java | 207 -----------------
.../attribute/transcoding/impl/package-info.java | 18 --
.../ClientInformationResolverServiceStrategy.java | 91 --------
.../META-INF/net.shibboleth.idp/postconfig.xml | 22 +-
.../oauth2/introspection/introspection-beans.xml | 16 +-
.../flows/oauth2/revocation/revocation-beans.xml | 21 +-
.../oidc-abstract-api-info-beans.xml | 10 +-
.../flows/oidc/abstract/oidc-abstract-beans.xml | 42 ++--
.../idp/flows/oidc/abstract/oidc-abstract-flow.xml | 4 +-
.../idp/flows/oidc/authorize/authorize-beans.xml | 108 ++++-----
.../idp/flows/oidc/discovery/discovery-beans.xml | 16 +-
.../idp/flows/oidc/keyset/keyset-beans.xml | 2 +-
.../oidc/metadata-lookup/metadata-lookup-beans.xml | 10 +-
.../idp/flows/oidc/register/register-beans.xml | 62 ++---
.../idp/flows/oidc/token/token-beans.xml | 92 ++++----
.../idp/flows/oidc/userinfo/token-beans.xml | 56 ++---
.../idp/flows/oidc/webfinger/webfinger-beans.xml | 12 +-
.../idp/service/attribute/registry/postconfig.xml | 8 +-
.../idp/service/relying-party/postconfig.xml | 36 +--
.../src/main/resources/META-INF/spring.handlers | 5 +-
.../src/main/resources/META-INF/spring.schemas | 1 -
.../schema/idp-oidc-extension-metadata-ext.xsd | 22 --
.../AttributeInOIDCRequestedClaimsMatcherTest.java | 0
...tributeInOIDCRequestedClaimsRuleParserTest.java | 0
.../impl/AttributeOIDCScopePolicyRuleTest.java | 0
.../spring/enc/impl/OIDCByteEncoderParserTest.java | 0
.../impl/OIDCScopedStringEncoderParserTest.java | 0
.../enc/impl/OIDCStringEncoderParserTest.java | 0
...ticationContextClassReferencePrincipalTest.java | 0
.../config/OIDCCoreProtocolConfigurationTest.java | 0
.../impl/OIDCAuthenticationRequestDecoderTest.java | 0
.../OIDCClientRegistrationRequestDecoderTest.java | 0
.../decoding/impl/OIDCTokenRequestDecoderTest.java | 0
.../impl/OIDCUserInfoRequestDecoderTest.java | 0
.../impl/CredentialMetadataValueResolverTest.java | 0
...amicFilesystemProviderMetadataResolverTest.java | 0
.../impl/FilesystemMetadataValueResolverTest.java | 0
.../FilesystemProviderMetdataResolverTest.java | 0
.../OAuth2TokenRevocationConfigurationTest.java | 0
.../impl/OAuth2RevocationRequestDecoderTest.java | 0
.../impl/OAuth2RevocationErrorResponseTest.java | 0
.../impl/OAuth2RevocationSuccessResponseTest.java | 0
.../op}/oauth2/profile/impl/RevokeTokenTest.java | 0
.../op}/profile/flow/AbstractOidcApiFlowTest.java | 0
.../op}/profile/flow/AbstractOidcFlowTest.java | 0
.../oidc/op}/profile/flow/AuthorizeFlowTest.java | 0
.../oidc/op}/profile/flow/DiscoveryFlowTest.java | 0
.../op}/profile/flow/IntrospectionFlowTest.java | 0
.../oidc/op}/profile/flow/KeySetFlowTest.java | 0
.../op}/profile/flow/RegistrationFlowTest.java | 0
.../oidc/op}/profile/flow/RevocationFlowTest.java | 0
.../oidc/op}/profile/flow/TokenFlowTest.java | 0
.../plugin/oidc/op}/profile/flow/UserInfoTest.java | 0
...bstractOIDCAuthenticationRequestActionTest.java | 0
...stractOIDCAuthenticationResponseActionTest.java | 0
.../impl/AbstractOIDCTokenResponseActionTest.java | 0
.../AbstractOIDCUserInfoResponseActionTest.java | 0
.../impl/AddAccessTokenHashToIDTokenTest.java | 0
.../oidc/op}/profile/impl/AddAcrToIDTokenTest.java | 0
.../AddApplicationTypeToClientMetadataTest.java | 0
.../profile/impl/AddAttributesToClaimsSetTest.java | 0
.../op}/profile/impl/AddAuthTimeToIDTokenTest.java | 0
.../AddAuthorizationCodeHashToIDTokenTest.java | 0
.../impl/AddClientNameToClientMetadataTest.java | 0
.../impl/AddContactsToClientMetadataTest.java | 0
.../impl/AddGrantTypeToClientMetadataTest.java | 0
.../oidc/op}/profile/impl/AddIDTokenShellTest.java | 0
.../profile/impl/AddJwksToClientMetadataTest.java | 0
.../op}/profile/impl/AddNonceToIDTokenTest.java | 0
.../impl/AddRedirectUrisToClientMetadataTest.java | 0
...tSecurityConfigurationToClientMetadataTest.java | 0
.../impl/AddResponseTypesToClientMetadataTest.java | 0
.../profile/impl/AddScopeToClientMetadataTest.java | 0
...dSecurityConfigurationToClientMetadataTest.java | 0
.../AddTokenDeliveryAttributesToClaimsSetTest.java | 0
.../op}/profile/impl/AddUserInfoShellTest.java | 0
.../impl/BaseOIDCClientMetadataPopulationTest.java | 0
.../impl/BaseOIDCRegistrationRequestTest.java | 0
.../profile/impl/BaseOIDCResponseActionTest.java | 0
.../impl/BuildJSONErrorResponseFromEventTest.java | 0
.../op}/profile/impl/CheckRedirectUrisTest.java | 0
.../op}/profile/impl/DecryptRequestObjectTest.java | 0
.../profile/impl/EncryptProcessedTokenTest.java | 0
...mOutboundAuthenticationResponseMessageTest.java | 0
.../impl/FormOutboundDiscoveryResponseTest.java | 0
.../FormOutboundKeySetResponseMessageTest.java | 0
.../impl/FormOutboundTokenResponseMessageTest.java | 0
.../FormOutboundUserInfoResponseMessageTest.java | 0
.../impl/InitializeAuthenticationContextTest.java | 0
...ndAuthenticationResponseMessageContextTest.java | 0
...itializeOutboundResponseMessageContextTest.java | 0
.../impl/InitializeRelyingPartyContextTest.java | 0
.../profile/impl/InitializeSubjectContextTest.java | 0
...nitializeUnverifiedRelyingPartyContextTest.java | 0
.../impl/PopulateOIDCEncryptionParametersTest.java | 0
.../impl/ProcessRequestedAuthnContextTest.java | 0
.../op}/profile/impl/ReduceValidatedScopeTest.java | 0
.../oidc/op}/profile/impl/RevokeConsentTest.java | 0
.../impl/SetAccessTokenToResponseContextTest.java | 0
...eferenceFromAuthzCodeToResponseContextTest.java | 0
...ContextClassReferenceToResponseContextTest.java | 0
...SetAuthenticationTimeToResponseContextTest.java | 0
.../SetAuthorizationCodeToResponseContextTest.java | 0
.../SetConsentFromTokenToResponseContextTest.java | 0
.../impl/SetConsentToResponseContextTest.java | 0
.../SetEntityIdToSAMLPeerEntityContextTest.java | 0
.../impl/SetRefreshTokenToResponseContextTest.java | 0
.../SetRequestedClaimsToResponseContextTest.java | 0
.../SetRequestedSubjectToResponseContextTest.java | 0
...SectorIdentifierForAttributeResolutionTest.java | 0
.../impl/SetSubjectToResponseContextTest.java | 0
...ryAttributesFromTokenToResponseContextTest.java | 0
...kenDeliveryAttributesToResponseContextTest.java | 0
.../oidc/op}/profile/impl/SignIDTokenTest.java | 0
.../op}/profile/impl/SignUserInfoResponseTest.java | 0
.../op}/profile/impl/ValidateAccessTokenTest.java | 0
.../impl/ValidateEndpointAuthenticationTest.java | 0
.../oidc/op}/profile/impl/ValidateGrantTest.java | 0
.../op}/profile/impl/ValidateGrantTypeTest.java | 0
.../oidc/op}/profile/impl/ValidatePKCETest.java | 0
.../op}/profile/impl/ValidateRedirectURITest.java | 0
.../profile/impl/ValidateRequestObjectTest.java | 0
.../op}/profile/impl/ValidateResponseTypeTest.java | 0
.../oidc/op}/profile/impl/ValidateScopeTest.java | 0
.../impl/VerifyRequestedSubjectIdentifierTest.java | 0
...tributeResolutionSubjectLookupFunctionTest.java | 0
.../logic/SubjectActivationConditionTest.java | 0
...adProviderResolverServiceConfigurationTest.java | 0
...nformationEncryptionParametersResolverTest.java | 0
...tionSignatureSigningParametersResolverTest.java | 0
...nSignatureValidationParametersResolverTest.java | 0
.../impl/OIDCByteAttributeTranscoderTest.java | 169 --------------
.../OIDCScopedStringAttributeTranscoderTest.java | 183 ---------------
.../impl/OIDCStringAttributeTranscoderTest.java | 255 ---------------------
...loadClientResolverServiceConfigurationTest.java | 156 -------------
.../src/test/resources/conf/global.xml | 2 +-
.../src/test/resources/conf/oidc.properties | 2 +-
.../src/test/resources/logback-test.xml | 3 +-
.../idp/attribute/resolver/spring/customBean.xml | 6 +-
.../attribute/filter/matcher/requestedClaims.xml | 0
.../decoding/impl/client-registration-request.json | 0
.../EntityDescriptor-with-oidcmd-clientsecret.xml | 0
.../metadata/impl/client-secret-test.properties | 0
.../idp}/oidc/metadata/impl/dyn-value1.json | 0
.../idp}/oidc/metadata/impl/dyn-value2.json | 0
.../idp}/oidc/metadata/impl/idp-signing-rs256.jwk | 0
.../idp}/oidc/metadata/impl/oidc-client.json | 0
.../idp}/oidc/metadata/impl/oidc-client2.json | 0
.../idp}/oidc/metadata/impl/oidc-clients.json | 0
.../oidc/metadata/impl/oidc-metadata-providers.xml | 8 +-
.../metadata/impl/oidc-metadata-providers2.xml | 4 +-
.../oidc/metadata/impl/openid-configuration.json | 0
.../idp}/oidc/metadata/impl/public_keys.jwks | 0
pom.xml | 24 +-
resources/checkstyle.xml | 3 +-
518 files changed, 320 insertions(+), 2010 deletions(-)
diff --git a/idp-oidc-extension-api/pom.xml b/idp-oidc-extension-api/pom.xml
index bef534d6..14555c1e 100644
--- a/idp-oidc-extension-api/pom.xml
+++ b/idp-oidc-extension-api/pom.xml
@@ -5,16 +5,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>idp-oidc-extension-parent</artifactId>
- <groupId>org.geant</groupId>
+ <artifactId>idp-plugin-oidc-op-parent</artifactId>
+ <groupId>net.shibboleth.oidc</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>idp-oidc-extension-api</artifactId>
+ <artifactId>idp-plugin-oidc-op-api</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>org.geant.idpextension.oidc.api</automatic.module.name>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
+ <automatic.module.name>net.shibboleth.idp.plugin.oidc.op.api</automatic.module.name>
</properties>
<dependencies>
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/audit/AuditFields.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/AuditFields.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/audit/AuditFields.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/AuditFields.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/JSONErrorResponse.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponse.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/JSONErrorResponse.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponse.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/JSONSuccessResponse.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponse.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/JSONSuccessResponse.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponse.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/OIDCWebFingerRequest.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/OIDCWebFingerRequest.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/OIDCWebFingerRequest.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/OIDCWebFingerRequest.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/OIDCWebFingerResponse.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/OIDCWebFingerResponse.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/OIDCWebFingerResponse.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/OIDCWebFingerResponse.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseConsentContext.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseConsentContext.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseConsentContext.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseConsentContext.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseContext.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseContext.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseContext.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseContext.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCClientRegistrationResponseContext.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCClientRegistrationResponseContext.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCClientRegistrationResponseContext.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCClientRegistrationResponseContext.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCMetadataContext.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCMetadataContext.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/OIDCMetadataContext.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCMetadataContext.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/navigate/OIDCClientRegistrationRequestMetadataLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/OIDCClientRegistrationRequestMetadataLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/navigate/OIDCClientRegistrationRequestMetadataLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/OIDCClientRegistrationRequestMetadataLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/navigate/OIDCClientRegistrationResponseMetadataLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/OIDCClientRegistrationResponseMetadataLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/navigate/OIDCClientRegistrationResponseMetadataLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/OIDCClientRegistrationResponseMetadataLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/navigate/package-info.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/navigate/package-info.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/navigate/package-info.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/package-info.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/context/package-info.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/package-info.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/package-info.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/messaging/package-info.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/package-info.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/MetadataValueResolver.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/MetadataValueResolver.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/MetadataValueResolver.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/MetadataValueResolver.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/ProviderMetadataResolver.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/ProviderMetadataResolver.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/ProviderMetadataResolver.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/ProviderMetadataResolver.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/RefreshableMetadataValueResolver.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/RefreshableMetadataValueResolver.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/RefreshableMetadataValueResolver.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/RefreshableMetadataValueResolver.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/RefreshableProviderMetadataResolver.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/RefreshableProviderMetadataResolver.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/RefreshableProviderMetadataResolver.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/RefreshableProviderMetadataResolver.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/ServiceableProviderMetadataProvider.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/ServiceableProviderMetadataProvider.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/ServiceableProviderMetadataProvider.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/ServiceableProviderMetadataProvider.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/package-info.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/metadata/resolver/package-info.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/package-info.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/OidcEventIds.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/OidcEventIds.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/OidcEventIds.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/OidcEventIds.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/api/OIDCSecurityConfiguration.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfiguration.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/api/OIDCSecurityConfiguration.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfiguration.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/config/OIDCProfileConfiguration.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCProfileConfiguration.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/config/OIDCProfileConfiguration.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCProfileConfiguration.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/config/package-info.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/config/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/config/package-info.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/config/package-info.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenRequestLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenRequestLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultAuthTimeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultAuthTimeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultClientIDLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultClientIDLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultClientIDLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultClientIDLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultOIDCMetadataContextLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultOIDCMetadataContextLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestCodeVerifierLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeVerifierLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestCodeVerifierLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeVerifierLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestNonceLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestNonceLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestStateLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestStateLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedAcrLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedAcrLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedPromptLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedPromptLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedScopeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedScopeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultResponseClaimsSetLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultResponseClaimsSetLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultValidRedirectUrisLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultValidRedirectUrisLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/MetadataStatementsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/MetadataStatementsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/MetadataStatementsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/MetadataStatementsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCRegistrationResponseContextLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCRegistrationResponseContextLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ProfileResponderIdLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ProfileResponderIdLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/SectorIdentifierLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/SectorIdentifierLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestAuthTimeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestAuthTimeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestAuthTimeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestAuthTimeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestClientIDLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestClientIDLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestClientIDLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestClientIDLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestNonceLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestNonceLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestNonceLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestNonceLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRedirectURILookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRedirectURILookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRequestedClaimsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRequestedClaimsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRequestedClaimsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRequestedClaimsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestScopeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestScopeLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestScopeLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestScopeLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestSubjectLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestSubjectLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestSubjectLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestSubjectLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestValidRequestURIsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestValidRequestURIsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestValidRequestURIsLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestValidRequestURIsLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoRequestClientIDLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoRequestClientIDLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoRequestClientIDLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoRequestClientIDLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoResponseClaimsSetLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoResponseClaimsSetLookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/ValidatedRedirectURILookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ValidatedRedirectURILookupFunction.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/ValidatedRedirectURILookupFunction.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ValidatedRedirectURILookupFunction.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/package-info.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/context/navigate/package-info.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/package-info.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/package-info.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/profile/package-info.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/package-info.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/storage/RevocationCache.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/storage/RevocationCache.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/storage/RevocationCache.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/storage/RevocationCache.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/storage/RevocationCacheContexts.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/storage/RevocationCacheContexts.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/storage/RevocationCacheContexts.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/storage/RevocationCacheContexts.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/AccessTokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/AccessTokenClaimsSet.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/AuthorizeCodeClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSet.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/AuthorizeCodeClaimsSet.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSet.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/RefreshTokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSet.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/RefreshTokenClaimsSet.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSet.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/TokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSet.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/TokenClaimsSet.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSet.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/TokenDeliveryClaimsClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenDeliveryClaimsClaimsSet.java
similarity index 100%
rename from idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/token/support/TokenDeliveryClaimsClaimsSet.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenDeliveryClaimsClaimsSet.java
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/AbstractOIDCAttributeTranscoder.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/AbstractOIDCAttributeTranscoder.java
deleted file mode 100644
index 4b9e9e67..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/AbstractOIDCAttributeTranscoder.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding;
-
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Strings;
-import com.nimbusds.openid.connect.sdk.ClaimsRequest;
-import com.nimbusds.openid.connect.sdk.claims.ClaimRequirement;
-
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
-import net.shibboleth.idp.attribute.AttributeDecodingException;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.IdPRequestedAttribute;
-import net.shibboleth.idp.attribute.transcoding.AbstractAttributeTranscoder;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-
-/**
- * Abstract class for OIDC attribute encoders.
- */
-public abstract class AbstractOIDCAttributeTranscoder
- extends AbstractAttributeTranscoder<JSONObject> implements OIDCAttributeTranscoder {
-
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(AbstractOIDCAttributeTranscoder.class);
-
- /** {@inheritDoc} */
- public Class<JSONObject> getEncodedType() {
- return JSONObject.class;
- }
-
- /** {@inheritDoc} */
- @Nullable public String getEncodedName(@Nonnull final TranscodingRule rule) {
-
- final String name = rule.getOrDefault(PROP_NAME, String.class,
- rule.get(AttributeTranscoderRegistry.PROP_ID, String.class));
- if (name != null) {
- return "OIDC:" + name;
- }
- return null;
- }
-
- /** {@inheritDoc} */
- @Override
- @Nullable public JSONObject doEncode(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final IdPAttribute attribute, @Nonnull final Class<? extends JSONObject> to,
- @Nonnull final TranscodingRule rule) throws AttributeEncodingException {
-
- final String attributeId = attribute.getId();
-
- log.trace("Beginning to encode attribute {}", attributeId);
-
- final Object claimValues = encodeValues(profileRequestContext, attribute, rule);
-
- if (claimValues instanceof JSONArray) {
- log.trace("Encoded {} value(s) for attribute {}", ((JSONArray) claimValues).size(), attributeId);
- } else {
- log.trace("Encoded {} value(s) for attribute {}", claimValues != null ? 1 : 0, attributeId);
- }
-
- return buildClaim(profileRequestContext, attribute, rule, claimValues);
- }
-
- /**
- * Builds an OIDC claim structure with the given values.
- *
- * @param profileRequestContext current profile request context
- * @param attribute the attribute being encoded
- * @param rule properties to control encoding
- * @param claimValues the encoded value(s) for the claim
- *
- * @return the OIDC claim (for the moment in the form of a single-valued JSON structure
- *
- * @throws AttributeEncodingException if there's a problem constructing the claim
- */
- @Nonnull protected JSONObject buildClaim(@Nullable final ProfileRequestContext profileRequestContext,
- @Nullable final IdPAttribute attribute, @Nonnull final TranscodingRule rule,
- @Nonnull @NonnullElements final Object claimValues) throws AttributeEncodingException {
-
- if (claimValues == null) {
- throw new AttributeEncodingException("Unable to build OIDC claim with no value(s)");
- }
-
- final String name = rule.getOrDefault(PROP_NAME, String.class, attribute.getId());
-
- final JSONObject claim = new JSONObject();
- claim.put(name, claimValues);
-
- return claim;
- }
-
- /**
- * Performs encoding of {@link IdPAttribute}'s values based on rule into a claim value.
- *
- * @param profileRequestContext current profile request
- * @param attribute the attribute being encoded
- * @param rule properties to control encoding
- *
- * @return Integer, Boolean, String, JSON Array or JSON Object value for claim
- *
- * @throws AttributeEncodingException if there's a problem encoding the values
- */
- @Nullable protected abstract Object encodeValues(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final IdPAttribute attribute, @Nonnull final TranscodingRule rule)
- throws AttributeEncodingException;
-
- /** {@inheritDoc} */
- @Override
- @Nullable public IdPAttribute doDecode(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final JSONObject input, @Nonnull final TranscodingRule rule)
- throws AttributeDecodingException {
-
- final String attributeName = getEncodedName(rule);
-
- log.trace("Beginning to decode claim {}", attributeName);
-
- final List<IdPAttributeValue> idpAttributeValues =
- decodeValues(profileRequestContext, input.get(attributeName), rule);
-
- log.trace("Decoded {} values for claim {}", idpAttributeValues.size(), attributeName);
- return buildIdPAttribute(profileRequestContext, input, rule, idpAttributeValues);
- }
-
- /**
- * Builds an {@link IdPAttribute} from the given values.
- *
- * @param profileRequestContext current profile request
- * @param claim the claim being decoded
- * @param rule properties to control decoding
- * @param attributeValues the decoded values for the attribute
- *
- * @return the IdPAttribute object
- *
- * @throws AttributeDecodingException if there's a problem constructing the IdPAttribute
- */
- @Nonnull protected IdPAttribute buildIdPAttribute(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final JSONObject claim, @Nonnull final TranscodingRule rule,
- @Nonnull @NonnullElements final List<IdPAttributeValue> attributeValues) throws AttributeDecodingException {
-
- final String id = rule.get(AttributeTranscoderRegistry.PROP_ID, String.class);
- if (Strings.isNullOrEmpty(id)) {
- throw new AttributeDecodingException("Required transcoder property 'id' not found");
- }
-
- final String name = rule.getOrDefault(PROP_NAME, String.class, id);
-
- // This is awful, don't shame me.
- final Object claimValue = claim.get(name);
- if (claimValue instanceof ClaimsRequest.Entry) {
- final IdPRequestedAttribute idpAttribute = new IdPRequestedAttribute(id);
- idpAttribute.setRequired(ClaimRequirement.ESSENTIAL.equals(
- ((ClaimsRequest.Entry) claimValue).getClaimRequirement()));
- idpAttribute.setValues(attributeValues);
- return idpAttribute;
- }
-
- final IdPAttribute idpAttribute = new IdPAttribute(id);
- idpAttribute.setValues(attributeValues);
- return idpAttribute;
- }
-
- /**
- * Subclasses should override this method to perform specific claim value decoding into {@link IdPAttributeValue}
- * objects.
- *
- * @param profileRequestContext current profile request context
- * @param input the raw claim value
- * @param rule properties to control decoding
- *
- * @return a possibly empty list of decoded values
- *
- * @throws AttributeDecodingException if there's a problem decoding the claim value
- */
- @Nonnull @NonnullElements protected abstract List<IdPAttributeValue> decodeValues(
- @Nullable final ProfileRequestContext profileRequestContext, @Nonnull final Object input,
- @Nonnull final TranscodingRule rule) throws AttributeDecodingException;
-
-
- /**
- * A function to produce a "canonical" name for an OIDC claim for transcoding rules.
- */
- public static class NamingFunction implements Function<JSONObject,String> {
-
- /** {@inheritDoc} */
- @Nullable public String apply(@Nullable final JSONObject input) {
-
- if (input == null) {
- return null;
- }
-
- final Set<String> keys = input.keySet();
- if (keys.size() != 1) {
- return null;
- }
-
- return "OIDC:" + keys.iterator().next();
- }
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/OIDCAttributeTranscoder.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/OIDCAttributeTranscoder.java
deleted file mode 100644
index e055b80a..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/OIDCAttributeTranscoder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding;
-
-import javax.annotation.Nonnull;
-
-import net.minidev.json.JSONObject;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoder;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Marker interface for transcoders that operate on OIDC claims.
- */
-public interface OIDCAttributeTranscoder extends AttributeTranscoder<JSONObject> {
-
- /** The claim name. */
- @Nonnull @NotEmpty static final String PROP_NAME = "oidc.name";
-
- /** Whether to encode data to JSON array. */
- @Nonnull @NotEmpty static final String PROP_ASARRAY = "oidc.asArray";
-
- /** Whether to encode data to JSON integer. */
- @Nonnull @NotEmpty static final String PROP_ASINTEGER = "oidc.asInteger";
-
- /** Whether to encode data to JSON integer. */
- @Nonnull @NotEmpty static final String PROP_ASBOOLEAN = "oidc.asBoolean";
-
- /** Separator to use when not encoding multiple values to array. */
- @Nonnull @NotEmpty static final String PROP_STRING_DELIMITER = "oidc.stringDelimiter";
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/package-info.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/package-info.java
deleted file mode 100644
index 89c24888..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** OIDC Attribute Transcoding base classes. */
-
-package org.geant.idpextension.oidc.attribute.transcoding;
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/JSONErrorResponseTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponseTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/JSONErrorResponseTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONErrorResponseTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/JSONSuccessResponseTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponseTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/JSONSuccessResponseTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/JSONSuccessResponseTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseConsentContextTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseConsentContextTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseConsentContextTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseConsentContextTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseContextTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseContextTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseContextTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseTokenClaimsContextTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContextTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/messaging/context/OIDCAuthenticationResponseTokenClaimsContextTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContextTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/metadata/resolver/ServiceableProviderMetadataProviderTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/ServiceableProviderMetadataProviderTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/metadata/resolver/ServiceableProviderMetadataProviderTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/resolver/ServiceableProviderMetadataProviderTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/api/OIDCSecurityConfigurationTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfigurationTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/api/OIDCSecurityConfigurationTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfigurationTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenRequestLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseDefaultRequestLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultAuthTimeLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultClientIDLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultClientIDLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultClientIDLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultClientIDLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultOIDCMetadataContextLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestLoginHintLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestLoginHintLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestMaxAgeFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestMaxAgeFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestNonceLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestNonceLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestRedirectURILookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestRedirectURILookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseModeLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseModeLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseTypeLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestResponseTypeLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestStateLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestStateLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedAcrLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedAcrLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedClaimsLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedPromptLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedPromptLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedScopeLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultRequestedScopeLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultResponseClaimsSetLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultUserInfoSigningAlgLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultValidRedirectUrisLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCAuthenticationResponseContextLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/OIDCRegistrationResponseContextLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ProfileResponderIdLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/SectorIdentifierLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/SectorIdentifierLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/SectorIdentifierLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestAuthTimeLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestAuthTimeLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestAuthTimeLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestAuthTimeLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestClientIDLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestClientIDLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestClientIDLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestClientIDLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentableAttributesLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentableAttributesLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentedAttributesLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestConsentedAttributesLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestDeliveryClaimsLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestIDTokenDeliveryClaimsLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestNonceLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestNonceLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestNonceLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestNonceLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRedirectURILookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRequestedClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRequestedClaimsLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestRequestedClaimsLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestRequestedClaimsLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestScopeLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestScopeLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestScopeLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestScopeLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestSubjectLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestSubjectLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestSubjectLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestSubjectLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestUserInfoDeliveryClaimsLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestValidRequestURIsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestValidRequestURIsLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/TokenRequestValidRequestURIsLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestValidRequestURIsLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoRequestClientIDLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoRequestClientIDLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoRequestClientIDLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoRequestClientIDLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/UserInfoResponseClaimsSetLookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ValidatedRedirectURILookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ValidatedRedirectURILookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/profile/context/navigate/ValidatedRedirectURILookupFunctionTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/ValidatedRedirectURILookupFunctionTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/storage/RevocationCacheTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/storage/RevocationCacheTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/storage/RevocationCacheTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/storage/RevocationCacheTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/AccessTokenClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSetTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/AccessTokenClaimsSetTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSetTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/AuthorizeCodeClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSetTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/AuthorizeCodeClaimsSetTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSetTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/RefreshTokenClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSetTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/RefreshTokenClaimsSetTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/RefreshTokenClaimsSetTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/TokenClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSetTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/TokenClaimsSetTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSetTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/testing/BaseTokenClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/BaseTokenClaimsSetTest.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/testing/BaseTokenClaimsSetTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/BaseTokenClaimsSetTest.java
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/testing/package-info.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/package-info.java
similarity index 100%
rename from idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/token/support/testing/package-info.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/package-info.java
diff --git a/idp-oidc-extension-api/src/test/resources/logback-test.xml b/idp-oidc-extension-api/src/test/resources/logback-test.xml
index 17ac91f3..27dcb790 100644
--- a/idp-oidc-extension-api/src/test/resources/logback-test.xml
+++ b/idp-oidc-extension-api/src/test/resources/logback-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
- <logger name="org.geant" level="TRACE"/>
+ <logger name="net.shibboleth.idp.plugin.oidc.op" level="TRACE"/>
<logger name="net.shibboleth" level="DEBUG"/>
<logger name="org.springframework" level="DEBUG"/>
diff --git a/idp-oidc-extension-distribution/pom.xml b/idp-oidc-extension-distribution/pom.xml
index 86690218..9e2b7801 100644
--- a/idp-oidc-extension-distribution/pom.xml
+++ b/idp-oidc-extension-distribution/pom.xml
@@ -5,15 +5,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>idp-oidc-extension-parent</artifactId>
- <groupId>org.geant</groupId>
+ <artifactId>idp-plugin-oidc-op-parent</artifactId>
+ <groupId>net.shibboleth.oidc</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>idp-oidc-extension-distribution</artifactId>
+ <artifactId>idp-plugin-oidc-op-distribution</artifactId>
<properties>
- <automatic.module.name>org.geant.idpextension.oidc.distribution</automatic.module.name>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
+ <automatic.module.name>net.shibboleth.idp.plugin.oidc.op.distribution</automatic.module.name>
</properties>
<build>
diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index 0bf946bc..45db33fc 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -4,16 +4,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>idp-oidc-extension-parent</artifactId>
- <groupId>org.geant</groupId>
+ <artifactId>idp-plugin-oidc-op-parent</artifactId>
+ <groupId>net.shibboleth.oidc</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>idp-oidc-extension-impl</artifactId>
+ <artifactId>idp-plugin-oidc-op-impl</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>org.geant.idpextension.oidc.impl</automatic.module.name>
+ <checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
+ <automatic.module.name>net.shibboleth.idp.plugin.oidc.op.impl</automatic.module.name>
</properties>
<dependencies>
@@ -34,8 +35,8 @@
<artifactId>opensaml-storage-api</artifactId>
</dependency>
<dependency>
- <groupId>org.geant</groupId>
- <artifactId>idp-oidc-extension-api</artifactId>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>idp-plugin-oidc-op-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -57,6 +58,14 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-ui</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-attribute-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-attribute-impl</artifactId>
+ </dependency>
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-crypto-api</artifactId>
@@ -227,8 +236,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.geant</groupId>
- <artifactId>idp-oidc-extension-api</artifactId>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>idp-plugin-oidc-op-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcher.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParser.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParser.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParser.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/matcher/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/matcher/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/matcher/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/matcher/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRule.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRule.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRule.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRule.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/filtercontext/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/filtercontext/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/impl/AttributeOIDCScopeRuleParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/impl/AttributeOIDCScopeRuleParser.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/impl/AttributeOIDCScopeRuleParser.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/impl/AttributeOIDCScopeRuleParser.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/BaseOIDCAttributeEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/BaseOIDCAttributeEncoderParser.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/BaseOIDCAttributeEncoderParser.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/BaseOIDCAttributeEncoderParser.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/AuthenticationContextReferenceAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/AuthenticationContextReferenceAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/AuthenticationContextReferenceAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/AuthenticationContextReferenceAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/ClaimsAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/ClaimsAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/ClaimsAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/ClaimsAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/ClientIdRegistrationAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/ClientIdRegistrationAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/ClientIdRegistrationAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/ClientIdRegistrationAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/ForceAuthnAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/ForceAuthnAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/ForceAuthnAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/ForceAuthnAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/InboundMessageClassLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/InboundMessageClassLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/InboundMessageClassLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/InboundMessageClassLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/IsPassiveAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/IsPassiveAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/IsPassiveAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/IsPassiveAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/OutboundMessageClassLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/OutboundMessageClassLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/OutboundMessageClassLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/OutboundMessageClassLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/RevokedTokenAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/RevokedTokenAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/RevokedTokenAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/RevokedTokenAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/SubjectTypeAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/SubjectTypeAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/SubjectTypeAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/SubjectTypeAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/SubjectValueAuditExtractor.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/SubjectValueAuditExtractor.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/audit/impl/SubjectValueAuditExtractor.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/audit/impl/SubjectValueAuditExtractor.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/authn/principal/AuthenticationContextClassReferencePrincipal.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/principal/AuthenticationContextClassReferencePrincipal.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/authn/principal/AuthenticationContextClassReferencePrincipal.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/principal/AuthenticationContextClassReferencePrincipal.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/authn/principal/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/principal/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/authn/principal/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/principal/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/AbstractOIDCClientAuthenticableProfileConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/AbstractOIDCClientAuthenticableProfileConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/AbstractOIDCClientAuthenticableProfileConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/AbstractOIDCClientAuthenticableProfileConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/AbstractOIDCFlowAwareProfileConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/AbstractOIDCFlowAwareProfileConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/AbstractOIDCFlowAwareProfileConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/AbstractOIDCFlowAwareProfileConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCCoreProtocolConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCCoreProtocolConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCDynamicRegistrationConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCDynamicRegistrationConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCDynamicRegistrationConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCDynamicRegistrationConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCProviderInformationConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCProviderInformationConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCProviderInformationConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCProviderInformationConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCPublishKeySetConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCPublishKeySetConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCPublishKeySetConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCPublishKeySetConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCUserInfoConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCUserInfoConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/OIDCUserInfoConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCUserInfoConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/AuthorizationCodeFlowEnabledPredicate.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/AuthorizationCodeFlowEnabledPredicate.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/AuthorizationCodeFlowEnabledPredicate.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/AuthorizationCodeFlowEnabledPredicate.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/HybridFlowEnabledPredicate.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/HybridFlowEnabledPredicate.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/HybridFlowEnabledPredicate.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/HybridFlowEnabledPredicate.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/ImplicitFlowEnabledPredicate.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/ImplicitFlowEnabledPredicate.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/ImplicitFlowEnabledPredicate.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/ImplicitFlowEnabledPredicate.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/RefreshTokensEnabledPredicate.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/RefreshTokensEnabledPredicate.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/RefreshTokensEnabledPredicate.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/RefreshTokensEnabledPredicate.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/logic/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/logic/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/AlwaysIncludedAttributesLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/AlwaysIncludedAttributesLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/AlwaysIncludedAttributesLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/AlwaysIncludedAttributesLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/AudienceRestrictionsLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/AudienceRestrictionsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/AudienceRestrictionsLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/AudienceRestrictionsLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/DataEncryptionAlgorithmsLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/DataEncryptionAlgorithmsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/DataEncryptionAlgorithmsLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/DataEncryptionAlgorithmsLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/DeniedUserInfoAttributesLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/DeniedUserInfoAttributesLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/DeniedUserInfoAttributesLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/DeniedUserInfoAttributesLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/EncodedAttributesLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/EncodedAttributesLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/EncodedAttributesLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/EncodedAttributesLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/KeyTransportEncryptionAlgorithmsLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/KeyTransportEncryptionAlgorithmsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/KeyTransportEncryptionAlgorithmsLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/KeyTransportEncryptionAlgorithmsLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/RegistrationValidityPeriodLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RegistrationValidityPeriodLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/RegistrationValidityPeriodLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RegistrationValidityPeriodLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/SecretExpirationPeriodLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/SecretExpirationPeriodLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/SecretExpirationPeriodLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/SecretExpirationPeriodLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/SignatureAlgorithmsLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/SignatureAlgorithmsLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/SignatureAlgorithmsLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/SignatureAlgorithmsLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/TokenEndpointAuthMethodLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointAuthMethodLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/TokenEndpointAuthMethodLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointAuthMethodLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/navigate/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/config/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/criterion/ClientInformationCriterion.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/criterion/ClientInformationCriterion.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/criterion/ClientInformationCriterion.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/criterion/ClientInformationCriterion.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/criterion/IssuerCriterion.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/criterion/IssuerCriterion.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/criterion/IssuerCriterion.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/criterion/IssuerCriterion.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/criterion/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/criterion/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/criterion/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/criterion/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCAuthenticationRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCAuthenticationRequestDecoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCClientRegistrationRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCClientRegistrationRequestDecoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCTokenRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCTokenRequestDecoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCUserInfoRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCUserInfoRequestDecoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCWebFingerRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCWebFingerRequestDecoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/OIDCWebFingerRequestDecoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCWebFingerRequestDecoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/RequestUtil.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/RequestUtil.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/RequestUtil.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/RequestUtil.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/decoding/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/NimbusResponseEncoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/NimbusResponseEncoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/OIDCResponseEncoderFactory.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/OIDCResponseEncoderFactory.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/OIDCResponseEncoderFactory.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/OIDCResponseEncoderFactory.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/ResponseUtil.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/ResponseUtil.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/encoding/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/OIDCWebFingerRequestImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/OIDCWebFingerRequestImpl.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/OIDCWebFingerRequestImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/OIDCWebFingerRequestImpl.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/OIDCWebFingerResponseImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/OIDCWebFingerResponseImpl.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/OIDCWebFingerResponseImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/OIDCWebFingerResponseImpl.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/OIDCWebFingerResponseLinkImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/OIDCWebFingerResponseLinkImpl.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/OIDCWebFingerResponseLinkImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/OIDCWebFingerResponseLinkImpl.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/messaging/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/AlgorithmInfoMetadataValueResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/AlgorithmInfoMetadataValueResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/AlgorithmInfoMetadataValueResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/AlgorithmInfoMetadataValueResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ArrayMetadataValueResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/ArrayMetadataValueResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ArrayMetadataValueResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/ArrayMetadataValueResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemMetadataValueResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemMetadataValueResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/FilesystemProviderMetadataResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemProviderMetadataResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/FilesystemProviderMetadataResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemProviderMetadataResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/config/OAuth2TokenIntrospectionConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/config/OAuth2TokenRevocationConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfiguration.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/config/OAuth2TokenRevocationConfiguration.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfiguration.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/config/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/config/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/decoding/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/decoding/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationErrorResponse.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationErrorResponse.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationErrorResponse.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationErrorResponse.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationSuccessResponse.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationSuccessResponse.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationSuccessResponse.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationSuccessResponse.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/messaging/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/messaging/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/BuildIntrospectionErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildIntrospectionErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/BuildIntrospectionErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildIntrospectionErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/BuildRevokeTokenErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildRevokeTokenErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/BuildRevokeTokenErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildRevokeTokenErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/FormOutboundIntrospectionResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/FormOutboundIntrospectionResponseMessage.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/FormOutboundIntrospectionResponseMessage.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/FormOutboundIntrospectionResponseMessage.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/FormOutboundRevokeTokenResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/FormOutboundRevokeTokenResponseMessage.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/FormOutboundRevokeTokenResponseMessage.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/FormOutboundRevokeTokenResponseMessage.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/InitializeOutboundRevokeTokenResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/InitializeOutboundRevokeTokenResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/InitializeOutboundRevokeTokenResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/InitializeOutboundRevokeTokenResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/InitializeOutboundTokenIntrospectionResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/InitializeOutboundTokenIntrospectionResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/InitializeOutboundTokenIntrospectionResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/InitializeOutboundTokenIntrospectionResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/RevokeToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/RevokeToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/RevokeToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/RevokeToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oauth2/profile/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractBuildErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractBuildErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractBuildErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractBuildErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractInitializeOutboundResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractInitializeOutboundResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractInitializeOutboundResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractInitializeOutboundResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationRequestAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationRequestAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationResponseAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationResponseAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCClientMetadataPopulationAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCClientMetadataPopulationAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCClientMetadataPopulationAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCClientMetadataPopulationAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCRequestAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCRequestAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCRequestAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCRequestAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCResponseAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCResponseAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCResponseAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCSigningResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCSigningResponseAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCSigningResponseAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCSigningResponseAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenRequestAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenRequestAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenRequestAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenRequestAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoRequestAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoRequestAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoRequestAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoRequestAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoResponseAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoResponseAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoValidationResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoValidationResponseAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoValidationResponseAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoValidationResponseAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractSignJWTAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractSignJWTAction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractSignJWTAction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractSignJWTAction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAcrToIDToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAcrToIDToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddApplicationTypeToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddApplicationTypeToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddApplicationTypeToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddApplicationTypeToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSet.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSet.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSet.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSet.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthTimeToIDToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthTimeToIDToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddClientNameToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddClientNameToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddClientNameToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddClientNameToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddContactsToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddContactsToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddContactsToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddContactsToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShell.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShell.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShell.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShell.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddJwksToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddJwksToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddLogoUrisToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddLogoUrisToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddLogoUrisToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddLogoUrisToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddMetadataStatementToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddMetadataStatementToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddMetadataStatementToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddMetadataStatementToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddNonceToIDToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddNonceToIDToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddPolicyUrisToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddPolicyUrisToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddPolicyUrisToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddPolicyUrisToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRedirectUrisToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRedirectUrisToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRedirectUrisToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRedirectUrisToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddScopeToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddScopeToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddScopeToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddScopeToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSubjectTypeToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSubjectTypeToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSubjectTypeToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSubjectTypeToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSet.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTokenDeliveryAttributesToClaimsSet.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSet.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTokenDeliveryAttributesToClaimsSet.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddTokenEndpointAuthMethodsToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTokenEndpointAuthMethodsToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddTokenEndpointAuthMethodsToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTokenEndpointAuthMethodsToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddTosUrisToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTosUrisToClientMetadata.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddTosUrisToClientMetadata.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTosUrisToClientMetadata.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShell.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddUserInfoShell.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShell.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddUserInfoShell.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildAuthenticationErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildAuthenticationErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildAuthenticationErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildAuthenticationErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildClientInformation.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildClientInformation.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildClientInformation.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildClientInformation.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildJSONErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildJSONErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildRegistrationErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildRegistrationErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildRegistrationErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildRegistrationErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildTokenErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildTokenErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildTokenErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildTokenErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildUserInfoErrorResponseFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildUserInfoErrorResponseFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildUserInfoErrorResponseFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildUserInfoErrorResponseFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildWebFingerResponse.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildWebFingerResponse.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/BuildWebFingerResponse.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildWebFingerResponse.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectURIs.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckRedirectURIs.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectURIs.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckRedirectURIs.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/CheckWebFingerRel.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckWebFingerRel.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/CheckWebFingerRel.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckWebFingerRel.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/CheckWebFingerResource.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckWebFingerResource.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/CheckWebFingerResource.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckWebFingerResource.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObject.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/DecryptRequestObject.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObject.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/DecryptRequestObject.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/EncryptProcessedToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/EncryptProcessedToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundAuthenticationResponseMessage.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessage.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundAuthenticationResponseMessage.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponse.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponse.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponse.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponse.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessage.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundTokenResponseMessage.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessage.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundTokenResponseMessage.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessage.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessage.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessage.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/GenerateClientID.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/GenerateClientID.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/GenerateClientID.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/GenerateClientID.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/GenerateClientSecret.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/GenerateClientSecret.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/GenerateClientSecret.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/GenerateClientSecret.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeAuthenticationContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeAuthenticationContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundAuthenticationResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundAuthenticationResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundRegistrationResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundRegistrationResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundRegistrationResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundRegistrationResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundTokenResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundTokenResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundTokenResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundTokenResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundUserInfoResponseMessageContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeRelyingPartyContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeRelyingPartyContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeSubjectContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeSubjectContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeUnverifiedRelyingPartyContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeUnverifiedRelyingPartyContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/OIDCMetadataLookupHandler.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/OIDCMetadataLookupHandler.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/OIDCMetadataLookupHandler.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/OIDCMetadataLookupHandler.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParameters.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCEncryptionParameters.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParameters.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCEncryptionParameters.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCMetadataContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCMetadataContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCMetadataContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCMetadataContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCSignatureSigningParameters.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCSignatureSigningParameters.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCSignatureSigningParameters.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCSignatureSigningParameters.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCSignatureSigningParametersHandler.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCSignatureSigningParametersHandler.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCSignatureSigningParametersHandler.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCSignatureSigningParametersHandler.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ProcessRequestedAuthnContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ProcessRequestedAuthnContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScope.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ReduceValidatedScope.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScope.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ReduceValidatedScope.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/RevokeConsent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/RevokeConsent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAccessTokenToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAccessTokenToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationTimeToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationTimeToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetEntityIdToSAMLPeerEntityContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetEntityIdToSAMLPeerEntityContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetEntityIdToSAMLPeerEntityContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetEntityIdToSAMLPeerEntityContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRequestObjectToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestObjectToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRequestObjectToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestObjectToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetResponseStatusCodeFromEvent.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetResponseStatusCodeFromEvent.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetResponseStatusCodeFromEvent.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetResponseStatusCodeFromEvent.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolution.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSectorIdentifierForAttributeResolution.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolution.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSectorIdentifierForAttributeResolution.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSubjectToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSubjectToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContext.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContext.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContext.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignIDToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignIDToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignIDToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignIDToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignRegistrationResponse.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignRegistrationResponse.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignRegistrationResponse.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignRegistrationResponse.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponse.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignUserInfoResponse.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponse.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignUserInfoResponse.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/StoreClientInformation.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/StoreClientInformation.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/StoreClientInformation.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/StoreClientInformation.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateAccessToken.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessToken.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateAccessToken.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthentication.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateEndpointAuthentication.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthentication.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateEndpointAuthentication.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateGrant.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateGrant.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantType.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantType.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantType.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantType.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCE.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCE.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCE.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCE.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURI.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRedirectURI.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURI.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRedirectURI.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObject.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRequestObject.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObject.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRequestObject.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseType.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateResponseType.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseType.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateResponseType.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateScope.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateScope.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/ValidateScope.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateScope.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifier.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/VerifyRequestedSubjectIdentifier.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifier.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/VerifyRequestedSubjectIdentifier.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/AttributeResolutionSubjectLookupFunction.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunction.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/AttributeResolutionSubjectLookupFunction.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/DefaultSubjectTypeStrategy.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/DefaultSubjectTypeStrategy.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/DefaultSubjectTypeStrategy.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/DefaultSubjectTypeStrategy.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/PairwiseSubjectActivationCondition.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/PairwiseSubjectActivationCondition.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/PairwiseSubjectActivationCondition.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/PairwiseSubjectActivationCondition.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/PublicSubjectActivationCondition.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/PublicSubjectActivationCondition.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/PublicSubjectActivationCondition.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/PublicSubjectActivationCondition.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationCondition.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/SubjectActivationCondition.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationCondition.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/SubjectActivationCondition.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/logic/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/BasicJWKCredentialFactoryBean.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/factory/BasicJWKCredentialFactoryBean.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/BasicJWKCredentialFactoryBean.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/factory/BasicJWKCredentialFactoryBean.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/factory/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/factory/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/relyingparty/metadata/impl/package-info.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/package-info.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/relyingparty/metadata/impl/package-info.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationEncryptionParametersResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationEncryptionParametersResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
similarity index 100%
rename from idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/oidc/filter/impl/ClientInformationParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/oidc/filter/impl/ClientInformationParser.java
deleted file mode 100644
index 818d919b..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/oidc/filter/impl/ClientInformationParser.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.profile.spring.relyingparty.metadata.oidc.filter.impl;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.oidc.impl.MetadataNamespaceHandler;
-import net.shibboleth.oidc.metadata.impl.ClientInformationNodeProcessor;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-/**
- * Parser for a <ClientInformation> node processor.
- */
-public class ClientInformationParser extends AbstractSingleBeanDefinitionParser {
-
- /** Element name. */
- @Nonnull public static final QName TYPE_NAME =
- new QName(MetadataNamespaceHandler.NAMESPACE, "ClientInformation");
-
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(ClientInformationParser.class);
-
- /** {@inheritDoc} */
- @Override protected Class<?> getBeanClass(final Element element) {
- return ClientInformationNodeProcessor.class;
- }
-
- /** {@inheritDoc} */
- @Override
- protected void doParse(final Element element, final ParserContext parserContext,
- final BeanDefinitionBuilder builder) {
- super.doParse(element, parserContext, builder);
-
- if (element.hasAttributeNS(null, "keyInfoProvidersRef")) {
- builder.addConstructorArgReference(StringSupport.trimOrNull(element.getAttributeNS(null,
- "keyInfoProvidersRef")));
- } else {
- log.error("No 'keyInfoProvidersRef' attribute defined!");
- }
- }
-
- /** {@inheritDoc} */
- @Override protected boolean shouldGenerateId() {
- return true;
- }
-
-}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/oidc/impl/MetadataNamespaceHandler.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/oidc/impl/MetadataNamespaceHandler.java
deleted file mode 100644
index caa9b0d7..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/oidc/impl/MetadataNamespaceHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.profile.spring.relyingparty.metadata.oidc.impl;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.oidc.filter.impl.ClientInformationParser;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/** Namespace handler for <code>urn:mace:shibboleth:2.0:metadata:oidc</code>. */
-public class MetadataNamespaceHandler extends BaseSpringNamespaceHandler {
-
- /** Namespace for this handler. */
- @Nonnull
- @NotEmpty
- public static final String NAMESPACE = "urn:mace:shibboleth:2.0:metadata:oidc";
-
- /** {@inheritDoc} */
- @Override
- public void init() {
- registerBeanDefinitionParser(ClientInformationParser.TYPE_NAME, new ClientInformationParser());
- }
-
-}
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoder.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoder.java
deleted file mode 100644
index fd5d5389..00000000
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoder.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.minidev.json.JSONArray;
-import net.shibboleth.idp.attribute.AttributeDecodingException;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.ByteAttributeValue;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.codec.Base64Support;
-import net.shibboleth.utilities.java.support.codec.EncodingException;
-
-/**
- * Class encoding byte attributes to base64 encoded string json object. Name of the attribute will be set as the key.
- * The string contains base64 coded attribute value. If there are several attribute values they are delimited with
- * space. The output may be set also to array. The output may also be set to be int instead of b64. In that case each
- * value (byte[]) is converted to int array and placed into array.
- */
-public class OIDCByteAttributeTranscoder extends AbstractOIDCAttributeTranscoder {
-
-// Checkstyle: CyclomaticComplexity OFF
- /** {@inheritDoc} */
- @Override
- @Nullable protected Object encodeValues(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final IdPAttribute attribute, @Nonnull final TranscodingRule rule)
- throws AttributeEncodingException {
-
- final Boolean asInteger = rule.getOrDefault(PROP_ASINTEGER, Boolean.class, false);
- final Boolean asArray = rule.getOrDefault(PROP_ASARRAY, Boolean.class, false);
- final String delimiter = rule.getOrDefault(PROP_STRING_DELIMITER, String.class, "");
-
- String attributeString = "";
- final JSONArray array = new JSONArray();
- for (final IdPAttributeValue value : attribute.getValues()) {
- if (value instanceof ByteAttributeValue && ((ByteAttributeValue) value).getValue() != null) {
- if (asInteger) {
- final JSONArray innerArray = new JSONArray();
- for (final byte byteValue : ((ByteAttributeValue) value).getValue()) {
- innerArray.add((int) byteValue);
- }
- // each byte array is converted to JSON int array and placed into JSON array.
- array.add(innerArray);
- } else {
- if (attributeString.length() > 0) {
- attributeString += delimiter;
- }
- try {
- attributeString +=
- Base64Support.encode(((ByteAttributeValue) value).getValue(), Base64Support.UNCHUNKED);
- } catch (final EncodingException e) {
- //convert exception and throw if any of the values can not be base64 encoded
- throw new AttributeEncodingException("Attribtue value could not be base64 encoded",e);
- }
- if (asArray) {
- array.add(attributeString.toString());
- attributeString = "";
- }
- }
- }
- }
- if (asArray || asInteger) {
- return array.size() == 0 ? null : array;
- } else {
- return attributeString.toString().isEmpty() ? null : attributeString.toString();
- }
- }
-// Checkstyle: CyclomaticComplexity ON
-
- /** {@inheritDoc} */
- @Override
- @Nonnull @NonnullElements protected List<IdPAttributeValue> decodeValues(
- @Nullable final ProfileRequestContext profileRequestContext, @Nonnull final Object input,
- @Nonnull final TranscodingRule rule) throws AttributeDecodingException {
-
- // TODO: implement value decoding
- return Collections.emptyList();
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoder.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoder.java
deleted file mode 100644
index eb2c2116..00000000
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoder.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding.impl;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.minidev.json.JSONArray;
-import net.shibboleth.idp.attribute.AttributeDecodingException;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Class encoding scoped string attributes to string json object. Name of the attribute will be set as the key. The
- * string contains attribute value, delimiter and scope catenated. If there are several attribute values they are
- * delimited with delimiter(space is default) or placed to array.
- */
-public class OIDCScopedStringAttributeTranscoder extends AbstractOIDCAttributeTranscoder {
-
- /** Scope delimiter for combining the data. */
- @Nonnull @NotEmpty public static final String PROP_SCOPE_DELIMITER = "oidc.scopeDelimiter";
-
- /** {@inheritDoc} */
- @Override
- @Nullable protected Object encodeValues(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final IdPAttribute attribute, @Nonnull final TranscodingRule rule)
- throws AttributeEncodingException {
-
- if (attribute.getValues().isEmpty()) {
- return null;
- }
-
- final String scopeDelimiter = rule.getOrDefault(PROP_SCOPE_DELIMITER, String.class, "@");
-
- final List<String> values = attribute.getValues()
- .stream()
- .filter(ScopedStringAttributeValue.class::isInstance)
- .map(ScopedStringAttributeValue.class::cast)
- .map(v -> v.getValue() + scopeDelimiter + v.getScope())
- .collect(Collectors.toUnmodifiableList());
-
- // Values of arbitrary mapped type placed into JSONArray.
- if (rule.getOrDefault(PROP_ASARRAY, Boolean.class, false)) {
- final JSONArray array = new JSONArray();
- array.addAll(values);
- return array;
- }
-
- // String concatenation.
-
- final String delimiter = rule.getOrDefault(PROP_STRING_DELIMITER, String.class, " ");
-
- boolean stringEmpty = true;
- final StringBuilder attributeString = new StringBuilder();
- for (final String value : values) {
- if (!stringEmpty) {
- attributeString.append(delimiter);
- } else {
- stringEmpty = false;
- }
- attributeString.append(value);
- }
-
- return attributeString.length() != 0 ? attributeString.toString() : null;
- }
-
- /** {@inheritDoc} */
- @Override
- @Nonnull @NonnullElements protected List<IdPAttributeValue> decodeValues(
- @Nullable final ProfileRequestContext profileRequestContext, @Nonnull final Object input,
- @Nonnull final TranscodingRule rule) throws AttributeDecodingException {
-
- // TODO: implement value decoding
- return Collections.emptyList();
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoder.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoder.java
deleted file mode 100644
index 4fb29b03..00000000
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoder.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding.impl;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
-import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Predicates;
-
-import net.minidev.json.JSONArray;
-import net.minidev.json.parser.JSONParser;
-import net.minidev.json.parser.ParseException;
-import net.shibboleth.idp.attribute.AttributeDecodingException;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.StringAttributeValue;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-
-/**
- * Class encoding string attributes to string json object. Name of the attribute will be set as the key. The string
- * contains attribute value. If there are several attribute values they are delimited with delimiter(space is default)
- * or placed to array. If the value is set to be interpreted as int, only values that may be parsed to int are used. In
- * case output is interpreted as int but not set to array, only the first parsable value is used. If the value is
- * interpreted as boolean the value is true if string value equals to "true" ignoring the case. If boolean values are
- * not set to array the first string value is considered to be the result. Finally, the result may be placed to json
- * Object.
- */
-public class OIDCStringAttributeTranscoder extends AbstractOIDCAttributeTranscoder {
-
- /** Whether to parse the values into and out as a JSON object. */
- @Nonnull @NotEmpty public static final String PROP_ASOBJECT = "oidc.asObject";
-
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(OIDCStringAttributeTranscoder.class);
-
- /** {@inheritDoc} */
-// Checkstyle: CyclomaticComplexity OFF
- @Override
- @Nullable protected Object encodeValues(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final IdPAttribute attribute, @Nonnull final TranscodingRule rule)
- throws AttributeEncodingException {
-
- if (attribute.getValues().isEmpty()) {
- return null;
- }
-
- final List<?> values = transformValues(rule,
- attribute.getValues()
- .stream()
- .filter(StringAttributeValue.class::isInstance)
- .map(StringAttributeValue.class::cast)
- .map(StringAttributeValue::getValue));
-
- // Handle String values parsed into JSON.
- if (rule.getOrDefault(PROP_ASOBJECT, Boolean.class, false)) {
- if (values.size() == 1) {
- final Object value = values.get(0);
- if (!(value instanceof String)) {
- throw new AttributeEncodingException("Value for IdPAttribute '" + attribute.getId() +
- "' is defined to be parsed as JSON, but is not String-typed");
- }
- return toJSONObject((String) value);
- } else {
- final JSONArray array = new JSONArray();
- for (final Object value : values) {
- if (!(value instanceof String)) {
- log.warn("Value for IdPAttribute '{}' is defined to be parsed as JSON, but is not String-typed",
- attribute.getId());
- continue;
- }
- try {
- array.add(toJSONObject((String) value));
- } catch (final AttributeEncodingException e) {
- log.warn("IdPAttribute '{}'", attribute.getId(), e);
- }
- }
- return array;
- }
- }
-
- // Values of arbitrary mapped type placed into JSONArray.
- if (rule.getOrDefault(PROP_ASARRAY, Boolean.class, false)) {
- final JSONArray array = new JSONArray();
- array.addAll(values);
- return array;
- }
-
- // String concatenation / integer or boolean value.
- final String delimiter = rule.getOrDefault(PROP_STRING_DELIMITER, String.class, " ");
-
- boolean stringEmpty = true;
- final StringBuilder attributeString = new StringBuilder();
- for (final Object value : values) {
- if (value instanceof Integer || value instanceof Boolean) {
- log.warn("Values converted to Integer/Boolean but non-Array encoding, ignoring all but first value");
- return value;
- } else if (value instanceof String) {
- if (!stringEmpty) {
- attributeString.append(delimiter);
- } else {
- stringEmpty = false;
- }
- attributeString.append(value);
- } else {
- throw new AttributeEncodingException("Unrecognized value type: " + value.getClass().getName());
- }
- }
-
- return attributeString.length() != 0 ? attributeString.toString() : null;
- }
-// Checkstyle: CyclomaticComplexity ON
-
- /** {@inheritDoc} */
- @Override
- @Nonnull @NonnullElements protected List<IdPAttributeValue> decodeValues(
- @Nullable final ProfileRequestContext profileRequestContext, @Nonnull final Object input,
- @Nonnull final TranscodingRule rule) throws AttributeDecodingException {
-
- // TODO: implement value decoding
- return Collections.emptyList();
- }
-
- /**
- * Parses string as JSONObject.
- *
- * @param value string to parse
- *
- * @return string parsed as JSONObject
- *
- * @throws AttributeEncodingException if parsing fails
- */
- @Nonnull private Object toJSONObject(@Nonnull @NotEmpty final String value) throws AttributeEncodingException {
- try {
- return new JSONParser(JSONParser.MODE_PERMISSIVE).parse(value);
- } catch (final ParseException e) {
- log.trace("Unable to parse string '{}' into JSONObject", value, e);
- throw new AttributeEncodingException("Unable to parse string into JSONObject", e);
- }
- }
-
- /**
- * Converts string values to List of Integer, String or Boolean depending on rule.
- *
- * @param rule transcoding rule
- * @param attributeValues IdPAttribute values
- *
- * @return list of String, Boolean or Integer objects
- */
- @Nonnull @NonnullElements @NotLive @Unmodifiable private List<?> transformValues(
- @Nonnull final TranscodingRule rule, @Nonnull @NonnullElements final Stream<String> attributeValues) {
-
- if (rule.getOrDefault(PROP_ASINTEGER, Boolean.class, false)) {
- log.debug("String values interpreted as integer by rule");
- return attributeValues
- .map(v -> {
- try {
- return Integer.parseInt(v);
- } catch (final NumberFormatException e) {
- log.debug("Value '{}' not a parseable integer", v);
- return null;
- }
- })
- .filter(Predicates.notNull())
- .collect(Collectors.toUnmodifiableList());
- }
-
- if (rule.getOrDefault(PROP_ASBOOLEAN, Boolean.class, false)) {
- log.debug("String values interpreted as Boolean by rule");
- return attributeValues
- .map(v -> XSBooleanValue.valueOf(v).getValue())
- .collect(Collectors.toUnmodifiableList());
- }
-
- return attributeValues.collect(Collectors.toUnmodifiableList());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/package-info.java
deleted file mode 100644
index 19c3ce83..00000000
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/transcoding/impl/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** attribute encoder implementations. */
-
-package org.geant.idpextension.oidc.attribute.transcoding.impl;
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ClientInformationResolverServiceStrategy.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ClientInformationResolverServiceStrategy.java
deleted file mode 100644
index 22278684..00000000
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ClientInformationResolverServiceStrategy.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.profile.spring.relyingparty.metadata.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.context.ApplicationContext;
-
-import net.shibboleth.oidc.metadata.ClientInformationResolver;
-import net.shibboleth.oidc.metadata.RelyingPartyClientInformationProvider;
-import net.shibboleth.oidc.metadata.impl.ChainingClientInformationResolver;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.service.ServiceException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-
-/**
- * Strategy for summoning up a {@link ClientInformationResolver} from a populated {@link ApplicationContext}.
- *
- * <p>
- * The logic is the same as in
- * net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy.
- * </p>
- */
-public class ClientInformationResolverServiceStrategy extends AbstractIdentifiableInitializableComponent
- implements Function<ApplicationContext, ServiceableComponent<ClientInformationResolver>> {
-
- /** {@inheritDoc} */
- @Nullable
- public ServiceableComponent<ClientInformationResolver> apply(@Nullable final ApplicationContext appContext) {
- final Collection<RelyingPartyClientInformationProvider> resolvers =
- appContext.getBeansOfType(RelyingPartyClientInformationProvider.class).values();
-
- if (resolvers.isEmpty()) {
- throw new ServiceException(
- "Reload did not produce any bean of type" + RelyingPartyClientInformationProvider.class.getName());
- }
- if (1 == resolvers.size()) {
- // done
- return resolvers.iterator().next();
- }
- // initialize so we can sort
- for (final RelyingPartyClientInformationProvider resolver : resolvers) {
- try {
- resolver.initialize();
- } catch (final ComponentInitializationException e) {
- throw new BeanCreationException("could not preinitialize , client information provider "
- + resolver.getId(), e);
- }
- }
-
- final List<RelyingPartyClientInformationProvider> resolverList = new ArrayList<>(resolvers.size());
- resolverList.addAll(resolvers);
- Collections.sort(resolverList);
- final ChainingClientInformationResolver chain = new ChainingClientInformationResolver();
- try {
- chain.setResolvers(resolverList);
- chain.setId("MultiFileResolverFor:" + resolvers.size() + ":Resources");
- chain.initialize();
- final RelyingPartyClientInformationProvider result = new RelyingPartyClientInformationProvider();
- result.setEmbeddedResolver(chain);
- result.setApplicationContext(appContext);
- result.initialize();
- return result;
- } catch (final ResolverException | ComponentInitializationException e) {
- throw new ServiceException("Chaining constructor create failed", e);
- }
- }
-}
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 897635a1..71ee9fa9 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -12,15 +12,15 @@
<!-- System beans needed for extension to function, loaded after global.xml -->
<bean id="shibboleth.JWKCredential" abstract="true"
- class="org.geant.idpextension.oidc.profile.spring.factory.BasicJWKCredentialFactoryBean" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.spring.factory.BasicJWKCredentialFactoryBean" />
<!-- OIDC authentication context class reference parent declaration -->
<bean id="shibboleth.OIDCAuthnContextClassReference" abstract="true"
- class="org.geant.idpextension.oidc.authn.principal.AuthenticationContextClassReferencePrincipal" />
+ class="net.shibboleth.idp.plugin.oidc.op.authn.principal.AuthenticationContextClassReferencePrincipal" />
<!-- OIDC exact match bean definitions -->
<bean id="shibboleth.OIDCAuthnMethodExact" parent="shibboleth.Pair"
- p:first="#{ T(org.geant.idpextension.oidc.authn.principal.AuthenticationContextClassReferencePrincipal) }"
+ p:first="#{ T(net.shibboleth.idp.plugin.oidc.op.authn.principal.AuthenticationContextClassReferencePrincipal) }"
p:second="exact"/>
<bean parent="shibboleth.AuthnComparisonRegistration"
c:key-ref="shibboleth.OIDCAuthnMethodExact" c:value-ref="shibboleth.ExactMatchFactory" />
@@ -38,7 +38,7 @@
<constructor-arg name="claz"
value="net.shibboleth.oidc.metadata.ClientInformationResolver" />
<constructor-arg name="strategy">
- <bean class="org.geant.idpextension.oidc.profile.spring.relyingparty.metadata.impl.ClientInformationResolverServiceStrategy" />
+ <bean class="net.shibboleth.oidc.profile.spring.relyingparty.metadata.impl.ClientInformationResolverServiceStrategy" />
</constructor-arg>
</bean>
<util:list id="shibboleth.DefaultClientInformationResolverResources">
@@ -63,7 +63,7 @@
<bean parent="shibboleth.RegistryNamingFunction" c:claz="net.minidev.json.JSONObject">
<constructor-arg name="function">
- <bean class="org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder.NamingFunction" />
+ <bean class="net.shibboleth.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder.NamingFunction" />
</constructor-arg>
</bean>
@@ -103,14 +103,14 @@
<!-- Returns true if resolver is executed in authz endpoint. -->
<bean id="shibboleth.oidc.Conditions.SubjectRequired"
- class="org.geant.idpextension.oidc.profile.logic.SubjectActivationCondition" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.logic.SubjectActivationCondition" />
<!-- Returns true if client has registered public subject and resolver is executed in authz endpoint -->
<bean id="shibboleth.oidc.Conditions.PublicRequired" parent="shibboleth.Conditions.AND">
<constructor-arg>
<list>
- <bean class="org.geant.idpextension.oidc.profile.logic.SubjectActivationCondition" />
- <bean class="org.geant.idpextension.oidc.profile.logic.PublicSubjectActivationCondition" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.logic.SubjectActivationCondition" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.logic.PublicSubjectActivationCondition" />
</list>
</constructor-arg>
</bean>
@@ -119,10 +119,10 @@
<bean id="shibboleth.oidc.Conditions.PairwiseRequired" parent="shibboleth.Conditions.AND">
<constructor-arg>
<list>
- <bean class="org.geant.idpextension.oidc.profile.logic.SubjectActivationCondition" />
- <bean class="org.geant.idpextension.oidc.profile.logic.PairwiseSubjectActivationCondition" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.logic.SubjectActivationCondition" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.logic.PairwiseSubjectActivationCondition" />
</list>
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
index 124cc901..7a6b3417 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
@@ -12,7 +12,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
- <bean class="org.geant.idpextension.oauth2.decoding.impl.OAuth2IntrospectionRequestDecoder"
+ <bean class="net.shibboleth.idp.plugin.oidc.op.oauth2.decoding.impl.OAuth2IntrospectionRequestDecoder"
scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -20,7 +20,7 @@
<bean id="OIDCMetadataLookup" class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
scope="prototype" c:executionDirection="INBOUND">
<constructor-arg name="messageHandler">
- <bean class="org.geant.idpextension.oidc.profile.impl.OIDCMetadataLookupHandler" scope="prototype">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.impl.OIDCMetadataLookupHandler" scope="prototype">
<property name="clientInformationResolver">
<ref bean="shibboleth.ClientInformationResolver" />
</property>
@@ -32,27 +32,27 @@
</bean>
<bean id="shibboleth.TokenRequestClientIDLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestClientIDLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestClientIDLookupFunction"
scope="prototype" />
<bean id="InitializeRelyingPartyContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeRelyingPartyContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeRelyingPartyContext" scope="prototype"
p:clientIDLookupStrategy-ref="shibboleth.TokenRequestClientIDLookupStrategy" />
<bean id="InitializeOutboundMessageContext"
- class="org.geant.idpextension.oauth2.profile.impl.InitializeOutboundTokenIntrospectionResponseMessageContext"
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.InitializeOutboundTokenIntrospectionResponseMessageContext"
scope="prototype" />
<bean id="ValidateEndpointAuthentication"
- class="org.geant.idpextension.oidc.profile.impl.ValidateEndpointAuthentication" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateEndpointAuthentication" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:replayCache-ref="shibboleth.ReplayCache" />
<bean id="FormOutboundMessage"
- class="org.geant.idpextension.oauth2.profile.impl.FormOutboundIntrospectionResponseMessage" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.FormOutboundIntrospectionResponseMessage" scope="prototype"
c:sealer-ref="tokenSealer" p:revocationCache-ref="shibboleth.RevocationCache" />
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oauth2.profile.impl.BuildIntrospectionErrorResponseFromEvent" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.BuildIntrospectionErrorResponseFromEvent" scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
index 36bb9537..e8205df1 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
@@ -11,7 +11,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
- <bean class="org.geant.idpextension.oauth2.decoding.impl.OAuth2RevocationRequestDecoder"
+ <bean class="net.shibboleth.idp.plugin.oidc.op.oauth2.decoding.impl.OAuth2RevocationRequestDecoder"
scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -19,7 +19,7 @@
<bean id="OIDCMetadataLookup" class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
scope="prototype" c:executionDirection="INBOUND">
<constructor-arg name="messageHandler">
- <bean class="org.geant.idpextension.oidc.profile.impl.OIDCMetadataLookupHandler" scope="prototype">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.impl.OIDCMetadataLookupHandler" scope="prototype">
<property name="clientInformationResolver">
<ref bean="shibboleth.ClientInformationResolver" />
</property>
@@ -31,30 +31,31 @@
</bean>
<bean id="shibboleth.TokenRequestClientIDLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestClientIDLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestClientIDLookupFunction"
scope="prototype" />
<bean id="InitializeRelyingPartyContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeRelyingPartyContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeRelyingPartyContext" scope="prototype"
p:clientIDLookupStrategy-ref="shibboleth.TokenRequestClientIDLookupStrategy" />
<bean id="InitializeOutboundMessageContext"
- class="org.geant.idpextension.oauth2.profile.impl.InitializeOutboundRevokeTokenResponseMessageContext"
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.InitializeOutboundRevokeTokenResponseMessageContext"
scope="prototype" />
<bean id="ValidateEndpointAuthentication"
- class="org.geant.idpextension.oidc.profile.impl.ValidateEndpointAuthentication" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateEndpointAuthentication" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:replayCache-ref="shibboleth.ReplayCache" />
- <bean id="RevokeToken" class="org.geant.idpextension.oauth2.profile.impl.RevokeToken" scope="prototype"
+ <bean id="RevokeToken" class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.RevokeToken" scope="prototype"
c:sealer-ref="tokenSealer" p:revocationCache-ref="shibboleth.RevocationCache" />
<bean id="FormOutboundMessage"
- class="org.geant.idpextension.oauth2.profile.impl.FormOutboundRevokeTokenResponseMessage" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.FormOutboundRevokeTokenResponseMessage"
+ scope="prototype" />
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oauth2.profile.impl.BuildRevokeTokenErrorResponseFromEvent" scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse">
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.BuildRevokeTokenErrorResponseFromEvent"
+ scope="prototype" p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
</property>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
index c5af6485..78d542c6 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
@@ -8,13 +8,13 @@
default-init-method="initialize" default-destroy-method="destroy">
<bean id="InitializeRelyingPartyContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeUnverifiedRelyingPartyContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeUnverifiedRelyingPartyContext" scope="prototype" />
<bean id="InitializeOutboundMessageContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeOutboundResponseMessageContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeOutboundResponseMessageContext" scope="prototype" />
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oidc.profile.impl.BuildJSONErrorResponseFromEvent" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildJSONErrorResponseFromEvent" scope="prototype"
p:defaultStatusCode="500" p:defaultCode="server_error"
p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
@@ -22,7 +22,7 @@
</property>
</bean>
- <bean id="CredentialResolver" class="org.geant.idpextension.oidc.metadata.impl.CredentialMetadataValueResolver" />
+ <bean id="CredentialResolver" class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.CredentialMetadataValueResolver" />
<bean id="shibboleth.oidc.PostResponseAuditExtractors"
class="org.springframework.beans.factory.config.MapFactoryBean">
@@ -31,7 +31,7 @@
<entry>
<key>
<util:constant
- static-field="org.geant.idpextension.oidc.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
</key>
<bean parent="shibboleth.Functions.Constant" c:_0="#{getObject('OidcApiInfoFlowAuditName')}" />
</entry>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
index 98c16fca..135a59f3 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
@@ -28,9 +28,9 @@
c:lineSeparator="#{new byte[] {10} }" c:urlSafe="true" />
<bean id="shibboleth.oidc.IDTokenSignatureSigningParametersResolver"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationSignatureSigningParametersResolver" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationSignatureSigningParametersResolver" />
- <bean id="shibboleth.RevocationCache" class="org.geant.idpextension.oidc.storage.RevocationCache"
+ <bean id="shibboleth.RevocationCache" class="net.shibboleth.idp.plugin.oidc.op.storage.RevocationCache"
depends-on="shibboleth.LoggingService"
p:entryExpiration="#{'%{idp.oidc.revocationCache.authorizeCode.lifetime:PT6H}'}"
p:storage-ref="#{'%{idp.oidc.revocationCache.StorageService:shibboleth.StorageService}'.trim()}" p:strict="true" />
@@ -51,10 +51,10 @@
p:maskFailures="%{idp.service.attribute.filter.maskFailures:true}" />
<bean id="oidc.messageEncoderFactory"
- class="org.geant.idpextension.oidc.encoding.impl.OIDCResponseEncoderFactory"
+ class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.OIDCResponseEncoderFactory"
p:messageEncoder-ref="oidc.nimbusEncoder" scope="prototype" />
- <bean id="oidc.nimbusEncoder" class="org.geant.idpextension.oidc.encoding.impl.NimbusResponseEncoder"
+ <bean id="oidc.nimbusEncoder" class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.NimbusResponseEncoder"
scope="prototype" p:httpServletResponse-ref="shibboleth.HttpServletResponse" init-method=""
p:velocityEngine-ref="shibboleth.VelocityEngine" />
@@ -94,15 +94,15 @@
<entry>
<key>
<util:constant
- static-field="org.geant.idpextension.oidc.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.InboundMessageClassLookupFunction" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.InboundMessageClassLookupFunction" />
</entry>
<entry>
<key>
- <util:constant static-field="org.geant.idpextension.oidc.audit.AuditFields.IS_PASSIVE"/>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.IS_PASSIVE"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.IsPassiveAuditExtractor">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.IsPassiveAuditExtractor">
<constructor-arg>
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
@@ -112,9 +112,9 @@
</entry>
<entry>
<key>
- <util:constant static-field="org.geant.idpextension.oidc.audit.AuditFields.FORCE_AUTHN"/>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.FORCE_AUTHN"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.ForceAuthnAuditExtractor">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ForceAuthnAuditExtractor">
<constructor-arg>
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.MessageLookup.oidc.AuthenticationRequest"
@@ -124,9 +124,9 @@
</entry>
<entry>
<key>
- <util:constant static-field="org.geant.idpextension.oidc.audit.AuditFields.REVOKED_TOKEN"/>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.REVOKED_TOKEN"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.RevokedTokenAuditExtractor">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.RevokedTokenAuditExtractor">
<constructor-arg>
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.MessageLookup.oidc.TokenRevocationRequest"
@@ -200,35 +200,35 @@
<key>
<util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.ATTRIBUTES"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.ClaimsAuditExtractor">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ClaimsAuditExtractor">
</bean>
</entry>
<entry>
<key>
- <util:constant static-field="org.geant.idpextension.oidc.audit.AuditFields.SUB_VALUE"/>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SUB_VALUE"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.SubjectValueAuditExtractor">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.SubjectValueAuditExtractor">
</bean>
</entry>
<entry>
<key>
- <util:constant static-field="org.geant.idpextension.oidc.audit.AuditFields.SUB_FORMAT"/>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.SUB_FORMAT"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.SubjectTypeAuditExtractor">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.SubjectTypeAuditExtractor">
</bean>
</entry>
<entry>
<key>
- <util:constant static-field="org.geant.idpextension.oidc.audit.AuditFields.ACR"/>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.ACR"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.AuthenticationContextReferenceAuditExtractor" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.AuthenticationContextReferenceAuditExtractor" />
</entry>
<entry>
<key>
<util:constant
- static-field="org.geant.idpextension.oidc.audit.AuditFields.OUTBOUND_MESSAGE_CLASS" />
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.OUTBOUND_MESSAGE_CLASS" />
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.OutboundMessageClassLookupFunction" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.OutboundMessageClassLookupFunction" />
</entry>
</map>
</property>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-flow.xml
index 95f66d02..52959894 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-flow.xml
@@ -14,7 +14,7 @@
<action-state id="LogRuntimeException">
<on-entry>
<evaluate
- expression="T(org.slf4j.LoggerFactory).getLogger('org.geant.idpextension.oidc.profile').error('Uncaught runtime exception', flowExecutionException.getCause())" />
+ expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.idp.plugin.oidc.op.profile').error('Uncaught runtime exception', flowExecutionException.getCause())" />
</on-entry>
<evaluate expression="'RuntimeException'" />
<transition to="HandleError" />
@@ -39,4 +39,4 @@
<!-- The file really exists in this directory, but it's referenced from extending flow-directories -->
<bean-import resource="../../oidc/abstract/oidc-abstract-beans.xml" />
-</flow>
\ No newline at end of file
+</flow>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
index 436d4a3a..a8cbacc1 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
@@ -12,33 +12,33 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
- <bean class="org.geant.idpextension.oidc.decoding.impl.OIDCAuthenticationRequestDecoder"
+ <bean class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCAuthenticationRequestDecoder"
scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
</constructor-arg>
</bean>
<bean id="InitializeAuthenticationContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeAuthenticationContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeAuthenticationContext" scope="prototype" />
<bean id="ProcessRequestedAuthnContext"
- class="org.geant.idpextension.oidc.profile.impl.ProcessRequestedAuthnContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ProcessRequestedAuthnContext" scope="prototype" />
<bean id="PopulateUserAgentContext" class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext"
scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
<bean id="shibboleth.ClientIDLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.DefaultClientIDLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.DefaultClientIDLookupFunction"
scope="prototype" />
<bean id="SetRequestedSubjectToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetRequestedSubjectToResponseContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetRequestedSubjectToResponseContext" scope="prototype" />
<bean id="SetRequestedClaimsToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetRequestedClaimsToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetRequestedClaimsToResponseContext" scope="prototype"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService" />
<bean id="VerifyRequestedSubjectIdentifier"
- class="org.geant.idpextension.oidc.profile.impl.VerifyRequestedSubjectIdentifier" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.VerifyRequestedSubjectIdentifier" scope="prototype" />
<bean id="PopulatePostAuthnInterceptContext"
class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
@@ -49,25 +49,25 @@
</bean>
<bean id="InitializeOutboundMessageContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeOutboundAuthenticationResponseMessageContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeOutboundAuthenticationResponseMessageContext"
scope="prototype" />
<bean id="PopulateRequestObjectDecryptionParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.oidc.DecryptionConfigurationLookup"
p:encryptionParametersResolver-ref="shibboleth.oidc.EncryptionParametersResolverForRequestObjectDecryption"
p:forDecryption="true" />
<bean id="shibboleth.oidc.EncryptionParametersResolverForRequestObjectDecryption"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationEncryptionParametersResolver"
- p:parameterType="#{T(org.geant.idpextension.oidc.security.impl.OIDCClientInformationEncryptionParametersResolver.ParameterType).REQUEST_OBJECT_DECRYPTION}" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationEncryptionParametersResolver"
+ p:parameterType="#{T(net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationEncryptionParametersResolver.ParameterType).REQUEST_OBJECT_DECRYPTION}" />
<bean id="shibboleth.oidc.DecryptionConfigurationLookup"
- class="org.geant.idpextension.oidc.config.navigate.RequestObjectDecryptionConfigurationLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.config.navigate.RequestObjectDecryptionConfigurationLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<bean id="PopulateRequestObjectSignatureValidationParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.oidc.SignatureValidationConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.RequestObjectSignatureValidationParametersResolver">
<property name="securityParametersContextLookupStrategy">
@@ -83,22 +83,22 @@
</bean>
<bean id="shibboleth.oidc.SignatureValidationConfigurationLookup"
- class="org.geant.idpextension.oidc.config.navigate.RequestObjectSignatureValidationConfigurationLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.config.navigate.RequestObjectSignatureValidationConfigurationLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<bean id="shibboleth.oidc.RequestObjectSignatureValidationParametersResolver"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationSignatureValidationParametersResolver"
- p:parameterType="#{T(org.geant.idpextension.oidc.security.impl.OIDCClientInformationSignatureValidationParametersResolver.ParameterType).REQUEST_OBJECT_VALIDATION}" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationSignatureValidationParametersResolver"
+ p:parameterType="#{T(net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationSignatureValidationParametersResolver.ParameterType).REQUEST_OBJECT_VALIDATION}" />
<bean id="SetRequestObjectToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetRequestObjectToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetRequestObjectToResponseContext" scope="prototype"
p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
- <bean id="DecryptRequestObject" class="org.geant.idpextension.oidc.profile.impl.DecryptRequestObject"
+ <bean id="DecryptRequestObject" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.DecryptRequestObject"
scope="prototype" />
- <bean id="ValidateRequestObject" class="org.geant.idpextension.oidc.profile.impl.ValidateRequestObject"
+ <bean id="ValidateRequestObject" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateRequestObject"
scope="prototype">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
@@ -107,16 +107,16 @@
</property>
</bean>
- <bean id="ValidateRedirectURI" class="org.geant.idpextension.oidc.profile.impl.ValidateRedirectURI"
+ <bean id="ValidateRedirectURI" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateRedirectURI"
scope="prototype" />
- <bean id="ValidateResponseType" class="org.geant.idpextension.oidc.profile.impl.ValidateResponseType"
+ <bean id="ValidateResponseType" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateResponseType"
scope="prototype" />
- <bean id="ValidateScope" class="org.geant.idpextension.oidc.profile.impl.ValidateScope" scope="prototype" />
+ <bean id="ValidateScope" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateScope" scope="prototype" />
<bean id="PopulateIDTokenSignatureSigningParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.IDTokenSignatureSigningParametersResolver">
<property name="activationCondition">
@@ -135,7 +135,7 @@
</bean>
<bean id="PopulateIDTokenEncryptionParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.EncryptionConfigurationLookup"
p:encryptionParametersResolver-ref="shibboleth.oidc.EncryptionParametersResolver">
<property name="activationCondition">
@@ -144,14 +144,14 @@
</bean>
<bean id="shibboleth.oidc.EncryptionParametersResolver"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationEncryptionParametersResolver" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationEncryptionParametersResolver" />
<bean id="PopulateClientStorageLoadContext"
class="org.opensaml.storage.impl.client.PopulateClientStorageLoadContext" scope="prototype"
p:storageServices="#{ getObject('shibboleth.ClientStorageServices') ?: getObject('shibboleth.DefaultClientStorageServices') }" />
<bean id="SetTokenDeliveryAttributesToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetTokenDeliveryAttributesToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetTokenDeliveryAttributesToResponseContext" scope="prototype"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService">
<property name="activationCondition">
<bean parent="shibboleth.Conditions.OR">
@@ -166,12 +166,12 @@
</bean>
<bean id="SetConsentToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetConsentToResponseContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetConsentToResponseContext" scope="prototype" />
- <bean id="RevokeConsent" class="org.geant.idpextension.oidc.profile.impl.RevokeConsent" scope="prototype" />
+ <bean id="RevokeConsent" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.RevokeConsent" scope="prototype" />
<bean id="SetAuthorizationCodeToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetAuthorizationCodeToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAuthorizationCodeToResponseContext" scope="prototype"
c:sealer-ref="tokenSealer">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
@@ -183,7 +183,7 @@
</bean>
<bean id="SetAccessTokenToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetAccessTokenToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAccessTokenToResponseContext" scope="prototype"
c:sealer-ref="tokenSealer">
<property name="activationCondition">
<ref bean="AccessTokenRequested" />
@@ -191,49 +191,49 @@
</bean>
<bean id="SetSubjectToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetSubjectToResponseContext" scope="prototype">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetSubjectToResponseContext" scope="prototype">
<property name="subjectLookupStrategy">
- <bean class="org.geant.idpextension.oidc.profile.logic.AttributeResolutionSubjectLookupFunction"
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.logic.AttributeResolutionSubjectLookupFunction"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService" />
</property>
<property name="subjectTypeLookupStrategy">
- <bean class="org.geant.idpextension.oidc.profile.logic.DefaultSubjectTypeStrategy" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.logic.DefaultSubjectTypeStrategy" />
</property>
</bean>
<bean id="SetAuthenticationTimeToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetAuthenticationTimeToResponseContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAuthenticationTimeToResponseContext" scope="prototype" />
<bean id="SetSectorIdentifierForAttributeResolution"
- class="org.geant.idpextension.oidc.profile.impl.SetSectorIdentifierForAttributeResolution" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetSectorIdentifierForAttributeResolution" scope="prototype" />
<bean id="SetAuthenticationContextClassReferenceToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetAuthenticationContextClassReferenceToResponseContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAuthenticationContextClassReferenceToResponseContext"
scope="prototype">
<property name="classRefLookupStrategy">
<bean class="net.shibboleth.idp.authn.principal.DefaultPrincipalDeterminationStrategy"
- c:type="org.geant.idpextension.oidc.authn.principal.AuthenticationContextClassReferencePrincipal">
+ c:type="net.shibboleth.idp.plugin.oidc.op.authn.principal.AuthenticationContextClassReferencePrincipal">
<constructor-arg name="principal">
<bean
- class="org.geant.idpextension.oidc.authn.principal.AuthenticationContextClassReferencePrincipal"
- c:classRef="#{T(org.geant.idpextension.oidc.authn.principal.AuthenticationContextClassReferencePrincipal).UNSPECIFIED}" />
+ class="net.shibboleth.idp.plugin.oidc.op.authn.principal.AuthenticationContextClassReferencePrincipal"
+ c:classRef="#{T(net.shibboleth.idp.plugin.oidc.op.authn.principal.AuthenticationContextClassReferencePrincipal).UNSPECIFIED}" />
</constructor-arg>
</bean>
</property>
</bean>
- <bean id="AddIDTokenShell" class="org.geant.idpextension.oidc.profile.impl.AddIDTokenShell" scope="prototype"
+ <bean id="AddIDTokenShell" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddIDTokenShell" scope="prototype"
p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple">
<property name="activationCondition">
<ref bean="IDTokenRequested" />
</property>
<property name="audienceRestrictionsLookupStrategy">
- <bean class="org.geant.idpextension.oidc.config.navigate.AudienceRestrictionsLookupFunction" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.config.navigate.AudienceRestrictionsLookupFunction" />
</property>
</bean>
<bean id="AddAttributeClaimsToIDToken"
- class="org.geant.idpextension.oidc.profile.impl.AddAttributesToClaimsSet" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAttributesToClaimsSet" scope="prototype"
p:targetIDToken="true"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService"
p:reservedClaimNames="#{getObject('shibboleth.oidc.IDTokenReservedClaimNames') ?: getObject('shibboleth.oidc.DefaultIDTokenReservedClaimNames')}">
@@ -242,20 +242,20 @@
</property>
</bean>
- <bean id="AddAuthTimeToIDToken" class="org.geant.idpextension.oidc.profile.impl.AddAuthTimeToIDToken"
+ <bean id="AddAuthTimeToIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAuthTimeToIDToken"
scope="prototype">
<property name="activationCondition">
<ref bean="IDTokenRequested" />
</property>
</bean>
- <bean id="AddAcrToIDToken" class="org.geant.idpextension.oidc.profile.impl.AddAcrToIDToken" scope="prototype">
+ <bean id="AddAcrToIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAcrToIDToken" scope="prototype">
<property name="activationCondition">
<ref bean="IDTokenRequested" />
</property>
</bean>
- <bean id="AddNonceToIDToken" class="org.geant.idpextension.oidc.profile.impl.AddNonceToIDToken"
+ <bean id="AddNonceToIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddNonceToIDToken"
scope="prototype">
<property name="activationCondition">
<ref bean="IDTokenRequested" />
@@ -263,7 +263,7 @@
</bean>
<bean id="AddAccessTokenHashToIDToken"
- class="org.geant.idpextension.oidc.profile.impl.AddAccessTokenHashToIDToken" scope="prototype">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAccessTokenHashToIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookup.SecurityParameters"
@@ -282,7 +282,7 @@
</bean>
<bean id="AddAuthorizationCodeHashToIDToken"
- class="org.geant.idpextension.oidc.profile.impl.AddAuthorizationCodeHashToIDToken" scope="prototype">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAuthorizationCodeHashToIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookup.SecurityParameters"
@@ -300,7 +300,7 @@
</property>
</bean>
- <bean id="SignIDToken" class="org.geant.idpextension.oidc.profile.impl.SignIDToken" scope="prototype">
+ <bean id="SignIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SignIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookup.SecurityParameters"
@@ -311,7 +311,7 @@
</property>
</bean>
- <bean id="EncryptIDToken" class="org.geant.idpextension.oidc.profile.impl.EncryptProcessedToken"
+ <bean id="EncryptIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.EncryptProcessedToken"
scope="prototype">
<property name="activationCondition">
<ref bean="IDTokenRequested" />
@@ -319,21 +319,21 @@
</bean>
<bean id="FormOutboundMessage"
- class="org.geant.idpextension.oidc.profile.impl.FormOutboundAuthenticationResponseMessage" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundAuthenticationResponseMessage" scope="prototype" />
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oidc.profile.impl.BuildAuthenticationErrorResponseFromEvent" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildAuthenticationErrorResponseFromEvent" scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
</property>
<property name="mappedErrors">
<map value-type="com.nimbusds.oauth2.sdk.ErrorObject">
- <entry key="#{T(org.geant.idpextension.oidc.profile.OidcEventIds).INVALID_REDIRECT_URI}"
+ <entry key="#{T(net.shibboleth.idp.plugin.oidc.op.profile.OidcEventIds).INVALID_REDIRECT_URI}"
value="#{T(com.nimbusds.oauth2.sdk.OAuth2Error).INVALID_REQUEST}" />
- <entry key="#{T(org.geant.idpextension.oidc.profile.OidcEventIds).INVALID_REQUEST_OBJECT}"
+ <entry key="#{T(net.shibboleth.idp.plugin.oidc.op.profile.OidcEventIds).INVALID_REQUEST_OBJECT}"
value="#{T(com.nimbusds.oauth2.sdk.OAuth2Error).INVALID_REQUEST_OBJECT}" />
- <entry key="#{T(org.geant.idpextension.oidc.profile.OidcEventIds).INVALID_RESPONSE_TYPE}"
+ <entry key="#{T(net.shibboleth.idp.plugin.oidc.op.profile.OidcEventIds).INVALID_RESPONSE_TYPE}"
value="#{T(com.nimbusds.oauth2.sdk.OAuth2Error).UNSUPPORTED_RESPONSE_TYPE}" />
<entry key="#{T(net.shibboleth.idp.authn.AuthnEventIds).NO_PASSIVE}"
value="#{T(com.nimbusds.openid.connect.sdk.OIDCError).LOGIN_REQUIRED}" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml
index 54670e21..b5697a31 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml
@@ -14,7 +14,7 @@
<bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/configuration" />
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oidc.profile.impl.BuildJSONErrorResponseFromEvent" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildJSONErrorResponseFromEvent" scope="prototype"
p:defaultStatusCode="500" p:defaultCode="server_error"
p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
@@ -22,14 +22,14 @@
</property>
</bean>
- <bean id="FormOutboundMessage" class="org.geant.idpextension.oidc.profile.impl.FormOutboundDiscoveryResponse"
+ <bean id="FormOutboundMessage" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundDiscoveryResponse"
scope="prototype" p:metadataResolver-ref="#{'%{idp.oidc.discovery.resolver:shibboleth.oidc.DefaultOpenIdConfigurationResolver}'.trim()}" />
<bean id="shibboleth.oidc.DefaultOpenIdConfigurationResolver"
- class="org.geant.idpextension.oidc.metadata.impl.DynamicFilesystemProviderMetadataResolver"
+ class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.DynamicFilesystemProviderMetadataResolver"
c:metadata-ref="MetadataSkeleton">
<property name="dynamicValueResolvers">
- <map value-type="org.geant.idpextension.oidc.metadata.resolver.MetadataValueResolver">
+ <map value-type="net.shibboleth.idp.plugin.oidc.op.metadata.resolver.MetadataValueResolver">
<entry key="id_token_signing_alg_values_supported" value-ref="SignatureAlgorithmInfoResolver" />
<entry key="userinfo_signing_alg_values_supported" value-ref="SignatureAlgorithmInfoResolver" />
<entry key="id_token_encryption_enc_values_supported" value-ref="DataEncryptionAlgorithmInfoResolver" />
@@ -43,18 +43,18 @@
<bean id="MetadataSkeleton" class="org.springframework.core.io.FileSystemResource"
c:path="%{idp.oidc.discovery.template:%{idp.home}/static/openid-configuration.json}" />
- <bean id="CredentialResolver" class="org.geant.idpextension.oidc.metadata.impl.CredentialMetadataValueResolver" />
+ <bean id="CredentialResolver" class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.CredentialMetadataValueResolver" />
<bean id="SignatureAlgorithmInfoResolver"
- class="org.geant.idpextension.oidc.metadata.impl.AlgorithmInfoMetadataValueResolver"
+ class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.AlgorithmInfoMetadataValueResolver"
p:resolveEncryptionAlgs="false" />
<bean id="DataEncryptionAlgorithmInfoResolver"
- class="org.geant.idpextension.oidc.metadata.impl.AlgorithmInfoMetadataValueResolver"
+ class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.AlgorithmInfoMetadataValueResolver"
p:resolveEncryptionAlgs="true" p:resolveKeyTransportEncAlgs="false" />
<bean id="KeyTransportEncryptionAlgorithmInfoResolver"
- class="org.geant.idpextension.oidc.metadata.impl.AlgorithmInfoMetadataValueResolver"
+ class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.AlgorithmInfoMetadataValueResolver"
p:resolveEncryptionAlgs="true" p:resolveKeyTransportEncAlgs="true" />
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
index dd70d49b..533d9969 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
@@ -13,6 +13,6 @@
<bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/keyset" />
<bean id="FormOutboundMessage"
- class="org.geant.idpextension.oidc.profile.impl.FormOutboundKeySetResponseMessage" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundKeySetResponseMessage" scope="prototype" />
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml
index 4298a5fa..6343d67a 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml
@@ -21,7 +21,7 @@
</bean>
<bean id="SetEntityIdToSAMLPeerEntityContext"
- class="org.geant.idpextension.oidc.profile.impl.SetEntityIdToSAMLPeerEntityContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetEntityIdToSAMLPeerEntityContext"
p:clientIDLookupStrategy-ref="shibboleth.ClientIDLookupStrategy"
p:entityContextClass="org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext" />
@@ -29,7 +29,7 @@
class="net.shibboleth.idp.saml.profile.impl.InitializeRelyingPartyContextFromSAMLPeer" scope="prototype" />
<bean id="InitializeRelyingPartyContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeRelyingPartyContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeRelyingPartyContext" scope="prototype"
p:clientIDLookupStrategy-ref="shibboleth.ClientIDLookupStrategy" />
<bean id="SAMLMetadataLookup"
@@ -55,13 +55,13 @@
c:f-ref="LookupSAMLPeerEntityContext"/>
<bean id="PopulateOIDCMetadataContext"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCMetadataContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCMetadataContext" scope="prototype"
p:samlMetadataContextLookupStrategy-ref="LookupSAMLMetadataContext" />
<bean id="OIDCMetadataLookup" class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
scope="prototype" c:executionDirection="INBOUND">
<constructor-arg name="messageHandler">
- <bean class="org.geant.idpextension.oidc.profile.impl.OIDCMetadataLookupHandler" scope="prototype">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.impl.OIDCMetadataLookupHandler" scope="prototype">
<property name="clientInformationResolver">
<ref bean="shibboleth.ClientInformationResolver" />
</property>
@@ -72,4 +72,4 @@
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
index 8d370200..f77cd64c 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
@@ -17,48 +17,48 @@
scope="prototype">
<constructor-arg>
<bean
- class="org.geant.idpextension.oidc.decoding.impl.OIDCClientRegistrationRequestDecoder"
+ class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCClientRegistrationRequestDecoder"
scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
</constructor-arg>
</bean>
<bean id="InitializeRelyingPartyContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeUnverifiedRelyingPartyContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeUnverifiedRelyingPartyContext"
scope="prototype" />
<bean id="CheckRedirectURIs"
- class="org.geant.idpextension.oidc.profile.impl.CheckRedirectURIs"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.CheckRedirectURIs"
scope="prototype"
p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
<bean id="GenerateClientID"
- class="org.geant.idpextension.oidc.profile.impl.GenerateClientID"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.GenerateClientID"
scope="prototype" />
<bean id="GenerateClientSecret"
- class="org.geant.idpextension.oidc.profile.impl.GenerateClientSecret" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.GenerateClientSecret" scope="prototype"
p:defaultSecretExpirationPeriod="#{'%{idp.oidc.dynreg.defaultSecretExpiration:P12M}'.trim()}">
<property name="secretExpirationPeriodStrategy">
- <bean class="org.geant.idpextension.oidc.config.navigate.SecretExpirationPeriodLookupFunction" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.config.navigate.SecretExpirationPeriodLookupFunction" />
</property>
</bean>
<bean id="AddRedirectUrisToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddRedirectUrisToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddRedirectUrisToClientMetadata"
scope="prototype" />
<bean id="AddTokenEndpointAuthMethodsToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddTokenEndpointAuthMethodsToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddTokenEndpointAuthMethodsToClientMetadata"
scope="prototype" />
<bean id="AddApplicationTypeToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddApplicationTypeToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddApplicationTypeToClientMetadata"
scope="prototype" />
<bean id="AddScopeToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddScopeToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddScopeToClientMetadata"
scope="prototype"
p:defaultScope-ref="shibboleth.oidc.DefaultScope" />
@@ -69,15 +69,15 @@
</bean>
<bean id="AddContactsToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddContactsToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddContactsToClientMetadata"
scope="prototype" />
<bean id="AddGrantTypeToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddGrantTypeToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddGrantTypeToClientMetadata"
scope="prototype" />
<bean id="AddSubjectTypeToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddSubjectTypeToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddSubjectTypeToClientMetadata"
scope="prototype"
p:defaultSubjectType-ref="shibboleth.oidc.DefaultSubjectType" />
@@ -89,37 +89,37 @@
</bean>
<bean id="AddResponseTypesToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddResponseTypesToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddResponseTypesToClientMetadata"
scope="prototype" />
<bean id="AddJwksToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddJwksToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddJwksToClientMetadata"
scope="prototype"
p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
<bean id="AddLogoUrisToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddLogoUrisToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddLogoUrisToClientMetadata"
scope="prototype" />
<bean id="AddPolicyUrisToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddPolicyUrisToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddPolicyUrisToClientMetadata"
scope="prototype" />
<bean id="AddTosUrisToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddTosUrisToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddTosUrisToClientMetadata"
scope="prototype" />
<bean id="AddClientNameToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddClientNameToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddClientNameToClientMetadata"
scope="prototype" />
<bean id="AddSecurityConfigurationToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddSecurityConfigurationToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddSecurityConfigurationToClientMetadata"
scope="prototype" />
<bean id="AddRequestObjectSecurityConfigurationToClientMetadata"
- class="org.geant.idpextension.oidc.profile.impl.AddRequestObjectSecurityConfigurationToClientMetadata"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddRequestObjectSecurityConfigurationToClientMetadata"
p:allowSignatureNone="%{idp.oidc.dynreg.allowNoneForRequestSigning:true}" scope="prototype" />
<bean id="shibboleth.oidc.ClientInformationManager"
@@ -128,13 +128,13 @@
p:storageService-ref="#{'%{idp.oidc.dynreg.StorageService:shibboleth.StorageService}'.trim()}" />
<bean id="StoreClientInformation"
- class="org.geant.idpextension.oidc.profile.impl.StoreClientInformation"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.StoreClientInformation"
scope="prototype"
p:clientInformationManager-ref="shibboleth.oidc.ClientInformationManager"
p:defaultRegistrationValidityPeriod="#{'%{idp.oidc.dynreg.defaultRegistrationValidity:PT24H}'.trim()}">
<property name="registrationValidityPeriodStrategy">
<bean
- class="org.geant.idpextension.oidc.config.navigate.RegistrationValidityPeriodLookupFunction" />
+ class="net.shibboleth.idp.plugin.oidc.op.config.navigate.RegistrationValidityPeriodLookupFunction" />
</property>
</bean>
@@ -148,12 +148,12 @@
scope="prototype" />
<bean id="InitializeOutboundMessageContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeOutboundRegistrationResponseMessageContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeOutboundRegistrationResponseMessageContext"
scope="prototype">
</bean>
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oidc.profile.impl.BuildRegistrationErrorResponseFromEvent"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildRegistrationErrorResponseFromEvent"
scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
@@ -163,7 +163,7 @@
<property name="mappedErrors">
<map value-type="com.nimbusds.oauth2.sdk.ErrorObject">
<entry
- key="#{T(org.geant.idpextension.oidc.profile.OidcEventIds).MISSING_REDIRECT_URIS}"
+ key="#{T(net.shibboleth.idp.plugin.oidc.op.profile.OidcEventIds).MISSING_REDIRECT_URIS}"
value="#{T(com.nimbusds.oauth2.sdk.client.RegistrationError).INVALID_REDIRECT_URI}" />
<entry
key="#{T(org.opensaml.profile.action.EventIds).IO_ERROR}"
@@ -173,15 +173,15 @@
</bean>
<bean id="FormOutboundMessage"
- class="org.geant.idpextension.oidc.profile.impl.BuildClientInformation"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildClientInformation"
scope="prototype" />
<bean id="oidc.messageEncoderFactory"
- class="org.geant.idpextension.oidc.encoding.impl.OIDCResponseEncoderFactory"
+ class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.OIDCResponseEncoderFactory"
p:messageEncoder-ref="oidc.nimbusEncoder" scope="prototype" />
<bean id="oidc.nimbusEncoder"
- class="org.geant.idpextension.oidc.encoding.impl.NimbusResponseEncoder"
+ class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.NimbusResponseEncoder"
scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse"
init-method="" />
@@ -201,9 +201,9 @@
<map>
<entry>
<key>
- <util:constant static-field="org.geant.idpextension.oidc.audit.AuditFields.CLIENT_ID"/>
+ <util:constant static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.CLIENT_ID"/>
</key>
- <bean class="org.geant.idpextension.oidc.audit.impl.ClientIdRegistrationAuditExtractor">
+ <bean class="net.shibboleth.idp.plugin.oidc.op.audit.impl.ClientIdRegistrationAuditExtractor">
</bean>
</entry>
</map>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index 43333d55..04d9684e 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -11,20 +11,20 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
- <bean class="org.geant.idpextension.oidc.decoding.impl.OIDCTokenRequestDecoder" scope="prototype"
+ <bean class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCTokenRequestDecoder" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
</constructor-arg>
</bean>
<bean id="shibboleth.ClientIDLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestClientIDLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestClientIDLookupFunction"
scope="prototype" />
<bean id="InitializeOutboundMessageContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeOutboundTokenResponseMessageContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeOutboundTokenResponseMessageContext" scope="prototype" />
<bean id="ValidateEndpointAuthentication"
- class="org.geant.idpextension.oidc.profile.impl.ValidateEndpointAuthentication" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateEndpointAuthentication" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:replayCache-ref="shibboleth.ReplayCache">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
@@ -33,17 +33,17 @@
</property>
</bean>
- <bean id="ValidateGrantType" class="org.geant.idpextension.oidc.profile.impl.ValidateGrantType"
+ <bean id="ValidateGrantType" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateGrantType"
scope="prototype" />
- <bean id="ValidateGrant" class="org.geant.idpextension.oidc.profile.impl.ValidateGrant" scope="prototype"
+ <bean id="ValidateGrant" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateGrant" scope="prototype"
c:sealer-ref="tokenSealer" p:replayCache-ref="shibboleth.ReplayCache"
p:revocationCache-ref="shibboleth.RevocationCache" />
- <bean id="ValidatePKCE" class="org.geant.idpextension.oidc.profile.impl.ValidatePKCE"
+ <bean id="ValidatePKCE" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidatePKCE"
scope="prototype" />
- <bean id="ValidateRedirectURI" class="org.geant.idpextension.oidc.profile.impl.ValidateRedirectURI"
+ <bean id="ValidateRedirectURI" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateRedirectURI"
scope="prototype" p:redirectURILookupStrategy-ref="shibboleth.TokenRequestRedirectURILookupStrategy"
p:validRedirectURIsLookupStrategy-ref="shibboleth.TokenRequestValidRequestUrisLookupStrategy">
<property name="activationCondition">
@@ -52,49 +52,49 @@
</bean>
<bean id="shibboleth.TokenRequestRedirectURILookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestRedirectURILookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestRedirectURILookupFunction"
scope="prototype" />
<bean id="shibboleth.TokenRequestValidRequestUrisLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestValidRequestURIsLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestValidRequestURIsLookupFunction"
scope="prototype" />
- <bean id="ValidateScope" class="org.geant.idpextension.oidc.profile.impl.ValidateScope" scope="prototype"
+ <bean id="ValidateScope" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateScope" scope="prototype"
p:scopeLookupStrategy-ref="shibboleth.TokenRequestScopeLookupStrategy" />
<bean id="SetRequestedClaimsToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetRequestedClaimsToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetRequestedClaimsToResponseContext" scope="prototype"
p:requestedClaimsLookupStrategy-ref="shibboleth.TokenRequestRequestedClaimsLookupFunction"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService" />
<bean id="shibboleth.TokenRequestRequestedClaimsLookupFunction"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestRequestedClaimsLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestRequestedClaimsLookupFunction"
scope="prototype" />
<bean id="SetAuthenticationContextClassReferenceToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContext"
scope="prototype" />
<bean id="SetAuthenticationTimeToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetAuthenticationTimeToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAuthenticationTimeToResponseContext" scope="prototype"
p:authTimeLookupStrategy-ref="shibboleth.TokenRequestAuthTimeLookupFunction" />
<bean id="SetTokenDeliveryAttributesToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetTokenDeliveryAttributesFromTokenToResponseContext" scope="prototype">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetTokenDeliveryAttributesFromTokenToResponseContext" scope="prototype">
</bean>
<bean id="SetConsentToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetConsentFromTokenToResponseContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetConsentFromTokenToResponseContext" scope="prototype" />
- <bean id="ReduceValidatedScope" class="org.geant.idpextension.oidc.profile.impl.ReduceValidatedScope"
+ <bean id="ReduceValidatedScope" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ReduceValidatedScope"
scope="prototype" />
<bean id="shibboleth.TokenRequestAuthTimeLookupFunction"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestAuthTimeLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestAuthTimeLookupFunction"
scope="prototype" />
<bean id="PopulateIDTokenSignatureSigningParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.IDTokenSignatureSigningParametersResolver">
<property name="securityParametersContextLookupStrategy">
@@ -110,59 +110,59 @@
</bean>
<bean id="PopulateIDTokenEncryptionParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.EncryptionConfigurationLookup"
p:encryptionParametersResolver-ref="shibboleth.oidc.EncryptionParametersResolver" />
<bean id="shibboleth.oidc.EncryptionParametersResolver"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationEncryptionParametersResolver" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationEncryptionParametersResolver" />
<bean id="shibboleth.TokenRequestScopeLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestScopeLookupFunction" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestScopeLookupFunction" scope="prototype" />
<bean id="SetAccessTokenToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetAccessTokenToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetAccessTokenToResponseContext" scope="prototype"
c:sealer-ref="tokenSealer">
</bean>
<bean id="SetRefreshTokenToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetRefreshTokenToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetRefreshTokenToResponseContext" scope="prototype"
c:sealer-ref="tokenSealer">
</bean>
- <bean id="InitializeSubjectContext" class="org.geant.idpextension.oidc.profile.impl.InitializeSubjectContext"
+ <bean id="InitializeSubjectContext" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeSubjectContext"
scope="prototype" />
<bean id="SetSubjectToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetSubjectToResponseContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetSubjectToResponseContext" scope="prototype" />
- <bean id="AddIDTokenShell" class="org.geant.idpextension.oidc.profile.impl.AddIDTokenShell" scope="prototype"
+ <bean id="AddIDTokenShell" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddIDTokenShell" scope="prototype"
p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple">
<property name="audienceRestrictionsLookupStrategy">
- <bean class="org.geant.idpextension.oidc.config.navigate.AudienceRestrictionsLookupFunction" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.config.navigate.AudienceRestrictionsLookupFunction" />
</property>
</bean>
<bean id="AddAttributeClaimsToIDToken"
- class="org.geant.idpextension.oidc.profile.impl.AddAttributesToClaimsSet" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAttributesToClaimsSet" scope="prototype"
p:targetIDToken="true"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService"
p:reservedClaimNames="#{getObject('shibboleth.oidc.IDTokenReservedClaimNames') ?: getObject('shibboleth.oidc.DefaultIDTokenReservedClaimNames')}" />
<bean id="AddTokenDeliveryAttributesToIDToken"
- class="org.geant.idpextension.oidc.profile.impl.AddTokenDeliveryAttributesToClaimsSet" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddTokenDeliveryAttributesToClaimsSet" scope="prototype"
p:targetIDToken="true" />
- <bean id="AddAuthTimeToIDToken" class="org.geant.idpextension.oidc.profile.impl.AddAuthTimeToIDToken"
+ <bean id="AddAuthTimeToIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAuthTimeToIDToken"
scope="prototype" />
- <bean id="AddAcrToIDToken" class="org.geant.idpextension.oidc.profile.impl.AddAcrToIDToken" scope="prototype" />
+ <bean id="AddAcrToIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAcrToIDToken" scope="prototype" />
- <bean id="AddNonceToIDToken" class="org.geant.idpextension.oidc.profile.impl.AddNonceToIDToken"
+ <bean id="AddNonceToIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddNonceToIDToken"
scope="prototype" p:requestNonceLookupStrategy-ref="shibboleth.TokenRequestNonceLookupStrategy" />
<bean id="AddAccessTokenHashToIDToken"
- class="org.geant.idpextension.oidc.profile.impl.AddAccessTokenHashToIDToken" scope="prototype">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAccessTokenHashToIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookup.SecurityParameters"
@@ -171,9 +171,9 @@
</bean>
<bean id="shibboleth.TokenRequestNonceLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestNonceLookupFunction" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestNonceLookupFunction" scope="prototype" />
- <bean id="SignIDToken" class="org.geant.idpextension.oidc.profile.impl.SignIDToken" scope="prototype">
+ <bean id="SignIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SignIDToken" scope="prototype">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
c:g-ref="shibboleth.ChildLookup.SecurityParameters"
@@ -181,23 +181,23 @@
</property>
</bean>
- <bean id="EncryptIDToken" class="org.geant.idpextension.oidc.profile.impl.EncryptProcessedToken"
+ <bean id="EncryptIDToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.EncryptProcessedToken"
scope="prototype" />
<bean id="FormOutboundMessage"
- class="org.geant.idpextension.oidc.profile.impl.FormOutboundTokenResponseMessage" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundTokenResponseMessage" scope="prototype" />
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oidc.profile.impl.BuildTokenErrorResponseFromEvent" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildTokenErrorResponseFromEvent" scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
</property>
<property name="mappedErrors">
<map value-type="com.nimbusds.oauth2.sdk.ErrorObject">
- <entry key="#{T(org.geant.idpextension.oidc.profile.OidcEventIds).INVALID_GRANT}"
+ <entry key="#{T(net.shibboleth.idp.plugin.oidc.op.profile.OidcEventIds).INVALID_GRANT}"
value="#{T(com.nimbusds.oauth2.sdk.OAuth2Error).INVALID_GRANT}" />
- <entry key="#{T(org.geant.idpextension.oidc.profile.OidcEventIds).INVALID_REDIRECT_URI}"
+ <entry key="#{T(net.shibboleth.idp.plugin.oidc.op.profile.OidcEventIds).INVALID_REDIRECT_URI}"
value="#{T(com.nimbusds.oauth2.sdk.OAuth2Error).INVALID_REQUEST}" />
</map>
</property>
@@ -212,7 +212,7 @@
</bean>
<bean id="PopulateTokenEndpointJwtSignatureValidationParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.oidc.SignatureValidationConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.TokenEndpointJwtSignatureValidationParametersResolver">
<property name="securityParametersContextLookupStrategy">
@@ -228,11 +228,11 @@
</bean>
<bean id="shibboleth.oidc.SignatureValidationConfigurationLookup"
- class="org.geant.idpextension.oidc.config.navigate.TokenEndpointJwtSignatureValidationConfigurationLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.config.navigate.TokenEndpointJwtSignatureValidationConfigurationLookupFunction"
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<bean id="shibboleth.oidc.TokenEndpointJwtSignatureValidationParametersResolver"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationSignatureValidationParametersResolver"
- p:parameterType="#{T(org.geant.idpextension.oidc.security.impl.OIDCClientInformationSignatureValidationParametersResolver.ParameterType).TOKEN_ENDPOINT_JWT_VALIDATION}" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationSignatureValidationParametersResolver"
+ p:parameterType="#{T(net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationSignatureValidationParametersResolver.ParameterType).TOKEN_ENDPOINT_JWT_VALIDATION}" />
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml
index 7a25059a..9eba9ceb 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml
@@ -11,39 +11,39 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
- <bean class="org.geant.idpextension.oidc.decoding.impl.OIDCUserInfoRequestDecoder" scope="prototype"
+ <bean class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCUserInfoRequestDecoder" scope="prototype"
p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
</constructor-arg>
</bean>
<bean id="InitializeOutboundMessageContext"
- class="org.geant.idpextension.oidc.profile.impl.InitializeOutboundUserInfoResponseMessageContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeOutboundUserInfoResponseMessageContext"
scope="prototype" />
- <bean id="ValidateAccessToken" class="org.geant.idpextension.oidc.profile.impl.ValidateAccessToken"
+ <bean id="ValidateAccessToken" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateAccessToken"
scope="prototype" c:sealer-ref="tokenSealer" p:revocationCache-ref="shibboleth.RevocationCache" />
<bean id="shibboleth.ClientIDLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.UserInfoRequestClientIDLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.UserInfoRequestClientIDLookupFunction"
scope="prototype" />
<bean id="shibboleth.UserInfoRequestClientIDLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.UserInfoRequestClientIDLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.UserInfoRequestClientIDLookupFunction"
scope="prototype" />
- <bean id="ValidateScope" class="org.geant.idpextension.oidc.profile.impl.ValidateScope" scope="prototype"
+ <bean id="ValidateScope" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateScope" scope="prototype"
p:scopeLookupStrategy-ref="shibboleth.TokenRequestScopeLookupStrategy" />
<bean id="shibboleth.TokenRequestScopeLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestScopeLookupFunction" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestScopeLookupFunction" scope="prototype" />
<bean id="SetRequestedClaimsToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetRequestedClaimsToResponseContext" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetRequestedClaimsToResponseContext" scope="prototype"
p:requestedClaimsLookupStrategy-ref="shibboleth.TokenRequestRequestedClaimsLookupFunction"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService" />
<bean id="SetTokenDeliveryAttributesToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetTokenDeliveryAttributesFromTokenToResponseContext"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetTokenDeliveryAttributesFromTokenToResponseContext"
scope="prototype">
<property name="iDTokenDeliveryClaimsLookupStrategy">
<null />
@@ -51,11 +51,11 @@
</bean>
<bean id="SetConsentToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetConsentFromTokenToResponseContext" scope="prototype">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetConsentFromTokenToResponseContext" scope="prototype">
</bean>
<bean id="PopulateUserInfoResponseSignatureSigningParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCSignatureSigningParameters " scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
p:signatureSigningParametersResolver-ref="shibboleth.oidc.UserInfoSignatureSigningParametersResolver">
<property name="securityParametersContextLookupStrategy">
@@ -71,46 +71,46 @@
</bean>
<bean id="shibboleth.oidc.UserInfoSignatureSigningParametersResolver"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationSignatureSigningParametersResolver"
- p:parameterType="#{T(org.geant.idpextension.oidc.security.impl.OIDCClientInformationSignatureSigningParametersResolver.ParameterType).USERINFO_SIGNING}" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationSignatureSigningParametersResolver"
+ p:parameterType="#{T(net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationSignatureSigningParametersResolver.ParameterType).USERINFO_SIGNING}" />
<bean id="PopulateUserInfoResponseEncryptionParameters"
- class="org.geant.idpextension.oidc.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCEncryptionParameters" scope="prototype"
p:configurationLookupStrategy-ref="shibboleth.EncryptionConfigurationLookup"
p:encryptionParametersResolver-ref="shibboleth.oidc.EncryptionParametersResolver" />
<bean id="shibboleth.oidc.EncryptionParametersResolver"
- class="org.geant.idpextension.oidc.security.impl.OIDCClientInformationEncryptionParametersResolver"
- p:parameterType="#{T(org.geant.idpextension.oidc.security.impl.OIDCClientInformationEncryptionParametersResolver.ParameterType).USERINFO_ENCRYPTION}" />
+ class="net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationEncryptionParametersResolver"
+ p:parameterType="#{T(net.shibboleth.idp.plugin.oidc.op.security.impl.OIDCClientInformationEncryptionParametersResolver.ParameterType).USERINFO_ENCRYPTION}" />
<bean id="shibboleth.TokenRequestRequestedClaimsLookupFunction"
- class="org.geant.idpextension.oidc.profile.context.navigate.TokenRequestRequestedClaimsLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestRequestedClaimsLookupFunction"
scope="prototype" />
- <bean id="InitializeSubjectContext" class="org.geant.idpextension.oidc.profile.impl.InitializeSubjectContext"
+ <bean id="InitializeSubjectContext" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.InitializeSubjectContext"
scope="prototype" />
<bean id="SetSubjectToResponseContext"
- class="org.geant.idpextension.oidc.profile.impl.SetSubjectToResponseContext" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetSubjectToResponseContext" scope="prototype" />
- <bean id="AddUserInfoShell" class="org.geant.idpextension.oidc.profile.impl.AddUserInfoShell" scope="prototype"
+ <bean id="AddUserInfoShell" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddUserInfoShell" scope="prototype"
p:issuerLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"></bean>
<bean id="AddAttributeClaimsToUserInfo"
- class="org.geant.idpextension.oidc.profile.impl.AddAttributesToClaimsSet" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddAttributesToClaimsSet" scope="prototype"
p:responseClaimsSetLookupStrategy-ref="shibboleth.UserInfoResponseClaimsSetLookupStrategy"
p:transcoderRegistry-ref="shibboleth.AttributeRegistryService"
p:reservedClaimNames="#{getObject('shibboleth.oidc.UserInfoReservedClaimNames') ?: getObject('shibboleth.oidc.DefaultUserInfoReservedClaimNames')}" />
<bean id="AddTokenDeliveryAttributesToUserinfo"
- class="org.geant.idpextension.oidc.profile.impl.AddTokenDeliveryAttributesToClaimsSet"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.AddTokenDeliveryAttributesToClaimsSet"
p:responseClaimsSetLookupStrategy-ref="shibboleth.UserInfoResponseClaimsSetLookupStrategy" scope="prototype" />
<bean id="shibboleth.UserInfoResponseClaimsSetLookupStrategy"
- class="org.geant.idpextension.oidc.profile.context.navigate.UserInfoResponseClaimsSetLookupFunction"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.UserInfoResponseClaimsSetLookupFunction"
scope="prototype" />
- <bean id="SignUserInfoResponse" class="org.geant.idpextension.oidc.profile.impl.SignUserInfoResponse"
+ <bean id="SignUserInfoResponse" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SignUserInfoResponse"
scope="prototype">
<property name="securityParametersLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
@@ -119,21 +119,21 @@
</property>
</bean>
- <bean id="EncryptUserInfoResponse" class="org.geant.idpextension.oidc.profile.impl.EncryptProcessedToken"
+ <bean id="EncryptUserInfoResponse" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.EncryptProcessedToken"
scope="prototype" />
<bean id="FormOutboundMessage"
- class="org.geant.idpextension.oidc.profile.impl.FormOutboundUserInfoResponseMessage" scope="prototype" />
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundUserInfoResponseMessage" scope="prototype" />
<bean id="BuildErrorResponseFromEvent"
- class="org.geant.idpextension.oidc.profile.impl.BuildUserInfoErrorResponseFromEvent" scope="prototype"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildUserInfoErrorResponseFromEvent" scope="prototype"
p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
</property>
<property name="mappedErrors">
<map value-type="com.nimbusds.oauth2.sdk.ErrorObject">
- <entry key="#{T(org.geant.idpextension.oidc.profile.OidcEventIds).INVALID_GRANT}"
+ <entry key="#{T(net.shibboleth.idp.plugin.oidc.op.profile.OidcEventIds).INVALID_GRANT}"
value="#{T(com.nimbusds.oauth2.sdk.OAuth2Error).INVALID_GRANT}" />
</map>
</property>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml
index d8b99453..306570ee 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml
@@ -18,20 +18,20 @@
scope="prototype">
<constructor-arg>
<bean
- class="org.geant.idpextension.oidc.decoding.impl.OIDCWebFingerRequestDecoder"
+ class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCWebFingerRequestDecoder"
scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
</constructor-arg>
</bean>
<bean id="CheckWebFingerRel"
- class="org.geant.idpextension.oidc.profile.impl.CheckWebFingerRel"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.CheckWebFingerRel"
scope="prototype" />
<bean id="CheckWebFingerResource"
- class="org.geant.idpextension.oidc.profile.impl.CheckWebFingerResource"
+ class="net.shibboleth.idp.plugin.oidc.op.profile.impl.CheckWebFingerResource"
scope="prototype" />
- <bean id="SetResponseStatusCodeFromEvent" class="org.geant.idpextension.oidc.profile.impl.SetResponseStatusCodeFromEvent"
+ <bean id="SetResponseStatusCodeFromEvent" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.SetResponseStatusCodeFromEvent"
scope="prototype" p:httpServletResponse-ref="shibboleth.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
@@ -43,7 +43,7 @@
</property>
</bean>
- <bean id="FormOutboundMessage" class="org.geant.idpextension.oidc.profile.impl.BuildWebFingerResponse"
+ <bean id="FormOutboundMessage" class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildWebFingerResponse"
scope="prototype" p:httpServletResponse-ref="shibboleth.HttpServletResponse"
p:issuer="%{idp.oidc.issuer}"/>
@@ -54,7 +54,7 @@
<entry>
<key>
<util:constant
- static-field="org.geant.idpextension.oidc.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
+ static-field="net.shibboleth.idp.plugin.oidc.op.audit.AuditFields.INBOUND_MESSAGE_CLASS" />
</key>
<bean parent="shibboleth.Functions.Constant" c:value="#{getObject('FlowAuditName')}" />
</entry>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml
index d32e514b..75ffe220 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml
@@ -14,12 +14,12 @@
<!-- Necessary for encoder parsing and claims mapping to function. -->
<bean id="OIDCByteTranscoder"
- class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
+ class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
<bean id="OIDCStringTranscoder"
- class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder" />
+ class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder" />
<bean id="OIDCScopedStringTranscoder"
- class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
+ class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 91278320..4ca31774 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -19,7 +19,7 @@
p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}" />
<bean id="OIDC.SSO" parent="AbstractOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCCoreProtocolConfiguration"
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCCoreProtocolConfiguration"
p:issuer-ref="issuer"
p:iDTokenLifetime="%{idp.oidc.idToken.defaultLifetime:PT1H}"
p:accessTokenLifetime="%{idp.oidc.accessToken.defaultLifetime:PT10M}"
@@ -33,28 +33,28 @@
p:deniedUserInfoAttributes="%{idp.oidc.deniedUserInfoAttributes:}" />
<bean id="OIDC.UserInfo" parent="AbstractOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCUserInfoConfiguration"
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCUserInfoConfiguration"
p:deniedUserInfoAttributes="%{idp.oidc.deniedUserInfoAttributes:}" />
<bean id="OIDC.Registration" parent="AbstractOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCDynamicRegistrationConfiguration"
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCDynamicRegistrationConfiguration"
p:issuer-ref="issuer"
p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}" />
<bean id="OIDC.Configuration" parent="AbstractOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCProviderInformationConfiguration"
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCProviderInformationConfiguration"
p:issuer-ref="issuer" />
<bean id="OAUTH2.Revocation" parent="AbstractOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oauth2.config.OAuth2TokenRevocationConfiguration"
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.config.OAuth2TokenRevocationConfiguration"
p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}" />
<bean id="OIDC.Keyset" parent="AbstractOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCPublishKeySetConfiguration"
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCPublishKeySetConfiguration"
p:securityConfiguration-ref="shibboleth.oidc.PublishKeySetSecurityConfiguration" />
<bean id="OAUTH2.Introspection" parent="AbstractOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oauth2.config.OAuth2TokenIntrospectionConfiguration"
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.config.OAuth2TokenIntrospectionConfiguration"
p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}" />
<!-- Metadata-driven variants. -->
@@ -103,7 +103,7 @@
</bean>
<bean id="OIDC.SSO.MDDriven" parent="AbstractMDDrivenOIDCFlowAwareProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCCoreProtocolConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCCoreProtocolConfiguration">
<property name="resolveAttributesPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
@@ -184,7 +184,7 @@
</property>
<property name="defaultAuthenticationMethodsLookupStrategy">
<bean parent="shibboleth.MDDrivenListProperty" p:propertyName="defaultAuthenticationMethods"
- p:propertyType="#{T(org.geant.idpextension.oidc.authn.principal.AuthenticationContextClassReferencePrincipal)}" />
+ p:propertyType="#{T(net.shibboleth.idp.plugin.oidc.op.authn.principal.AuthenticationContextClassReferencePrincipal)}" />
</property>
<property name="encodedAttributesLookupStrategy">
<bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="encodedAttributes">
@@ -216,7 +216,7 @@
</bean>
<bean id="OIDC.UserInfo.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCUserInfoConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCUserInfoConfiguration">
<property name="deniedUserInfoAttributesLookupStrategy">
<bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="encodedAttributes">
<property name="defaultValue">
@@ -229,7 +229,7 @@
</bean>
<bean id="OIDC.Registration.MDDriven" parent="AbstractMDDrivenOIDCFlowAwareProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCDynamicRegistrationConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCDynamicRegistrationConfiguration">
<property name="issuerLookupStrategy">
<bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="issuer" p:defaultValue-ref="issuer" />
</property>
@@ -252,14 +252,14 @@
</bean>
<bean id="OIDC.Configuration.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCProviderInformationConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCProviderInformationConfiguration">
<property name="issuerLookupStrategy">
<bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="issuer" p:defaultValue-ref="issuer" />
</property>
</bean>
<bean id="OIDC.Keyset.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oidc.config.OIDCPublishKeySetConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.config.OIDCPublishKeySetConfiguration">
<property name="securityConfigurationLookupStrategy">
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="securityConfiguration"
p:propertyType="#{T(net.shibboleth.idp.profile.config.SecurityConfiguration)}"
@@ -268,7 +268,7 @@
</bean>
<bean id="OAUTH2.Revocation.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oauth2.config.OAuth2TokenRevocationConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.config.OAuth2TokenRevocationConfiguration">
<property name="tokenEndpointAuthMethodsLookupStrategy">
<bean parent="shibboleth.MDDrivenListProperty" p:propertyName="tokenEndpointAuthMethods">
<property name="defaultValue">
@@ -282,7 +282,7 @@
</bean>
<bean id="OAUTH2.Introspection.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="org.geant.idpextension.oauth2.config.OAuth2TokenIntrospectionConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.oauth2.config.OAuth2TokenIntrospectionConfiguration">
<property name="tokenEndpointAuthMethodsLookupStrategy">
<bean parent="shibboleth.MDDrivenListProperty" p:propertyName="tokenEndpointAuthMethods">
<property name="defaultValue">
@@ -301,7 +301,7 @@
-->
<bean id="shibboleth.oidc.DefaultSecurityConfiguration"
- class="org.geant.idpextension.oidc.profile.api.OIDCSecurityConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration">
<property name="signatureSigningConfiguration">
<ref bean="#{'%{idp.oidc.signing.config:shibboleth.oidc.SigningConfiguration}'.trim()}" />
</property>
@@ -491,7 +491,7 @@
<!-- Configuration for publishing key set. -->
<bean id="shibboleth.oidc.PublishKeySetSecurityConfiguration"
- class="org.geant.idpextension.oidc.profile.api.OIDCSecurityConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration">
<property name="signatureSigningConfiguration">
<ref bean="shibboleth.oidc.PublishKeySetSigningConfiguration" />
</property>
@@ -508,4 +508,4 @@
<bean id="shibboleth.oidc.PublishKeySetRequestObjectDecryptionConfiguration" parent="shibboleth.BasicEncryptionConfiguration"
p:keyTransportEncryptionCredentials="#{getObject('shibboleth.oidc.EncryptionCredentialsToPublish') ?: getObject('shibboleth.oidc.EncryptionCredentials')}"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers
index 94d1859f..c6173714 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers
@@ -1,3 +1,2 @@
-org.geant.idpextension.oidc.attribute.encoder = org.geant.idpextension.oidc.attribute.resolver.spring.enc.impl.AttributeEncoderNamespaceHandler
-org.geant.idpextension.oidc.attribute.filter = org.geant.idpextension.oidc.attribute.filter.spring.impl.AttributeFilterNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:metadata\:oidc = net.shibboleth.idp.profile.spring.relyingparty.metadata.oidc.impl.MetadataNamespaceHandler
\ No newline at end of file
+org.geant.idpextension.oidc.attribute.encoder = net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl.AttributeEncoderNamespaceHandler
+org.geant.idpextension.oidc.attribute.filter = net.shibboleth.idp.plugin.oidc.op.attribute.filter.spring.impl.AttributeFilterNamespaceHandler
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas
index 0bda88dc..031120eb 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas
@@ -1,3 +1,2 @@
classpath\:/schema/idp-oidc-extension-afp.xsd = schema/idp-oidc-extension-afp.xsd
classpath\:/schema/idp-oidc-extension-attribute-encoder.xsd = schema/idp-oidc-extension-attribute-encoder.xsd
-classpath\:/schema/idp-oidc-extension-metadata-ext.xsd = schema/idp-oidc-extension-metadata-ext.xsd
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-metadata-ext.xsd b/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-metadata-ext.xsd
deleted file mode 100644
index 607fa693..00000000
--- a/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-metadata-ext.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:shibmd="urn:mace:shibboleth:2.0:metadata"
- targetNamespace="urn:mace:shibboleth:2.0:metadata:oidc" elementFormDefault="qualified">
-
- <import namespace="urn:mace:shibboleth:2.0:metadata"
- schemaLocation="http://shibboleth.net/schema/idp/shibboleth-metadata.xsd" />
-
- <complexType name="ClientInformation">
- <annotation>
- <documentation>
- A node processor that processes OAuthRP and attaches the parsed client
- information via object metadata.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="shibmd:MetadataNodeProcessorType">
- <attribute name="keyInfoProvidersRef" type="shibmd:string" use="required" />
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/matcher/impl/AttributeInOIDCRequestedClaimsMatcherTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParserTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParserTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParserTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/matcher/impl/AttributeInOIDCRequestedClaimsRuleParserTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/policyrule/filtercontext/impl/AttributeOIDCScopePolicyRuleTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParserTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParserTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParserTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParserTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParserTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParserTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParserTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParserTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParserTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParserTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParserTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParserTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/authn/principal/AuthenticationContextClassReferencePrincipalTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/principal/AuthenticationContextClassReferencePrincipalTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/authn/principal/AuthenticationContextClassReferencePrincipalTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/principal/AuthenticationContextClassReferencePrincipalTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/config/OIDCCoreProtocolConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfigurationTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/config/OIDCCoreProtocolConfigurationTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfigurationTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCAuthenticationRequestDecoderTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoderTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCAuthenticationRequestDecoderTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoderTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCClientRegistrationRequestDecoderTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoderTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCClientRegistrationRequestDecoderTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoderTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCTokenRequestDecoderTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoderTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCTokenRequestDecoderTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoderTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCUserInfoRequestDecoderTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoderTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/decoding/impl/OIDCUserInfoRequestDecoderTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoderTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemMetadataValueResolverTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolverTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemMetadataValueResolverTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemProviderMetdataResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemProviderMetdataResolverTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemProviderMetdataResolverTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/FilesystemProviderMetdataResolverTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/config/OAuth2TokenRevocationConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfigurationTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/config/OAuth2TokenRevocationConfigurationTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfigurationTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/decoding/impl/OAuth2RevocationRequestDecoderTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoderTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/decoding/impl/OAuth2RevocationRequestDecoderTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoderTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationErrorResponseTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationErrorResponseTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationErrorResponseTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationErrorResponseTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationSuccessResponseTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationSuccessResponseTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/messaging/impl/OAuth2RevocationSuccessResponseTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/messaging/impl/OAuth2RevocationSuccessResponseTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/profile/impl/RevokeTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/RevokeTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oauth2/profile/impl/RevokeTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/RevokeTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/AbstractOidcApiFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcApiFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/AbstractOidcApiFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcApiFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/AbstractOidcFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/AbstractOidcFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/AuthorizeFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AuthorizeFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/AuthorizeFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AuthorizeFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/DiscoveryFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/DiscoveryFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/DiscoveryFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/DiscoveryFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/IntrospectionFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/IntrospectionFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/IntrospectionFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/IntrospectionFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/KeySetFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/KeySetFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/RegistrationFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/RegistrationFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/RegistrationFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/RegistrationFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/RevocationFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/RevocationFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/RevocationFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/RevocationFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/TokenFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TokenFlowTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/TokenFlowTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TokenFlowTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/UserInfoTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/UserInfoTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/flow/UserInfoTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/UserInfoTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationRequestActionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCAuthenticationResponseActionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseActionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCTokenResponseActionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCTokenResponseActionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoResponseActionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AbstractOIDCUserInfoResponseActionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCUserInfoResponseActionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAccessTokenHashToIDTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAcrToIDTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAcrToIDTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAcrToIDTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddApplicationTypeToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddApplicationTypeToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddApplicationTypeToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddApplicationTypeToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSetTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAttributesToClaimsSetTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSetTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthTimeToIDTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthTimeToIDTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthTimeToIDTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddClientNameToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddClientNameToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddClientNameToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddClientNameToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddContactsToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddContactsToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddContactsToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddContactsToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddGrantTypeToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShellTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShellTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddIDTokenShellTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddIDTokenShellTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddJwksToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddJwksToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddJwksToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddNonceToIDTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddNonceToIDTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddNonceToIDTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRedirectUrisToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRedirectUrisToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRedirectUrisToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRedirectUrisToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddResponseTypesToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddScopeToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddScopeToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddScopeToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddScopeToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddTokenDeliveryAttributesToClaimsSetTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShellTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddUserInfoShellTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddUserInfoShellTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddUserInfoShellTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCClientMetadataPopulationTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCClientMetadataPopulationTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCClientMetadataPopulationTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCClientMetadataPopulationTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCRegistrationRequestTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCRegistrationRequestTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCRegistrationRequestTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCRegistrationRequestTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BaseOIDCResponseActionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEventTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildJSONErrorResponseFromEventTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/BuildJSONErrorResponseFromEventTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BuildJSONErrorResponseFromEventTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectUrisTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckRedirectUrisTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/CheckRedirectUrisTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/CheckRedirectUrisTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/DecryptRequestObjectTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/DecryptRequestObjectTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/EncryptProcessedTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/EncryptProcessedTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundAuthenticationResponseMessageTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundAuthenticationResponseMessageTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundAuthenticationResponseMessageTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponseTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponseTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundDiscoveryResponseTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundDiscoveryResponseTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundTokenResponseMessageTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundTokenResponseMessageTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundTokenResponseMessageTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessageTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/FormOutboundUserInfoResponseMessageTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundUserInfoResponseMessageTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeAuthenticationContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeAuthenticationContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeAuthenticationContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundAuthenticationResponseMessageContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundResponseMessageContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeOutboundResponseMessageContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeOutboundResponseMessageContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeRelyingPartyContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeRelyingPartyContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeRelyingPartyContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeSubjectContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeSubjectContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeSubjectContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/InitializeUnverifiedRelyingPartyContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParametersTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCEncryptionParametersTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/PopulateOIDCEncryptionParametersTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/PopulateOIDCEncryptionParametersTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ProcessRequestedAuthnContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ProcessRequestedAuthnContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ProcessRequestedAuthnContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScopeTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ReduceValidatedScopeTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ReduceValidatedScopeTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ReduceValidatedScopeTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/RevokeConsentTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsentTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/RevokeConsentTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsentTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAccessTokenToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAccessTokenToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAccessTokenToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceFromAuthzCodeToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationContextClassReferenceToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationTimeToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthenticationTimeToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthenticationTimeToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetAuthorizationCodeToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentFromTokenToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetConsentToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetEntityIdToSAMLPeerEntityContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetEntityIdToSAMLPeerEntityContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetEntityIdToSAMLPeerEntityContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetEntityIdToSAMLPeerEntityContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRefreshTokenToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedClaimsToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedClaimsToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetRequestedSubjectToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRequestedSubjectToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSectorIdentifierForAttributeResolutionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSubjectToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetSubjectToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetSubjectToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignIDTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignIDTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignIDTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponseTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignUserInfoResponseTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/SignUserInfoResponseTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SignUserInfoResponseTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateAccessTokenTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateAccessTokenTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateAccessTokenTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateEndpointAuthenticationTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateEndpointAuthenticationTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTypeTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateGrantTypeTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCETest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidatePKCETest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURITest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRedirectURITest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRedirectURITest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRedirectURITest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRequestObjectTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateRequestObjectTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseTypeTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateResponseTypeTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateResponseTypeTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateResponseTypeTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateScopeTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateScopeTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateScopeTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateScopeTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifierTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/VerifyRequestedSubjectIdentifierTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/VerifyRequestedSubjectIdentifierTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/VerifyRequestedSubjectIdentifierTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/AttributeResolutionSubjectLookupFunctionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationConditionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/SubjectActivationConditionTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/logic/SubjectActivationConditionTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/logic/SubjectActivationConditionTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationEncryptionParametersResolverTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolverTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationEncryptionParametersResolverTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureSigningParametersResolverTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolverTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureSigningParametersResolverTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureValidationParametersResolverTest.java
similarity index 100%
rename from idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolverTest.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/security/impl/OIDCClientInformationSignatureValidationParametersResolverTest.java
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoderTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoderTest.java
deleted file mode 100644
index 7d4692bf..00000000
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCByteAttributeTranscoderTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
-import net.shibboleth.ext.spring.testing.MockApplicationContext;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.ByteAttributeValue;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.utilities.java.support.codec.Base64Support;
-import net.shibboleth.utilities.java.support.codec.DecodingException;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
-import org.geant.idpextension.oidc.attribute.transcoding.OIDCAttributeTranscoder;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import net.shibboleth.idp.attribute.StringAttributeValue;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
-import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
-
-public class OIDCByteAttributeTranscoderTest {
-
- private AttributeTranscoderRegistryImpl registry;
- private Map<String,Object> ruleset;
-
- private final static String ATTR_ID = "foo";
- private final static String ATTR_NAME = "bar";
-
- @BeforeMethod
- protected void setUp() throws Exception {
- registry = new AttributeTranscoderRegistryImpl();
- registry.setId("test");
-
- final OIDCByteAttributeTranscoder transcoder = new OIDCByteAttributeTranscoder();
- transcoder.initialize();
-
- registry.setNamingRegistry(Collections.singletonList(
- new BasicNamingFunction<>(transcoder.getEncodedType(),
- new AbstractOIDCAttributeTranscoder.NamingFunction())));
-
- ruleset = new HashMap<>();
- ruleset.put(AttributeTranscoderRegistry.PROP_ID, ATTR_ID);
- ruleset.put(AttributeTranscoderRegistry.PROP_TRANSCODER, transcoder);
- ruleset.put(OIDCAttributeTranscoder.PROP_NAME, ATTR_NAME);
- }
-
- @AfterMethod
- public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
- @Test(expectedExceptions=AttributeEncodingException.class)
- public void testNoValues() throws ComponentInitializationException, AttributeEncodingException {
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- TranscoderSupport.getTranscoder(tr).encode(null, inputAttribute, JSONObject.class, tr);
- }
-
- @Test
- public void testEncoding() throws ComponentInitializationException, AttributeEncodingException, DecodingException {
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> byteAttributeValues = new ArrayList<>();
- final byte[] bytes = new byte[1];
- bytes[0] = 0;
- byteAttributeValues.add(new ByteAttributeValue(bytes));
- inputAttribute.setValues(byteAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
- final String base64Coded = (String) object.get(ATTR_NAME);
- Assert.assertEquals(bytes, Base64Support.decode(base64Coded));
- }
-
- @Test
- public void testInteger() throws ComponentInitializationException, AttributeEncodingException {
- ruleset.put(OIDCAttributeTranscoder.PROP_ASINTEGER, true);
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> byteAttributeValues = new ArrayList<>();
- final byte[] bytes = new byte[2];
- bytes[0] = 0;
- bytes[1] = 1;
- byteAttributeValues.add(new ByteAttributeValue(bytes));
- inputAttribute.setValues(byteAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
-
- final JSONArray array = (JSONArray)object.get(ATTR_NAME);
- final JSONArray arrayInts = (JSONArray)array.get(0);
-
- Assert.assertEquals(arrayInts.get(0),0);
- Assert.assertEquals(arrayInts.get(1),1);
- }
-
-
- @Test(expectedExceptions=AttributeEncodingException.class)
- public void testEncodingWrongType() throws ComponentInitializationException, AttributeEncodingException {
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- inputAttribute.setValues(Collections.singletonList(new StringAttributeValue("test")));
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- TranscoderSupport.getTranscoder(tr).encode(null, inputAttribute, JSONObject.class, tr);
- }
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoderTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoderTest.java
deleted file mode 100644
index 12467561..00000000
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCScopedStringAttributeTranscoderTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
-import net.shibboleth.ext.spring.testing.MockApplicationContext;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.ByteAttributeValue;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
-import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
-import org.geant.idpextension.oidc.attribute.transcoding.OIDCAttributeTranscoder;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-public class OIDCScopedStringAttributeTranscoderTest {
-
- private AttributeTranscoderRegistryImpl registry;
- private Map<String,Object> ruleset;
-
-
- private final static String ATTR_ID = "foo";
- private final static String ATTR_NAME = "bar";
- private final static String STRING_1 = "value1";
- private final static String STRING_2 = "value2";
- private final static String SCOPE_1 = "scope1";
- private final static String SCOPE_2 = "scope2";
-
- @BeforeMethod
- protected void setUp() throws Exception {
- registry = new AttributeTranscoderRegistryImpl();
- registry.setId("test");
-
- final OIDCScopedStringAttributeTranscoder transcoder = new OIDCScopedStringAttributeTranscoder();
- transcoder.initialize();
-
- registry.setNamingRegistry(Collections.singletonList(
- new BasicNamingFunction<>(transcoder.getEncodedType(),
- new AbstractOIDCAttributeTranscoder.NamingFunction())));
-
- ruleset = new HashMap<>();
- ruleset.put(AttributeTranscoderRegistry.PROP_ID, ATTR_ID);
- ruleset.put(AttributeTranscoderRegistry.PROP_TRANSCODER, transcoder);
- ruleset.put(OIDCAttributeTranscoder.PROP_NAME, ATTR_NAME);
- }
-
- @AfterMethod
- public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
- @Test(expectedExceptions=AttributeEncodingException.class)
- public void testNoValues() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCAttributeTranscoder.PROP_STRING_DELIMITER, ";");
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- TranscoderSupport.getTranscoder(tr).encode(null, inputAttribute, JSONObject.class, tr);
- }
-
- @Test
- public void testEncoding() throws ComponentInitializationException, AttributeEncodingException {
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> stringAttributeValues = new ArrayList<>();
-
- stringAttributeValues.add(new ScopedStringAttributeValue(STRING_1, SCOPE_1));
- stringAttributeValues.add(new ScopedStringAttributeValue(STRING_2, SCOPE_2));
- inputAttribute.setValues(stringAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
-
- final String v = (String) object.get(ATTR_NAME);
-
- Assert.assertTrue(v.split(" ").length == 2);
- Assert.assertTrue(v.split(" ")[0].equals(STRING_1 + '@' + SCOPE_1));
- Assert.assertTrue(v.split(" ")[1].equals(STRING_2 + '@' + SCOPE_2));
- }
-
- @Test
- public void testEncoding2() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCAttributeTranscoder.PROP_ASARRAY, true);
- ruleset.put(OIDCScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER, ":");
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> stringAttributeValues = new ArrayList<>();
-
- stringAttributeValues.add(new ScopedStringAttributeValue(STRING_1, SCOPE_1));
- stringAttributeValues.add(new ScopedStringAttributeValue(STRING_2, SCOPE_2));
- inputAttribute.setValues(stringAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
-
- final JSONArray array = (JSONArray) object.get(ATTR_NAME);
-
- Assert.assertTrue(array.size() == 2);
- Assert.assertEquals(array.get(0), STRING_1 + ':' + SCOPE_1);
- Assert.assertEquals(array.get(1), STRING_2 + ':' + SCOPE_2);
- }
-
- @Test(expectedExceptions=AttributeEncodingException.class)
- public void testEncodingWrongType() throws ComponentInitializationException, AttributeEncodingException {
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> byteAttributeValues = new ArrayList<>();
- final byte[] bytes = new byte[1];
- bytes[0] = 0;
- byteAttributeValues.add(new ByteAttributeValue(bytes));
- inputAttribute.setValues(byteAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- TranscoderSupport.<JSONObject>getTranscoder(tr).encode(null, inputAttribute, JSONObject.class, tr);
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoderTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoderTest.java
deleted file mode 100644
index 9e071823..00000000
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/attribute/transcoding/impl/OIDCStringAttributeTranscoderTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.attribute.transcoding.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
-import net.shibboleth.ext.spring.testing.MockApplicationContext;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.ByteAttributeValue;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
-import org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
-import org.geant.idpextension.oidc.attribute.transcoding.OIDCAttributeTranscoder;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import net.shibboleth.idp.attribute.StringAttributeValue;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
-import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.idp.attribute.transcoding.impl.AttributeTranscoderRegistryImpl;
-
-public class OIDCStringAttributeTranscoderTest {
-
- private AttributeTranscoderRegistryImpl registry;
- private Map<String,Object> ruleset;
-
-
- private final static String ATTR_ID = "foo";
- private final static String ATTR_NAME = "bar";
- private final static String STRING_1 = "Value The First";
- private final static String STRING_2 = "Second string the value is";
-
- @BeforeMethod
- protected void setUp() throws Exception {
- registry = new AttributeTranscoderRegistryImpl();
- registry.setId("test");
-
- final OIDCStringAttributeTranscoder transcoder = new OIDCStringAttributeTranscoder();
- transcoder.initialize();
-
- registry.setNamingRegistry(Collections.singletonList(
- new BasicNamingFunction<>(transcoder.getEncodedType(),
- new AbstractOIDCAttributeTranscoder.NamingFunction())));
-
- ruleset = new HashMap<>();
- ruleset.put(AttributeTranscoderRegistry.PROP_ID, ATTR_ID);
- ruleset.put(AttributeTranscoderRegistry.PROP_TRANSCODER, transcoder);
- ruleset.put(OIDCAttributeTranscoder.PROP_NAME, ATTR_NAME);
- }
-
- @AfterMethod
- public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
- @Test(expectedExceptions=AttributeEncodingException.class)
- public void testNoValues() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCAttributeTranscoder.PROP_STRING_DELIMITER, ";");
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- TranscoderSupport.getTranscoder(tr).encode(null, inputAttribute, JSONObject.class, tr);
- }
-
- @Test
- public void testEncodingString() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCAttributeTranscoder.PROP_STRING_DELIMITER, ";");
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> stringAttributeValues = new ArrayList<>();
- stringAttributeValues.add(new StringAttributeValue(STRING_1));
- stringAttributeValues.add(new StringAttributeValue(STRING_2));
- inputAttribute.setValues(stringAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
- Assert.assertTrue(((String) object.get(ATTR_NAME)).split(";").length == 2);
- Assert.assertTrue(((String) object.get(ATTR_NAME)).split(";")[0].equals(STRING_1));
- Assert.assertTrue(((String) object.get(ATTR_NAME)).split(";")[1].equals(STRING_2));
- }
-
- @Test
- public void testEncodingStringArray() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCAttributeTranscoder.PROP_ASARRAY, true);
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> stringAttributeValues = new ArrayList<>();
- stringAttributeValues.add(new StringAttributeValue(STRING_1));
- stringAttributeValues.add(new StringAttributeValue(STRING_2));
- inputAttribute.setValues(stringAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject array = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
- Assert.assertTrue(array.get(ATTR_NAME) instanceof JSONArray);
- final JSONArray v = (JSONArray) array.get(ATTR_NAME);
- Assert.assertTrue(v.size() == 2);
- Assert.assertEquals(STRING_1, v.get(0));
- Assert.assertEquals(STRING_2, v.get(1));
- }
-
- @Test
- public void testEncodingInteger() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCAttributeTranscoder.PROP_ASINTEGER, true);
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> stringAttributeValues = new ArrayList<>();
- stringAttributeValues.add(new StringAttributeValue(STRING_1));
- stringAttributeValues.add(new StringAttributeValue("2"));
- inputAttribute.setValues(stringAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
-
- Assert.assertEquals(2, object.get(ATTR_NAME));
- }
-
- @Test
- public void testEncodingBoolean() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCAttributeTranscoder.PROP_ASBOOLEAN, true);
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> stringAttributeValues = new ArrayList<>();
- stringAttributeValues.add(new StringAttributeValue("true"));
- stringAttributeValues.add(new StringAttributeValue("2"));
- inputAttribute.setValues(stringAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
-
- Assert.assertTrue((Boolean) object.get(ATTR_NAME));
- }
-
- @Test
- public void testEncodingJSONObject() throws ComponentInitializationException, AttributeEncodingException {
-
- ruleset.put(OIDCStringAttributeTranscoder.PROP_ASOBJECT, true);
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> stringAttributeValues = new ArrayList<>();
- stringAttributeValues.add(new StringAttributeValue("{ \"name\":\"John\", \"age\":30, \"car\":null }"));
- inputAttribute.setValues(stringAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- final JSONObject object = TranscoderSupport.<JSONObject>getTranscoder(tr).encode(
- null, inputAttribute, JSONObject.class, tr);
-
- final JSONObject v = (JSONObject) object.get(ATTR_NAME);
-
- Assert.assertEquals("John", v.get("name"));
- Assert.assertEquals(30, v.get("age"));
- Assert.assertTrue(v.containsKey("car"));
- }
-
- @Test(expectedExceptions=AttributeEncodingException.class)
- public void testEncodingWrongType() throws ComponentInitializationException, AttributeEncodingException {
-
- registry.setTranscoderRegistry(Collections.singletonList(new TranscodingRule(ruleset)));
- registry.setApplicationContext(new MockApplicationContext());
- registry.initialize();
-
- final IdPAttribute inputAttribute = new IdPAttribute(ATTR_ID);
- final List<IdPAttributeValue> byteAttributeValues = new ArrayList<>();
- final byte[] bytes = new byte[1];
- bytes[0] = 0;
- byteAttributeValues.add(new ByteAttributeValue(bytes));
- inputAttribute.setValues(byteAttributeValues);
-
- final Collection<TranscodingRule> rulesets = registry.getTranscodingRules(inputAttribute, JSONObject.class);
- Assert.assertEquals(rulesets.size(), 1);
- final TranscodingRule tr = rulesets.iterator().next();
-
- TranscoderSupport.<JSONObject>getTranscoder(tr).encode(null, inputAttribute, JSONObject.class, tr);
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
deleted file mode 100644
index 4da5503a..00000000
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.profile.spring.relyingparty.metadata.impl;
-
-import java.io.IOException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import net.shibboleth.ext.spring.service.ReloadableSpringService;
-import net.shibboleth.idp.profile.impl.ReloadServiceConfiguration;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.oidc.metadata.ClientInformationResolver;
-import net.shibboleth.oidc.metadata.RelyingPartyClientInformationProvider;
-import net.shibboleth.oidc.metadata.impl.ChainingClientInformationResolver;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-
-/**
- * Unit tests for {@link ClientInformationResolverServiceStrategy}.
- *
- * Mostly based on <pre>net.shibboleth.idp.profile.spring.relyingparty.metadata.ReloadServiceConfigurationTest</pre>.
- */
-public class ReloadClientResolverServiceConfigurationTest {
-
- /** The service. */
- private ReloadableSpringService<ClientInformationResolver> service;
-
- private RequestContext src;
-
- private List<Resource> oneResolver;
-
- private List<Resource> twoResolvers;
-
- @BeforeClass public void setup() throws IOException, ComponentInitializationException {
- oneResolver = new ArrayList<>();
- oneResolver.add(new ClassPathResource("/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers.xml"));
-
- twoResolvers = new ArrayList<>();
- twoResolvers.add(new ClassPathResource("/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers2.xml"));
- }
-
- public void setupResolver(final List<Resource> serviceLocations) throws ComponentInitializationException {
- service = new ReloadableSpringService<>(ClientInformationResolver.class, new ClientInformationResolverServiceStrategy());
- service.setFailFast(true);
- service.setId("mockId");
-
- service.setServiceConfigurations(serviceLocations);
- service.initialize();
- }
-
- @BeforeMethod public void setUpAction() throws ComponentInitializationException {
- src = new RequestContextBuilder().buildRequestContext();
- }
-
- @Test public void oneResource() throws ComponentInitializationException {
- setupResolver(oneResolver);
- final Instant time = service.getLastReloadAttemptInstant();
- service.reload();
- Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
- final ServiceableComponent<ClientInformationResolver> component = service.getServiceableComponent();
- final ClientInformationResolver resolver = component.getComponent();
- component.unpinComponent();
- Assert.assertEquals(getChainSize(resolver), 1);
- }
-
- protected int getChainSize(final ClientInformationResolver resolver) {
- Assert.assertTrue(resolver instanceof RelyingPartyClientInformationProvider);
- final RelyingPartyClientInformationProvider rpProvider = (RelyingPartyClientInformationProvider) resolver;
- final ClientInformationResolver embedded = rpProvider.getEmbeddedResolver();
- Assert.assertTrue(embedded instanceof ChainingClientInformationResolver);
- final ChainingClientInformationResolver chain = (ChainingClientInformationResolver) embedded;
- return chain.getResolvers().size();
- }
-
- @Test public void twoResources() throws ComponentInitializationException {
- setupResolver(twoResolvers);
- final Instant time = service.getLastReloadAttemptInstant();
- service.reload();
- Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
- final ServiceableComponent<ClientInformationResolver> component = service.getServiceableComponent();
- final ClientInformationResolver resolver = component.getComponent();
- component.unpinComponent();
- Assert.assertEquals(getChainSize(resolver), 2);
- }
-
- @Test(expectedExceptions = ComponentInitializationException.class) public void noResources()
- throws ComponentInitializationException {
- setupResolver(new ArrayList<Resource>());
- }
-
- @Test public void serviceAction() throws ComponentInitializationException {
- setupResolver(oneResolver);
- final Instant time = service.getLastReloadAttemptInstant();
-
- final MockHttpServletResponse response = new MockHttpServletResponse();
-
- final ReloadServiceConfiguration action = initializeAction(service, response);
- final Event event = action.execute(src);
- service.getServiceableComponent().unpinComponent();
- ActionTestingSupport.assertProceedEvent(event);
-
- Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
- Assert.assertEquals(response.getStatus(), HttpServletResponse.SC_OK);
- }
-
- protected static ReloadServiceConfiguration initializeAction(final ReloadableService<?> reloadableService,
- final HttpServletResponse response) throws ComponentInitializationException {
- final ReloadServiceConfiguration action = new ReloadServiceConfiguration();
- action.setHttpServletResponse(response);
- action.setServiceLookupStrategy(new Function<ProfileRequestContext,ReloadableService<?>>() {
- public ReloadableService<?> apply(ProfileRequestContext input) {
- return reloadableService;
- }
- });
- action.initialize();
- return action;
- }
-
- @AfterClass public void teardown() {
- ComponentSupport.destroy(service);
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/global.xml b/idp-oidc-extension-impl/src/test/resources/conf/global.xml
index a4e01ff1..bd724ebd 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/global.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/global.xml
@@ -17,7 +17,7 @@
<import resource="global-oidc.xml" />
<bean id="exampleMetadata-saml-oidc-clientsecret" class="org.springframework.core.io.ClassPathResource">
- <constructor-arg value="/org/geant/idpextension/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml"/>
+ <constructor-arg value="/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml"/>
</bean>
<util:set id="testbed.MetadataIndexes">
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties b/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties
index 44919f18..6cad6a9d 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties
+++ b/idp-oidc-extension-impl/src/test/resources/conf/oidc.properties
@@ -6,4 +6,4 @@ idp.oidc.subject.sourceAttribute = uid
idp.oidc.subject.salt = isfd07fsddfs70sdf9d99s8
idp.oidc.discovery.template = src/test/resources/conf/openid-configuration.json
-idp.oidc.metadata.clientSecretProperties = classpath:/org/geant/idpextension/oidc/metadata/impl/client-secret-test.properties
\ No newline at end of file
+idp.oidc.metadata.clientSecretProperties = classpath:/net/shibboleth/idp/oidc/metadata/impl/client-secret-test.properties
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/resources/logback-test.xml b/idp-oidc-extension-impl/src/test/resources/logback-test.xml
index 17ac91f3..494a6712 100644
--- a/idp-oidc-extension-impl/src/test/resources/logback-test.xml
+++ b/idp-oidc-extension-impl/src/test/resources/logback-test.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
- <logger name="org.geant" level="TRACE"/>
+ <logger name="net.shibboleth.idp.oidc" level="TRACE"/>
+ <logger name="net.shibboleth.idp.oauth2" level="TRACE"/>
<logger name="net.shibboleth" level="DEBUG"/>
<logger name="org.springframework" level="DEBUG"/>
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
index 7aed41dd..02c898da 100644
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
@@ -28,12 +28,12 @@
<!-- Necessary for encoder parsing to function, normally part of registry wiring. -->
<bean id="OIDCByteTranscoder"
- class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
+ class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
<bean id="OIDCStringTranscoder"
- class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder" />
+ class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder" />
<bean id="OIDCScopedStringTranscoder"
- class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
+ class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
</beans>
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/attribute/filter/matcher/requestedClaims.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/attribute/filter/matcher/requestedClaims.xml
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/decoding/impl/client-registration-request.json b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/decoding/impl/client-registration-request.json
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/decoding/impl/client-registration-request.json
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/decoding/impl/client-registration-request.json
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/client-secret-test.properties b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/client-secret-test.properties
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/client-secret-test.properties
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/client-secret-test.properties
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/dyn-value1.json b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/dyn-value1.json
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/dyn-value1.json
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/dyn-value1.json
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/dyn-value2.json b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/dyn-value2.json
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/dyn-value2.json
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/dyn-value2.json
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/idp-signing-rs256.jwk b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/idp-signing-rs256.jwk
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/idp-signing-rs256.jwk
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/idp-signing-rs256.jwk
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-client.json b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-client.json
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-client.json
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-client.json
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-client2.json b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-client2.json
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-client2.json
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-client2.json
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-clients.json b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-clients.json
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-clients.json
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-clients.json
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-metadata-providers.xml
similarity index 86%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers.xml
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-metadata-providers.xml
index 8df9e63c..15b54ce4 100644
--- a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-metadata-providers.xml
@@ -25,14 +25,14 @@
p:resolvers-ref="shibboleth.oidc.ClientInformationResolvers"/>
<bean id="shibboleth.oidc.ServiceableProviderMetadataProvider"
- class="org.geant.idpextension.oidc.metadata.resolver.ServiceableProviderMetadataProvider"
+ class="net.shibboleth.idp.plugin.oidc.op.metadata.resolver.ServiceableProviderMetadataProvider"
p:embeddedResolver-ref="shibboleth.oidc.OwnProviderMetadataResolver"
p:id="ServiceableProviderMetadataProvider">
</bean>
<bean id="shibboleth.oidc.OwnProviderMetadataResolver"
- class="org.geant.idpextension.oidc.metadata.impl.FilesystemProviderMetadataResolver"
- p:id="OwnMetadata" c:metadata="/org/geant/idpextension/oidc/metadata/impl/openid-configuration.json" />
+ class="net.shibboleth.idp.plugin.oidc.op.metadata.impl.FilesystemProviderMetadataResolver"
+ p:id="OwnMetadata" c:metadata="/net/shibboleth/idp/oidc/metadata/impl/openid-configuration.json" />
<!-- Generic beans end, in most cases only edit after this line. -->
@@ -46,7 +46,7 @@
<bean id="ExampleFileResolver"
class="net.shibboleth.oidc.metadata.impl.FilesystemClientInformationResolver" p:id="ExampleFileResolver1"
- c:metadata="/org/geant/idpextension/oidc/metadata/impl/oidc-client.json" />
+ c:metadata="/net/shibboleth/idp/oidc/metadata/impl/oidc-client.json" />
</beans>
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers2.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-metadata-providers2.xml
similarity index 94%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers2.xml
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-metadata-providers2.xml
index ed8e451a..09742691 100644
--- a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers2.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/oidc-metadata-providers2.xml
@@ -51,11 +51,11 @@
<bean id="ExampleFileResolver"
class="net.shibboleth.oidc.metadata.impl.FilesystemClientInformationResolver" p:id="ExampleFileResolver1"
- c:metadata="/org/geant/idpextension/oidc/metadata/impl/oidc-client.json"/>
+ c:metadata="/net/shibboleth/idp/oidc/metadata/impl/oidc-client.json"/>
<bean id="ExampleFileResolver2"
class="net.shibboleth.oidc.metadata.impl.FilesystemClientInformationResolver" p:id="ExampleFileResolver2"
- c:metadata="/org/geant/idpextension/oidc/metadata/impl/oidc-client2.json"/>
+ c:metadata="/net/shibboleth/idp/oidc/metadata/impl/oidc-client2.json"/>
</beans>
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/openid-configuration.json b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/openid-configuration.json
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/openid-configuration.json
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/openid-configuration.json
diff --git a/idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/public_keys.jwks b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/public_keys.jwks
similarity index 100%
rename from idp-oidc-extension-impl/src/test/resources/org/geant/idpextension/oidc/metadata/impl/public_keys.jwks
rename to idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/public_keys.jwks
diff --git a/pom.xml b/pom.xml
index 6a2c9c33..8d8d0952 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,15 +7,15 @@
<artifactId>idp-parent</artifactId>
<version>4.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.geant</groupId>
- <artifactId>idp-oidc-extension-parent</artifactId>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>idp-plugin-oidc-op-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<shib.idp.version>4.1.0-SNAPSHOT</shib.idp.version>
<opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
<oidc-common.version>0.0.1-SNAPSHOT</oidc-common.version>
- <checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
+ <checkstyle.configLocation>${project.basedir}/resources/checkstyle.xml</checkstyle.configLocation>
</properties>
<repositories>
<repository>
@@ -60,9 +60,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.geant</groupId>
+ <groupId>net.shibboleth.oidc</groupId>
<version>${project.version}</version>
- <artifactId>idp-oidc-extension-api</artifactId>
+ <artifactId>idp-plugin-oidc-op-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -74,6 +74,16 @@
<artifactId>json-smart</artifactId>
<version>2.3</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-attribute-api</artifactId>
+ <version>${oidc-common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-attribute-impl</artifactId>
+ <version>${oidc-common.version}</version>
+ </dependency>
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-saml-api</artifactId>
@@ -203,9 +213,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.geant</groupId>
+ <groupId>net.shibboleth.oidc</groupId>
<version>${project.version}</version>
- <artifactId>idp-oidc-extension-api</artifactId>
+ <artifactId>idp-plugin-oidc-op-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index a301030c..50f94908 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -107,11 +107,10 @@
<module name="FileLength">
<property name="max" value="1000"/>
</module>
- <!--
<module name="Header">
<property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development,\n * Inc. (UCAID) under one or more contributor license agreements. See the\n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache\n * License, Version 2.0 (the "License"); you may not use this file except in\n * compliance with the License. You may obtain a cop [...]
+ <property name="fileExtensions" value="java"/>
</module>
- -->
<module name="JavadocPackage"/>
<module name="LineLength">
<property name="max" value="120"/>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list