[java-identity-provider] 02/02: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Mon Aug 3 14:05:43 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
https://codeberg.org/Shibboleth/java-identity-provider/commit/647308e4853dfa022d3cce95f55f54c8263721ab
commit 647308e4853dfa022d3cce95f55f54c8263721ab
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Aug 1 13:47:26 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Remove all default-destroy-method='destroy' from the all the modules (customer visible) files
---
.../main/resources/net/shibboleth/idp/module/conf/access-control.xml | 4 +---
.../main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml | 4 +---
.../resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml | 4 +---
.../resources/net/shibboleth/idp/module/conf/attribute-registry.xml | 4 +---
.../net/shibboleth/idp/module/conf/attributes/default-rules.xml | 4 +---
.../resources/net/shibboleth/idp/module/conf/attributes/eduCourse.xml | 4 +---
.../resources/net/shibboleth/idp/module/conf/attributes/eduPerson.xml | 4 +---
.../net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml | 4 +---
.../net/shibboleth/idp/module/conf/attributes/samlSubject.xml | 4 +---
.../resources/net/shibboleth/idp/module/conf/attributes/schac.xml | 4 +---
.../src/main/resources/net/shibboleth/idp/module/conf/audit.xml | 4 +---
.../net/shibboleth/idp/module/conf/authn/authn-comparison.xml | 4 +---
.../net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml | 4 +---
.../net/shibboleth/idp/module/conf/authn/mfa-authn-config.xml | 4 +---
.../net/shibboleth/idp/module/conf/authn/password-authn-config.xml | 4 +---
.../net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml | 4 +---
.../resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.xml | 4 +---
.../main/resources/net/shibboleth/idp/module/conf/cas-protocol.xml | 3 +--
.../src/main/resources/net/shibboleth/idp/module/conf/credentials.xml | 4 +---
.../src/main/resources/net/shibboleth/idp/module/conf/errors.xml | 4 +---
.../src/main/resources/net/shibboleth/idp/module/conf/global.xml | 4 +---
.../shibboleth/idp/module/conf/intercept/consent-intercept-config.xml | 4 +---
.../idp/module/conf/intercept/context-check-intercept-config.xml | 4 +---
.../idp/module/conf/intercept/expiring-password-intercept-config.xml | 4 +---
.../shibboleth/idp/module/conf/intercept/warning-intercept-config.xml | 4 +---
.../main/resources/net/shibboleth/idp/module/conf/relying-party.xml | 4 +---
.../src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.xml | 4 +---
.../src/main/resources/net/shibboleth/idp/module/conf/services.xml | 4 +---
28 files changed, 28 insertions(+), 83 deletions(-)
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/access-control.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/access-control.xml
index 9ed4242ed..463f31c1c 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/access-control.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/access-control.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Map of access control policies used to limit access to administrative functions.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
index 7ac0735dc..1fc7a7ea4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
@@ -6,9 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Metrics enablement / activation. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
index fe876380e..8e5a62f53 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
@@ -6,9 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Attended restart unlock beans. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-registry.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
index 133930b5d..5f4250fb8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
The system comes preconfigured to load rules directly from resource files
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
index db8f1a1ee..04e9e019e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Default Attribute transcoding rules. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduCourse.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduCourse.xml
index b52ad8a93..4884936d2 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduCourse.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduCourse.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Note that all built-in rules rely on URI-naming and thus include the implied settings:
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduPerson.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduPerson.xml
index 4512a4cc2..5477fbba6 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduPerson.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduPerson.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Note that all built-in rules rely on URI-naming and thus include the implied settings:
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml
index 4475d064e..d2ec0b793 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Note that all built-in rules rely on URI-naming and thus include the implied settings:
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/samlSubject.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/samlSubject.xml
index a5787a937..f9a989423 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/samlSubject.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/samlSubject.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Note that all built-in Attribute rules rely on URI-naming and thus include the implied settings:
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/schac.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/schac.xml
index b7ed64d25..71a4ed838 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/schac.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/schac.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Note that all built-in rules rely on URI-naming and thus include the implied settings:
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/audit.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/audit.xml
index 3c9c408e7..ea47aa1a8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/audit.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/audit.xml
@@ -6,9 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
This bean defines a mapping between audit log categories and formatting strings.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-comparison.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-comparison.xml
index c3d62ba13..3c304ea94 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-comparison.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-comparison.xml
@@ -7,9 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
This is a map used to "weight" particular methods above others if the IdP has to randomly select one
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
index d499c7a3c..954ee30af 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/ipaddress-authn-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Apply any regular expression replacement pairs to address before validation. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/mfa-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/mfa-authn-config.xml
index 3bfbcbb52..ed6a18b31 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/mfa-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/mfa-authn-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
This is a map of transition rules that guide the behavior of the MFA flow
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
index dc10fa15c..0d33f0959 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Ordered list of CredentialValidators to apply to a request.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml
index b26c020c7..9e4d2d710 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Kerberos Service Principal(s) -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.xml
index 1b514774a..a15785f19 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- ========================= Java Subject -> Principal Mapping ========================= -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/cas-protocol.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/cas-protocol.xml
index fde431e47..ab65729b9 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/cas-protocol.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/cas-protocol.xml
@@ -7,8 +7,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
| The CAS service registry defines verified relying parties by endpoint URI.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/credentials.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/credentials.xml
index b40778d35..5a4139e4b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/credentials.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/credentials.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
This defines the signing and encryption key and certificate pairs referenced by your relying-party.xml
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/errors.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/errors.xml
index 8d629ab23..0e035bf40 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/errors.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/errors.xml
@@ -6,9 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<bean id="shibboleth.DefaultErrorView" class="java.lang.String" c:_0="%{idp.errors.defaultView:error}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/global.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/global.xml
index 0bfa7bcc6..8722fce84 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/global.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/global.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Use this file to define any custom beans needed globally. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/consent-intercept-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/consent-intercept-config.xml
index 1d5ecd7b0..403217dac 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/consent-intercept-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/consent-intercept-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- Terms of Use configuration -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/context-check-intercept-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/context-check-intercept-config.xml
index 007eaa9b3..41875b6e4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/context-check-intercept-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/context-check-intercept-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Condition to evaluate to interrupt SSO flows to check the state of the transaction before allowing.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/expiring-password-intercept-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/expiring-password-intercept-config.xml
index 83f95e3eb..73048007f 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/expiring-password-intercept-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/expiring-password-intercept-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Condition to evaluate to determine if expiring password view should be displayed, false means to notify.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/warning-intercept-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/warning-intercept-config.xml
index e078e5f86..30e687ef5 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/warning-intercept-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/warning-intercept-config.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
The map keys are the names of view templates to render if the condition evaluates to true.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/relying-party.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/relying-party.xml
index 26c6c177f..a9995925d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/relying-party.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/relying-party.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!--
Unverified RP configuration, defaults to no support for any profiles. Add <ref> elements to the list
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.xml
index 7d82cf520..2bc7d3800 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.xml
@@ -8,9 +8,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- ========================= SAML NameID Generation ========================= -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.xml
index 24e2b1e9f..8fb8f9f85 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.xml
@@ -5,9 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
+ default-init-method="initialize">
<!-- By default we look at resources whose names are derived from %{idp.home}. -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list