/*
- * Copyright 2001-2010 Internet2
+ * Licensed to UCAID under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may not use this
+ * file except in compliance with the License. You may obtain a copy of the
+ * License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
stringstream msg;
msg << "<StatusHandler time='" << timestamp.get() << "'>";
msg << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
- << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+ << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
#ifndef SHIBSP_LITE
<< "' XML-Security-C='" << XSEC_FULLVERSIONDOT
- << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+ << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
#endif
<< "' Shibboleth='" << PACKAGE_VERSION << "'/>";
systemInfo(msg) << "<RequestSettings";
stringstream msg;
msg << "<StatusHandler time='" << timestamp.get() << "'>";
msg << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
- << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+ << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
#ifndef SHIBSP_LITE
<< "' XML-Security-C='" << XSEC_FULLVERSIONDOT
- << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+ << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
#endif
<< "' Shibboleth='" << PACKAGE_VERSION << "'/>";
systemInfo(msg) << "<Status><Exception type='" << ex.getClassName() << "'>" << ex.what() << "</Exception></Status>";
stringstream msg;
msg << "<StatusHandler time='" << timestamp.get() << "'>";
msg << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
- << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+ << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
#ifndef SHIBSP_LITE
<< "' XML-Security-C='" << XSEC_FULLVERSIONDOT
- << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+ << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
#endif
<< "' Shibboleth='" << PACKAGE_VERSION << "'/>";
systemInfo(msg) << "<Status><Exception type='std::exception'>" << ex.what() << "</Exception></Status>";
const char* status = "<OK/>";
s << "<Version Xerces-C='" << XERCES_FULLVERSIONDOT
- << "' XML-Tooling-C='" << XMLTOOLING_FULLVERSIONDOT
+ << "' XML-Tooling-C='" << gXMLToolingDotVersionStr
<< "' XML-Security-C='" << XSEC_FULLVERSIONDOT
- << "' OpenSAML-C='" << OPENSAML_FULLVERSIONDOT
+ << "' OpenSAML-C='" << gOpenSAMLDotVersionStr
<< "' Shibboleth='" << PACKAGE_VERSION << "'/>";
systemInfo(s);