[java-idp-plugin-totp] branch main updated: Move config import to flow beans file.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-idp-plugin-totp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=6eaad92f15318c687bdcd27d0a26c220a7818751

The following commit(s) were added to refs/heads/main by this push:
       new  6eaad92   Move config import to flow beans file.
6eaad92 is described below

commit 6eaad92f15318c687bdcd27d0a26c220a7818751
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Aug 27 18:42:59 2020 -0400

    Move config import to flow beans file.
---
 .../net/shibboleth/idp/flows/authn/TOTP/TOTP-authenticator.xml       | 5 -----
 .../META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml      | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-authenticator.xml b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-authenticator.xml
index 29454ea..3483ab0 100644
--- a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-authenticator.xml
+++ b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-authenticator.xml
@@ -11,15 +11,10 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-       
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
-    <import resource="conditional:%{idp.home}/conf/authn/totp-authn-config.xml" />
-
     <bean id="DefaultAuthenticator" class="net.shibboleth.idp.plugin.totp.impl.GoogleTOTPAuthenticator" lazy-init="true" />
 
 </beans>
diff --git a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
index b2afcbd..342463d 100644
--- a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
+++ b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
@@ -18,6 +18,8 @@
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
+    <import resource="conditional:%{idp.home}/conf/authn/totp-authn-config.xml" />
+
     <import resource="TOTP-authenticator.xml" />
 
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"

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