[java-identity-provider] 01/03: JSSH-71 Remove the impact of the DestructableComponent Interface

Codeberg noreply at shibboleth.net
Sat Aug 1 12:27:23 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/9f8fb8fe9cc6ed3814d9639100fd58211d01f63a

commit 9f8fb8fe9cc6ed3814d9639100fd58211d01f63a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 30 15:22:32 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 flows/admin directory
---
 .../resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml  | 3 +--
 .../main/resources/net/shibboleth/idp/flows/admin/dumpconfig-beans.xml | 3 +--
 .../src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml  | 3 +--
 .../main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml    | 3 +--
 .../main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml    | 3 +--
 .../main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml    | 3 +--
 .../resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml | 3 +--
 .../resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml  | 3 +--
 .../resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml    | 3 +--
 .../main/resources/net/shibboleth/idp/flows/admin/revocation-beans.xml | 3 +--
 .../src/main/resources/net/shibboleth/idp/flows/admin/status-beans.xml | 3 +--
 .../main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml    | 3 +--
 .../resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml     | 3 +--
 13 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
index 518748a9c..361a6e0d8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
@@ -9,8 +9,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="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/dumpconfig-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/dumpconfig-beans.xml
index fe6586374..da9fc1cc1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/dumpconfig-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/dumpconfig-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
index 9cfcad93a..2c96637dd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/hello" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
index 02e4918ed..455ff0a44 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/lockout-manager" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
index 201e8a364..77c705041 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
index d3e5202f2..a783e7306 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
index bd539ba61..44b96a94b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
index d53c07e53..0b13547c1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
index 2a8b3aa54..d28c3e935 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/revocation-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/revocation-beans.xml
index 9a28079b8..9b01bb060 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/revocation-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/revocation-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/revocation" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-beans.xml
index f87e00341..d1ce77fc1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/status" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
index c5b77ca8d..42ef985c5 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/storage" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
index a1c52b93a..a1f08d719 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
@@ -9,8 +9,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">
 
     <!-- Profile ID for flow. -->
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/unlock-keys" />

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

More information about the commits mailing list