[java-idp-oidc] branch main updated: JOIDC-135 - Enable OP flow inheritance by other plugins

[Henri Mikkonen]

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=3581559dd4efe088bae091d38da657f08fae6a09

The following commit(s) were added to refs/heads/main by this push:
     new 3581559d JOIDC-135 - Enable OP flow inheritance by other plugins
3581559d is described below

commit 3581559dd4efe088bae091d38da657f08fae6a09
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Nov 22 09:28:49 2022 +0200

    JOIDC-135 - Enable OP flow inheritance by other plugins
    
    https://shibboleth.atlassian.net/browse/JOIDC-135
---
 .../issue-registration-access-token-flow.xml                        | 2 +-
 .../flows/oidc/abstract-api-info/oidc-abstract-api-info-flow.xml    | 4 ++--
 .../idp/flows/oidc/abstract-api/oidc-abstract-api-flow.xml          | 4 ++--
 .../net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-flow.xml   | 2 +-
 .../idp/flows/oidc/consent-lookup/consent-lookup-flow.xml           | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml
index f0a99342..52800437 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-flow.xml
@@ -47,6 +47,6 @@
     </end-state>
 
     <bean-import resource="issue-registration-access-token-beans.xml" />
-    <bean-import resource="../../../oidc/abstract/oidc-abstract-beans.xml" />
+    <bean-import resource="classpath:/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml" />
 
 </flow>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-flow.xml
index 102048ab..d02e715f 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-flow.xml
@@ -26,6 +26,6 @@
         <transition on="proceed" to="PopulateOutboundInterceptContext" />
     </subflow-state>
 
-    <bean-import resource="../abstract-api-info/oidc-abstract-api-info-beans.xml" />
+    <bean-import resource="classpath:/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-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/abstract-api/oidc-abstract-api-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api/oidc-abstract-api-flow.xml
index 7a24816f..b313bf5a 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api/oidc-abstract-api-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api/oidc-abstract-api-flow.xml
@@ -42,6 +42,6 @@
         <transition on="proceed" to="CommitResponse" />
     </action-state>
 
-    <bean-import resource="../../oidc/abstract-api/oidc-abstract-api-beans.xml" />
+    <bean-import resource="classpath:/META-INF/net/shibboleth/idp/flows/oidc/abstract-api/oidc-abstract-api-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/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 07478cf5..18256638 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
@@ -55,6 +55,6 @@
     </global-transitions>
 
     <!-- The file really exists in this directory, but it's referenced from extending flow-directories -->
-    <bean-import resource="../../oidc/abstract/oidc-abstract-beans.xml" />
+    <bean-import resource="classpath:/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml" />
 
 </flow>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/consent-lookup/consent-lookup-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/consent-lookup/consent-lookup-flow.xml
index ecfb9fcf..88c6c84f 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/consent-lookup/consent-lookup-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/consent-lookup/consent-lookup-flow.xml
@@ -24,6 +24,6 @@
         <transition on="proceed" to="BuildResponse"/>
     </subflow-state>
     
-    <bean-import resource="../../oidc/consent-lookup/consent-lookup-beans.xml" />
-        
-</flow>
\ No newline at end of file
+    <bean-import resource="classpath:/META-INF/net/shibboleth/idp/flows/oidc/consent-lookup/consent-lookup-beans.xml" />
+
+</flow>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.