X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FBlacklistMetadataFilter.cpp;h=8606f14b233b15bc3af7bc77c3c85206ff2f2a29;hp=f74ec808a432bb0d5578aa5db518a4152016bac0;hb=338f0d4f07bf8390f29776f434eadcf6b6c5bc46;hpb=01fe9dc618b7e57645b71a23757657102e9ac380

diff --git a/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp b/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
index f74ec80..8606f14 100644
--- a/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,12 @@
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataFilter.h"
 
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
 #include <xmltooling/util/NDC.h>
 
 using namespace opensaml::saml2md;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
@@ -50,19 +50,10 @@ namespace opensaml {
             bool found(const XMLCh* id) const {
                 if (!id)
                     return false;
-#ifdef HAVE_GOOD_STL
                 return m_set.count(id)==1;
-#else
-                auto_ptr_char id2(id);
-                return m_set.count(id2.get())==1;
-#endif
             }
 
-#ifdef HAVE_GOOD_STL
             set<xstring> m_set;
-#else
-            set<string> m_set;
-#endif
         }; 
 
         MetadataFilter* SAML_DLLLOCAL BlacklistMetadataFilterFactory(const DOMElement* const & e)
@@ -80,12 +71,7 @@ BlacklistMetadataFilter::BlacklistMetadataFilter(const DOMElement* e)
     e = XMLHelper::getFirstChildElement(e);
     while (e) {
         if (XMLString::equals(e->getLocalName(), Exclude) && e->hasChildNodes()) {
-#ifdef HAVE_GOOD_STL
             m_set.insert(e->getFirstChild()->getNodeValue());
-#else
-            auto_ptr_char id(e->getFirstChild()->getNodeValue());
-            m_set.insert(id.get());
-#endif
         }
         e = XMLHelper::getNextSiblingElement(e);
     }
@@ -121,7 +107,7 @@ void BlacklistMetadataFilter::doFilter(XMLObject& xmlObject) const
 
 void BlacklistMetadataFilter::doFilter(EntitiesDescriptor& entities) const
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".Metadata");
+    Category& log=Category::getInstance(SAML_LOGCAT".MetadataFilter.Blacklist");
     
     VectorOf(EntityDescriptor) v=entities.getEntityDescriptors();
     for (VectorOf(EntityDescriptor)::size_type i=0; i<v.size(); ) {