Next integration phase, metadata and trust conversion.

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

diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index 90bd9c2..d92bdca 100644 (file)
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -24,6 +24,8 @@
 #include "internal.h"
 #include "exceptions.h"
 #include "ListenerService.h"
+#include "MetadataExt.h"
+#include "PKIXTrustEngine.h"
 #include "SPConfig.h"
 
 #include <log4cpp/Category.hh>
@@ -72,8 +74,11 @@ bool SPInternalConfig::init(const char* catalog_path)
         loglevel = SHIBSP_LOGGING;
     XMLToolingConfig::getConfig().log_config(loglevel);
 
-    if (catalog_path)
-        XMLToolingConfig::getConfig().catalog_path = catalog_path;
+    if (!catalog_path)
+        catalog_path = getenv("SHIBSP_SCHEMAS");
+    if (!catalog_path)
+        catalog_path = SHIBSP_SCHEMAS;
+    XMLToolingConfig::getConfig().catalog_path = catalog_path;
 
     if (!SAMLConfig::getConfig().init()) {
         log.fatal("failed to initialize OpenSAML library");
@@ -87,6 +92,8 @@ bool SPInternalConfig::init(const char* catalog_path)
     REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ListenerException,shibsp);
     
     registerListenerServices();
+    registerMetadataExtClasses();
+    registerPKIXTrustEngine();
 
     log.info("library initialization complete");
     return true;