[java-idp-oidc] branch master updated: JOIDC-2 - Move flow definitions into jar
Scott Cantor
cantor.2 at osu.edu
Tue Jan 14 13:37:15 EST 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=5dac8b2c0b69d08d99749a61271a8eed246fa81f
The following commit(s) were added to refs/heads/master by this push:
new 5dac8b2 JOIDC-2 - Move flow definitions into jar
5dac8b2 is described below
commit 5dac8b2c0b69d08d99749a61271a8eed246fa81f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 14 13:37:11 2020 -0500
JOIDC-2 - Move flow definitions into jar
https://issues.shibboleth.net/jira/browse/JOIDC-2
---
.../idp}/flows/oauth2/introspection/introspection-beans.xml | 0
.../idp}/flows/oauth2/introspection/introspection-flow.xml | 0
.../idp}/flows/oauth2/revocation/revocation-beans.xml | 0
.../idp}/flows/oauth2/revocation/revocation-flow.xml | 0
.../oidc/abstract-api-info/oidc-abstract-api-info-beans.xml | 0
.../oidc/abstract-api-info/oidc-abstract-api-info-flow.xml | 0
.../idp}/flows/oidc/abstract-api/oidc-abstract-api-beans.xml | 0
.../idp}/flows/oidc/abstract-api/oidc-abstract-api-flow.xml | 0
.../idp}/flows/oidc/abstract/oidc-abstract-beans.xml | 10 ++++------
.../shibboleth/idp}/flows/oidc/abstract/oidc-abstract-flow.xml | 0
.../shibboleth/idp}/flows/oidc/authorize/authorize-beans.xml | 0
.../shibboleth/idp}/flows/oidc/authorize/authorize-flow.xml | 0
.../shibboleth/idp}/flows/oidc/discovery/discovery-beans.xml | 0
.../shibboleth/idp}/flows/oidc/discovery/discovery-flow.xml | 0
.../net/shibboleth/idp}/flows/oidc/keyset/keyset-beans.xml | 0
.../net/shibboleth/idp}/flows/oidc/keyset/keyset-flow.xml | 0
.../net/shibboleth/idp}/flows/oidc/register/register-beans.xml | 0
.../net/shibboleth/idp}/flows/oidc/register/register-flow.xml | 0
.../net/shibboleth/idp}/flows/oidc/token/token-beans.xml | 0
.../net/shibboleth/idp}/flows/oidc/token/token-flow.xml | 0
.../net/shibboleth/idp}/flows/oidc/userinfo/token-beans.xml | 0
.../net/shibboleth/idp}/flows/oidc/userinfo/token-flow.xml | 0
.../shibboleth/idp}/flows/oidc/webfinger/webfinger-beans.xml | 0
.../shibboleth/idp}/flows/oidc/webfinger/webfinger-flow.xml | 0
24 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oauth2/introspection/introspection-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oauth2/introspection/introspection-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oauth2/introspection/introspection-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oauth2/revocation/revocation-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oauth2/revocation/revocation-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oauth2/revocation/revocation-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api-info/oidc-abstract-api-info-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api/oidc-abstract-api-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api/oidc-abstract-api-beans.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api/oidc-abstract-api-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api/oidc-abstract-api-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract-api/oidc-abstract-api-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api/oidc-abstract-api-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 98%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract/oidc-abstract-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
index b5dc648..61e30e7 100644
--- a/idp-oidc-extension-impl/src/main/resources/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
@@ -7,15 +7,13 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
- <!-- Declares audit field extractor functions injected into beans that populate the audit context. -->
- <import resource="../../../system/conf/audit-system.xml" />
-
- <!-- Import core common beans. -->
- <import resource="../../../system/flows/saml/security-beans.xml" />
-
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer" p:placeholderPrefix="%{"
p:placeholderSuffix="}" />
+ <!-- Declares audit field extractor functions injected into beans that populate the audit context. -->
+ <!-- This is questionable, we should look at isolating exactly what really needs to be imported. -->
+ <import resource="${idp.home}/system/conf/audit-system.xml" />
+
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/abstract/oidc-abstract-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/authorize/authorize-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/authorize/authorize-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/authorize/authorize-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/discovery/discovery-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/discovery/discovery-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/discovery/discovery-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/keyset/keyset-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/keyset/keyset-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/keyset/keyset-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/register/register-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/register/register-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/register/register-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/token/token-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/token/token-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/token/token-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/userinfo/token-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/userinfo/token-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/userinfo/token-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-flow.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/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
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/webfinger/webfinger-beans.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml
diff --git a/idp-oidc-extension-impl/src/main/resources/flows/oidc/webfinger/webfinger-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-flow.xml
similarity index 100%
rename from idp-oidc-extension-impl/src/main/resources/flows/oidc/webfinger/webfinger-flow.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-flow.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list