From f1bda358410f56dd2e1ec0cee0704257075b4d18 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 5 Jul 2007 21:28:02 +0000
Subject: [PATCH] Hack around namespaces for built-in properties.

---
 .cdtproject => .cproject                         | 29 +++++++++++++++---------
 saml/saml1/binding/impl/SAML1POSTEncoder.cpp     |  4 ++--
 saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp |  6 ++---
 saml/saml2/binding/impl/SAML2POSTEncoder.cpp     |  4 ++--
 4 files changed, 25 insertions(+), 18 deletions(-)
 rename .cdtproject => .cproject (87%)

diff --git a/.cdtproject b/.cproject
similarity index 87%
rename from .cdtproject
rename to .cproject
index 7053798..af0d7b1 100644
--- a/.cdtproject
+++ b/.cproject
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
+<?fileVersion 4.0.0?>
 
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.nullindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<data>
-<item id="scannerConfiguration">
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="converted.config.2133715230">
+<storageModule moduleId="scannerConfiguration">
 <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
 <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
 <buildOutputProvider>
@@ -47,8 +46,8 @@
 <parser enabled="false"/>
 </scannerInfoProvider>
 </profile>
-</item>
-<item id="org.eclipse.cdt.core.pathentry">
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.pathentry">
 <pathentry kind="out" path=""/>
 <pathentry kind="out" path="debug"/>
 <pathentry kind="out" path="saml/Debug"/>
@@ -91,6 +90,14 @@
 <pathentry include="C:/log4cpp-0.3.5rc1/include" kind="inc" path="" system="true"/>
 <pathentry include="C:/cxxtest" kind="inc" path="" system="true"/>
 <pathentry kind="src" path="samltest/encryption"/>
-</item>
-</data>
-</cdtproject>
+</storageModule>
+<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.2133715230" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.nullindexer" point="org.eclipse.cdt.core.CIndexer"/>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+</extensions>
+</storageModule>
+</cconfiguration>
+</storageModule>
+</cproject>
diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
index a99bc74..f56ac58 100644
--- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
@@ -78,8 +78,8 @@ static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e);
 SAML1POSTEncoder::SAML1POSTEncoder(const DOMElement* e)
 {
     if (e) {
-        auto_ptr_char t(e->getAttributeNS(NULL, _template));
-        if (t.get())
+        auto_ptr_char t(e->getAttribute(_template));
+        if (t.get() && *t.get())
             m_template = t.get();
     }
     if (m_template.empty())
diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
index 49c424f..797b58d 100644
--- a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
@@ -82,11 +82,11 @@ namespace opensaml {
 SAML2ArtifactEncoder::SAML2ArtifactEncoder(const DOMElement* e) : m_post(false)
 {
     if (e) {
-        const XMLCh* flag = e->getAttributeNS(NULL, postArtifact);
+        const XMLCh* flag = e->getAttribute(postArtifact);
         m_post = (flag && (*flag==chLatin_t || *flag==chDigit_1));
         if (m_post) {
-            auto_ptr_char t(e->getAttributeNS(NULL, _template));
-            if (t.get())
+            auto_ptr_char t(e->getAttribute(_template));
+            if (t.get() && *t.get())
                 m_template = t.get();
         }
     }
diff --git a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
index add0e2e..2e45daf 100644
--- a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
@@ -83,8 +83,8 @@ static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e);
 SAML2POSTEncoder::SAML2POSTEncoder(const DOMElement* e, bool simple) : m_simple(simple)
 {
     if (e) {
-        auto_ptr_char t(e->getAttributeNS(NULL, _template));
-        if (t.get())
+        auto_ptr_char t(e->getAttribute(_template));
+        if (t.get() && *t.get())
             m_template = t.get();
     }
     if (m_template.empty())
-- 
2.1.4