projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b7e3a0d
)
Stop defaulting in xercesc namespace.
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 18 Apr 2007 03:45:10 +0000
(
03:45
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 18 Apr 2007 03:45:10 +0000
(
03:45
+0000)
12 files changed:
saml/SAMLConfig.h
patch
|
blob
|
history
saml/binding/ArtifactMap.h
patch
|
blob
|
history
saml/binding/SecurityPolicy.h
patch
|
blob
|
history
saml/internal.h
patch
|
blob
|
history
saml/saml1/binding/SAML1SOAPClient.h
patch
|
blob
|
history
saml/saml2/binding/SAML2SOAPClient.h
patch
|
blob
|
history
saml/saml2/metadata/AbstractMetadataProvider.h
patch
|
blob
|
history
saml/saml2/metadata/ChainingMetadataProvider.h
patch
|
blob
|
history
saml/saml2/metadata/MetadataProvider.h
patch
|
blob
|
history
saml/saml2/metadata/ObservableMetadataProvider.h
patch
|
blob
|
history
samltest/data/binding/template.html
patch
|
blob
|
history
samltest/internal.h
patch
|
blob
|
history
diff --git
a/saml/SAMLConfig.h
b/saml/SAMLConfig.h
index
2d33cf7
..
1f926a2
100644
(file)
--- a/
saml/SAMLConfig.h
+++ b/
saml/SAMLConfig.h
@@
-146,22
+146,22
@@
namespace opensaml {
virtual std::string hashSHA1(const char* s, bool toHex=false)=0;
/** Manages factories for MessageDecoder plugins. */
virtual std::string hashSHA1(const char* s, bool toHex=false)=0;
/** Manages factories for MessageDecoder plugins. */
- xmltooling::PluginManager<MessageDecoder,const DOMElement*> MessageDecoderManager;
+ xmltooling::PluginManager<MessageDecoder,const
xercesc::
DOMElement*> MessageDecoderManager;
/** Manages factories for MessageEncoder plugins. */
/** Manages factories for MessageEncoder plugins. */
- xmltooling::PluginManager<MessageEncoder,const DOMElement*> MessageEncoderManager;
+ xmltooling::PluginManager<MessageEncoder,const
xercesc::
DOMElement*> MessageEncoderManager;
/** Manages factories for SAMLArtifact plugins. */
xmltooling::PluginManager<SAMLArtifact,const char*> SAMLArtifactManager;
/** Manages factories for SecurityPolicyRule plugins. */
/** Manages factories for SAMLArtifact plugins. */
xmltooling::PluginManager<SAMLArtifact,const char*> SAMLArtifactManager;
/** Manages factories for SecurityPolicyRule plugins. */
- xmltooling::PluginManager<SecurityPolicyRule,const DOMElement*> SecurityPolicyRuleManager;
+ xmltooling::PluginManager<SecurityPolicyRule,const
xercesc::
DOMElement*> SecurityPolicyRuleManager;
/** Manages factories for MetadataProvider plugins. */
/** Manages factories for MetadataProvider plugins. */
- xmltooling::PluginManager<saml2md::MetadataProvider,const DOMElement*> MetadataProviderManager;
+ xmltooling::PluginManager<saml2md::MetadataProvider,const
xercesc::
DOMElement*> MetadataProviderManager;
/** Manages factories for MetadataFilter plugins. */
/** Manages factories for MetadataFilter plugins. */
- xmltooling::PluginManager<saml2md::MetadataFilter,const DOMElement*> MetadataFilterManager;
+ xmltooling::PluginManager<saml2md::MetadataFilter,const
xercesc::
DOMElement*> MetadataFilterManager;
protected:
SAMLConfig() : m_artifactMap(NULL) {}
protected:
SAMLConfig() : m_artifactMap(NULL) {}
diff --git
a/saml/binding/ArtifactMap.h
b/saml/binding/ArtifactMap.h
index
36f533a
..
3e9b323
100644
(file)
--- a/
saml/binding/ArtifactMap.h
+++ b/
saml/binding/ArtifactMap.h
@@
-56,7
+56,7
@@
namespace opensaml {
* @param e root of a DOM with optional XML attributes for context and artifactTTL
* @param storage pointer to a StorageService, or NULL to keep map in memory
*/
* @param e root of a DOM with optional XML attributes for context and artifactTTL
* @param storage pointer to a StorageService, or NULL to keep map in memory
*/
- ArtifactMap(const DOMElement* e, xmltooling::StorageService* storage=NULL);
+ ArtifactMap(const
xercesc::
DOMElement* e, xmltooling::StorageService* storage=NULL);
virtual ~ArtifactMap();
virtual ~ArtifactMap();
diff --git
a/saml/binding/SecurityPolicy.h
b/saml/binding/SecurityPolicy.h
index
1c02ab8
..
cb451ab
100644
(file)
--- a/
saml/binding/SecurityPolicy.h
+++ b/
saml/binding/SecurityPolicy.h
@@
-277,8
+277,8
@@
namespace opensaml {
* @param id message identifier
*/
void setMessageID(const XMLCh* id) {
* @param id message identifier
*/
void setMessageID(const XMLCh* id) {
- XMLString::release(&m_messageID);
- m_messageID = XMLString::replicate(id);
+
xercesc::
XMLString::release(&m_messageID);
+ m_messageID =
xercesc::
XMLString::replicate(id);
}
/**
}
/**
diff --git
a/saml/internal.h
b/saml/internal.h
index
21df6fd
..
3999273
100644
(file)
--- a/
saml/internal.h
+++ b/
saml/internal.h
@@
-41,6
+41,8
@@
#include <limits.h>
#include <limits.h>
+using namespace xercesc;
+
// C99 defines LLONG_MIN, LLONG_MAX and ULLONG_MAX, but this part of
// C99 is not yet included into the C++ standard.
// GCC defines LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX.
// C99 defines LLONG_MIN, LLONG_MAX and ULLONG_MAX, but this part of
// C99 is not yet included into the C++ standard.
// GCC defines LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX.
diff --git
a/saml/saml1/binding/SAML1SOAPClient.h
b/saml/saml1/binding/SAML1SOAPClient.h
index
de2e9b7
..
4279f07
100644
(file)
--- a/
saml/saml1/binding/SAML1SOAPClient.h
+++ b/
saml/saml1/binding/SAML1SOAPClient.h
@@
-48,7
+48,7
@@
namespace opensaml {
}
virtual ~SAML1SOAPClient() {
}
virtual ~SAML1SOAPClient() {
- XMLString::release(&m_correlate);
+
xercesc::
XMLString::release(&m_correlate);
}
/**
}
/**
diff --git
a/saml/saml2/binding/SAML2SOAPClient.h
b/saml/saml2/binding/SAML2SOAPClient.h
index
eae1030
..
0bd7fc7
100644
(file)
--- a/
saml/saml2/binding/SAML2SOAPClient.h
+++ b/
saml/saml2/binding/SAML2SOAPClient.h
@@
-48,7
+48,7
@@
namespace opensaml {
}
virtual ~SAML2SOAPClient() {
}
virtual ~SAML2SOAPClient() {
- XMLString::release(&m_correlate);
+
xercesc::
XMLString::release(&m_correlate);
}
/**
}
/**
diff --git
a/saml/saml2/metadata/AbstractMetadataProvider.h
b/saml/saml2/metadata/AbstractMetadataProvider.h
index
db6427b
..
5373048
100644
(file)
--- a/
saml/saml2/metadata/AbstractMetadataProvider.h
+++ b/
saml/saml2/metadata/AbstractMetadataProvider.h
@@
-56,7
+56,7
@@
namespace opensaml {
*
* @param e DOM to supply configuration for provider
*/
*
* @param e DOM to supply configuration for provider
*/
- AbstractMetadataProvider(const DOMElement* e=NULL);
+ AbstractMetadataProvider(const
xercesc::
DOMElement* e=NULL);
public:
virtual ~AbstractMetadataProvider();
public:
virtual ~AbstractMetadataProvider();
diff --git
a/saml/saml2/metadata/ChainingMetadataProvider.h
b/saml/saml2/metadata/ChainingMetadataProvider.h
index
9d7f4a3
..
762987a
100644
(file)
--- a/
saml/saml2/metadata/ChainingMetadataProvider.h
+++ b/
saml/saml2/metadata/ChainingMetadataProvider.h
@@
-53,7
+53,7
@@
namespace opensaml {
*
* @param e DOM to supply configuration for provider
*/
*
* @param e DOM to supply configuration for provider
*/
- ChainingMetadataProvider(const DOMElement* e=NULL);
+ ChainingMetadataProvider(const
xercesc::
DOMElement* e=NULL);
/**
* Destructor will delete any embedded engines.
/**
* Destructor will delete any embedded engines.
diff --git
a/saml/saml2/metadata/MetadataProvider.h
b/saml/saml2/metadata/MetadataProvider.h
index
a3c39b3
..
6e2c6d4
100644
(file)
--- a/
saml/saml2/metadata/MetadataProvider.h
+++ b/
saml/saml2/metadata/MetadataProvider.h
@@
-77,7
+77,7
@@
namespace opensaml {
*
* @param e DOM to supply configuration for provider
*/
*
* @param e DOM to supply configuration for provider
*/
- MetadataProvider(const DOMElement* e=NULL);
+ MetadataProvider(const
xercesc::
DOMElement* e=NULL);
public:
/**
public:
/**
diff --git
a/saml/saml2/metadata/ObservableMetadataProvider.h
b/saml/saml2/metadata/ObservableMetadataProvider.h
index
3bdc043
..
91070f9
100644
(file)
--- a/
saml/saml2/metadata/ObservableMetadataProvider.h
+++ b/
saml/saml2/metadata/ObservableMetadataProvider.h
@@
-45,7
+45,7
@@
namespace opensaml {
*
* @param e DOM to supply configuration for provider
*/
*
* @param e DOM to supply configuration for provider
*/
- ObservableMetadataProvider(const DOMElement* e=NULL)
+ ObservableMetadataProvider(const
xercesc::
DOMElement* e=NULL)
: MetadataProvider(e), m_observerLock(xmltooling::Mutex::create()) {
}
: MetadataProvider(e), m_observerLock(xmltooling::Mutex::create()) {
}
diff --git
a/samltest/data/binding/template.html
b/samltest/data/binding/template.html
index
224f40f
..
3e24e2d
100644
(file)
--- a/
samltest/data/binding/template.html
+++ b/
samltest/data/binding/template.html
@@
-16,6
+16,9
@@
<mlpif SAMLResponse>
<input type="hidden" name="SAMLResponse" value="<mlp SAMLResponse/>"/>
</mlpif>
<mlpif SAMLResponse>
<input type="hidden" name="SAMLResponse" value="<mlp SAMLResponse/>"/>
</mlpif>
+ <mlpif SAMLart>
+ <input type="hidden" name="SAMLart" value="<mlp SAMLart/>"/>
+ </mlpif>
<mlpif SigAlg>
<input type="hidden" name="SigAlg" value="<mlp SigAlg/>"/>
</mlpif>
<mlpif SigAlg>
<input type="hidden" name="SigAlg" value="<mlp SigAlg/>"/>
</mlpif>
diff --git
a/samltest/internal.h
b/samltest/internal.h
index
370dc4a
..
05eeb7e
100644
(file)
--- a/
samltest/internal.h
+++ b/
samltest/internal.h
@@
-30,6
+30,7
@@
#include <xmltooling/validation/Validator.h>
using namespace xmltooling;
#include <xmltooling/validation/Validator.h>
using namespace xmltooling;
+using namespace xercesc;
using namespace std;
extern string data_path;
using namespace std;
extern string data_path;