From cea613c89d3f3e028ade4fe3fc9763f6993b94b5 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 4 Apr 2006 15:48:23 +0000
Subject: [PATCH] Build errors with xmlsec off

---
 xmltooling/io/AbstractXMLObjectMarshaller.cpp | 4 +++-
 xmltooling/signature/impl/KeyInfoImpl.cpp     | 4 ++--
 xmltooling/util/ParserPool.cpp                | 3 ++-
 xmltoolingtest/KeyInfoTest.h                  | 2 ++
 xmltoolingtest/XMLObjectBaseTestCase.h        | 9 +++++----
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/xmltooling/io/AbstractXMLObjectMarshaller.cpp b/xmltooling/io/AbstractXMLObjectMarshaller.cpp
index a17476e..5dc6661 100644
--- a/xmltooling/io/AbstractXMLObjectMarshaller.cpp
+++ b/xmltooling/io/AbstractXMLObjectMarshaller.cpp
@@ -35,7 +35,9 @@
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <log4cpp/Category.hh>
 
-using namespace xmlsignature;
+#ifndef XMLTOOLING_NO_XMLSEC
+    using namespace xmlsignature;
+#endif
 using namespace xmltooling;
 using namespace log4cpp;
 using namespace std;
diff --git a/xmltooling/signature/impl/KeyInfoImpl.cpp b/xmltooling/signature/impl/KeyInfoImpl.cpp
index 58456ec..3186a98 100644
--- a/xmltooling/signature/impl/KeyInfoImpl.cpp
+++ b/xmltooling/signature/impl/KeyInfoImpl.cpp
@@ -652,8 +652,8 @@ namespace xmlsignature {
             
         KeyInfoImpl(const KeyInfoImpl& src)
                 : AbstractXMLObject(src),
-                    AbstractDOMCachingXMLObject(src),
                     AbstractSimpleElement(src),
+                    AbstractDOMCachingXMLObject(src),
                     AbstractValidatingXMLObject(src),
                     m_Id(XMLString::replicate(src.m_Id)) {
 
@@ -882,4 +882,4 @@ const XMLCh X509Certificate::LOCAL_NAME[] = {
     XCH(C), XCH(e), XCH(r), XCH(t), XCH(i), XCH(f), XCH(i), XCH(c), XCH(a), XCH(t), XCH(e), chNull
     };
 const XMLCh X509CRL::LOCAL_NAME[] = { XCH(X), XNUM(5), XNUM(0), XNUM(9), XCH(C), XCH(R), XCH(L), chNull };
-    
\ No newline at end of file
+
diff --git a/xmltooling/util/ParserPool.cpp b/xmltooling/util/ParserPool.cpp
index 838c044..1ce146e 100644
--- a/xmltooling/util/ParserPool.cpp
+++ b/xmltooling/util/ParserPool.cpp
@@ -233,7 +233,8 @@ DOMInputSource* ParserPool::resolveEntity(const XMLCh* const publicId, const XML
 #endif    
 
     // Shortcircuit the request.
-    log.warn("unauthorized entity request, blocking it");
+    auto_ptr_char sysId(systemId);
+    log.warn("unauthorized entity request (%s), blocking it", sysId.get() ? sysId.get() : "no systemId");
     static const XMLByte nullbuf[] = {0};
     return new Wrapper4InputSource(new MemBufInputSource(nullbuf,0,systemId));
 }
diff --git a/xmltoolingtest/KeyInfoTest.h b/xmltoolingtest/KeyInfoTest.h
index 0d742ba..06b208a 100644
--- a/xmltoolingtest/KeyInfoTest.h
+++ b/xmltoolingtest/KeyInfoTest.h
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <xmltooling/signature/KeyInfo.h>
 
+using namespace xmlsignature;
+
 class KeyInfoTest : public CxxTest::TestSuite {
 public:
     KeyInfoTest() {}
diff --git a/xmltoolingtest/XMLObjectBaseTestCase.h b/xmltoolingtest/XMLObjectBaseTestCase.h
index 7fe8100..34af4eb 100644
--- a/xmltoolingtest/XMLObjectBaseTestCase.h
+++ b/xmltoolingtest/XMLObjectBaseTestCase.h
@@ -24,15 +24,16 @@
 #include <xmltooling/io/AbstractXMLObjectUnmarshaller.h>
 #include <xmltooling/impl/AnyElement.h>
 #include <xmltooling/impl/UnknownElement.h>
-#ifndef XMLTOOLING_NO_XMLSEC
-    #include <xmltooling/signature/Signature.h>
-#endif
 #include <xmltooling/util/ParserPool.h>
 #include <xmltooling/util/XMLConstants.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xmltooling/util/XMLObjectChildrenList.h>
 
-using namespace xmlsignature;
+#ifndef XMLTOOLING_NO_XMLSEC
+    #include <xmltooling/signature/Signature.h>
+    using namespace xmlsignature;
+#endif
+
 using namespace xmltooling;
 using namespace std;
 
-- 
2.1.4