Update copyright.

[shibboleth/cpp-sp.git] / shibsp / SPConfig.cpp

diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index a2ebfb4..737ff08 100644 (file)
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -1,6 +1,6 @@
 
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,15 +22,21 @@
  */
 
 #include "internal.h"
-#include "exceptions.h"
 #include "AccessControl.h"
+#include "exceptions.h"
+#include "Handler.h"
 #include "RequestMapper.h"
 #include "ServiceProvider.h"
+#include "SessionCache.h"
 #include "SPConfig.h"
 #include "metadata/MetadataExt.h"
 #include "remoting/ListenerService.h"
 #include "security/PKIXTrustEngine.h"
 
+#include "attribute/SimpleAttribute.h"
+#include "attribute/ScopedAttribute.h"
+#include "attribute/NameIDAttribute.h"
+
 #include <log4cpp/Category.hh>
 #include <saml/SAMLConfig.h>
 #include <xmltooling/util/NDC.h>
@@ -99,6 +105,7 @@ bool SPInternalConfig::init(const char* catalog_path)
     registerAccessControls();
     registerListenerServices();
     registerRequestMappers();
+    registerSessionCaches();
     registerServiceProviders();
 
     log.info("library initialization complete");
@@ -116,9 +123,15 @@ void SPInternalConfig::term()
     delete m_serviceProvider;
     m_serviceProvider = NULL;
     
+    SingleLogoutServiceManager.deregisterFactories();
+    SessionInitiatorManager.deregisterFactories();
+    SessionCacheManager.deregisterFactories();
     ServiceProviderManager.deregisterFactories();
     RequestMapperManager.deregisterFactories();
+    ManageNameIDServiceManager.deregisterFactories();
     ListenerServiceManager.deregisterFactories();
+    HandlerManager.deregisterFactories();
+    AssertionConsumerServiceManager.deregisterFactories();
     AccessControlManager.deregisterFactories();
 
     SAMLConfig::getConfig().term();