svn commit: r579661 - /lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/ShibbolethModuleImpl.java

Author: andreas
Date: Wed Sep 26 07:18:17 2007
New Revision: 579661

URL: http://svn.apache.org/viewvc?rev=579661&view=rev
Log:
Convert destroy() to dispose() to meet Avalon standards

Modified:
    lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/ShibbolethModuleImpl.java

Modified: lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/ShibbolethModuleImpl.java
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/ShibbolethModuleImpl.java?rev=579661&r1=579660&r2=579661&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/ShibbolethModuleImpl.java (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/ShibbolethModuleImpl.java Wed Sep 26 07:18:17 2007
@@ -19,6 +19,7 @@
 
 import java.io.File;
 
+import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
@@ -58,7 +59,7 @@
  * 
  */
 public class ShibbolethModuleImpl extends AbstractLogEnabled implements ShibbolethModule,
-        Configurable, Initializable, Serviceable, ThreadSafe {
+        Configurable, Initializable, Serviceable, ThreadSafe, Disposable {
 
     private static final String WAYF_SERVER = "WayfServer";
     private static final String CONF_PROVIDER_ID = "ProviderId";
@@ -174,10 +175,7 @@
         }
     }
 
-    /**
-     * @see org.olat.core.configuration.OLATModule#destroy()
-     */
-    public void destroy() {
+    public void dispose() {
         if (metadata != null && metadata.isAlive()) {
             metadata.interrupt();
         }