#define PACKAGE_NAME "xmltooling"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 1.4.2"
+#define PACKAGE_STRING "xmltooling 1.5"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xmltooling"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.4.2"
+#define PACKAGE_VERSION "1.5"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "1.4.2"
+#define VERSION "1.5"
/* Define if you wish to disable XML-Security-dependent features. */
/* #undef XMLTOOLING_NO_XMLSEC */
# Process this file with autoreconf
AC_PREREQ([2.50])
-AC_INIT([xmltooling],[1.4.2],[https://bugs.internet2.edu/],[xmltooling])
+AC_INIT([xmltooling],[1.5],[https://bugs.internet2.edu/],[xmltooling])
AC_CONFIG_SRCDIR(xmltooling)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
Namespace.cpp \
QName.cpp \
unicode.cpp \
+ version.cpp \
XMLObjectBuilder.cpp \
XMLToolingConfig.cpp \
impl/AnyElement.cpp \
libxmltooling_lite_la_SOURCES = \
${common_sources}
libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
-libxmltooling_lite_la_LDFLAGS = -version-info 5:2:0
+libxmltooling_lite_la_LDFLAGS = -version-info 6:0:0
if BUILD_XMLSEC
-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 5:2:0
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0
libxmltooling_la_SOURCES = \
${common_sources} \
${xmlsec_sources}
/*
- * 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,
log.fatal("failed to initialize libcurl, OpenSSL, or Winsock");
return false;
}
- log.debug("libcurl %s initialization complete", LIBCURL_VERSION);
+ curl_version_info_data* curlver = curl_version_info(CURLVERSION_NOW);
+ if (curlver) {
+ log.debug("libcurl %s initialization complete", curlver->version);
+ if (!(curlver->features & CURL_VERSION_SSL)) {
+ log.warn("libcurl lacks TLS/SSL support, this will greatly limit functionality");
+ }
+ }
+ else {
+ log.debug("libcurl %s initialization complete", LIBCURL_VERSION);
+ }
#endif
XMLPlatformUtils::Initialize();
/*
- * 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,
m_useragent = XMLToolingConfig::getConfig().user_agent;
if (!m_useragent.empty()) {
- m_useragent = m_useragent + " libcurl/" + LIBCURL_VERSION + ' ' + OPENSSL_VERSION_TEXT;
+ curl_version_info_data* curlver = curl_version_info(CURLVERSION_NOW);
+ m_useragent += " libcurl/";
+ if (curlver)
+ m_useragent = m_useragent + curlver->version + ' ' + curlver->ssl_version;
+ else
+ m_useragent = m_useragent + LIBCURL_VERSION + ' ' + OPENSSL_VERSION_TEXT;
curl_easy_setopt(m_handle, CURLOPT_USERAGENT, m_useragent.c_str());
}
--- /dev/null
+/*\r
+ * Licensed to UCAID under one or more contributor license agreements.\r
+ * See the NOTICE file distributed with this work for additional information\r
+ * regarding copyright ownership. The ASF licenses this file to you under\r
+ * the Apache License, Version 2.0 (the "License"); you may not use this\r
+ * file except in compliance with the License. You may obtain a copy of the\r
+ * License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+/**\r
+ * version.cpp\r
+ * \r
+ * Library version macros and constants.\r
+ */\r
+\r
+#include "internal.h"\r
+#include "version.h"\r
+\r
+XMLTOOL_API const char* const gXMLToolingVersionStr = XMLTOOLING_VERSIONSTR;\r
+XMLTOOL_API const char* const gXMLToolingFullVersionStr = XMLTOOLING_FULLVERSIONSTR;\r
+XMLTOOL_API const char* const gXMLToolingDotVersionStr = XMLTOOLING_FULLVERSIONDOT;\r
+XMLTOOL_API const unsigned int gXMLToolingMajVersion = XMLTOOLING_VERSION_MAJOR;\r
+XMLTOOL_API const unsigned int gXMLToolingMinVersion = XMLTOOLING_VERSION_MINOR;\r
+XMLTOOL_API const unsigned int gXMLToolingRevision = XMLTOOLING_VERSION_REVISION;\r
/*
- * Copyright 2001-2011 Internet2
- *
- * 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
+ * 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
*
- * 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,
/**
* xmltooling/version.h
*
- * Library version macros and constants
+ * Library version macros and constants.
*/
#if !defined(__xmltooling_version_h__)
// support this kind of stuff in the future. If they ever yank some
// of this stuff, it can be copied into here.
+#include <xmltooling/base.h>
#include <xercesc/util/XercesVersion.hpp>
// ---------------------------------------------------------------------------
*/
#define XMLTOOLING_VERSION_MAJOR 1
-#define XMLTOOLING_VERSION_MINOR 4
-#define XMLTOOLING_VERSION_REVISION 2
+#define XMLTOOLING_VERSION_MINOR 5
+#define XMLTOOLING_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */
#define XMLTOOLING_FULLVERSIONNUM INVK_CAT3_SEP_NIL(XMLTOOLING_VERSION_MAJOR,XMLTOOLING_VERSION_MINOR,XMLTOOLING_VERSION_REVISION)
#define XMLTOOLING_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(XMLTOOLING_VERSION_MAJOR,XMLTOOLING_VERSION_MINOR)
-const char* const gXMLToolingVersionStr = XMLTOOLING_VERSIONSTR;
-const char* const gXMLToolingFullVersionStr = XMLTOOLING_FULLVERSIONSTR;
-const unsigned int gXMLToolingMajVersion = XMLTOOLING_VERSION_MAJOR;
-const unsigned int gXMLToolingMinVersion = XMLTOOLING_VERSION_MINOR;
-const unsigned int gXMLToolingRevision = XMLTOOLING_VERSION_REVISION;
+extern XMLTOOL_API const char* const gXMLToolingVersionStr;
+extern XMLTOOL_API const char* const gXMLToolingFullVersionStr;
+extern XMLTOOL_API const char* const gXMLToolingDotVersionStr;
+extern XMLTOOL_API const unsigned int gXMLToolingMajVersion;
+extern XMLTOOL_API const unsigned int gXMLToolingMinVersion;
+extern XMLTOOL_API const unsigned int gXMLToolingRevision;
// XMLTooling version numeric constants that can be used for conditional
// compilation purposes.
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_4</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_4</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_4D</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_4D</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>\r
</PropertyGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
<ClCompile>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeaderFile>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;XMLTOOLING_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeaderFile>\r
<ClCompile Include="Namespace.cpp" />\r
<ClCompile Include="QName.cpp" />\r
<ClCompile Include="unicode.cpp" />\r
+ <ClCompile Include="version.cpp" />\r
<ClCompile Include="XMLObjectBuilder.cpp" />\r
<ClCompile Include="XMLToolingConfig.cpp" />\r
<ClCompile Include="util\DateTime.cpp" />\r
<ClCompile Include="soap\impl\SOAPSchemaValidators.cpp">\r
<Filter>Source Files\soap\impl</Filter>\r
</ClCompile>\r
+ <ClCompile Include="version.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="AbstractAttributeExtensibleXMLObject.h">\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,4,2,0\r
- PRODUCTVERSION 2,4,1,0\r
+ FILEVERSION 1,5,0,0\r
+ PRODUCTVERSION 2,5,0,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
#else\r
VALUE "FileDescription", "OpenSAML XMLTooling Library\0"\r
#endif\r
- VALUE "FileVersion", "1, 4, 2, 0\0"\r
+ VALUE "FileVersion", "1, 5, 0, 0\0"\r
#ifdef XMLTOOLING_LITE\r
#ifdef _DEBUG\r
- VALUE "InternalName", "xmltooling-lite1_4D\0"\r
+ VALUE "InternalName", "xmltooling-lite1_5D\0"\r
#else\r
- VALUE "InternalName", "xmltooling-lite1_4\0"\r
+ VALUE "InternalName", "xmltooling-lite1_5\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "InternalName", "xmltooling1_4D\0"\r
+ VALUE "InternalName", "xmltooling1_5D\0"\r
#else\r
- VALUE "InternalName", "xmltooling1_4\0"\r
+ VALUE "InternalName", "xmltooling1_5\0"\r
#endif\r
#endif\r
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"\r
VALUE "LegalTrademarks", "\0"\r
#ifdef XMLTOOLING_LITE\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "xmltooling-lite1_4D.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling-lite1_5D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "xmltooling-lite1_4.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling-lite1_5.dll\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "xmltooling1_4D.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling1_5D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "xmltooling1_4.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling1_5.dll\0"\r
#endif\r
#endif\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "OpenSAML 2.4.1\0"\r
- VALUE "ProductVersion", "2, 4, 1, 0\0"\r
+ VALUE "ProductName", "OpenSAML 2.5\0"\r
+ VALUE "ProductVersion", "2, 5, 0, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_4D</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_4D</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_4</TargetName>\r
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_4</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>\r
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>\r
</PropertyGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
<ClCompile>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<PrecompiledHeaderFile>\r
</PrecompiledHeaderFile>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<PrecompiledHeaderFile>\r
</PrecompiledHeaderFile>\r
<ClCompile Include="Namespace.cpp" />\r
<ClCompile Include="QName.cpp" />\r
<ClCompile Include="unicode.cpp" />\r
+ <ClCompile Include="version.cpp" />\r
<ClCompile Include="XMLObjectBuilder.cpp" />\r
<ClCompile Include="XMLToolingConfig.cpp" />\r
<ClCompile Include="util\CurlURLInputStream.cpp" />\r
<ClCompile Include="soap\impl\SOAPSchemaValidators.cpp">\r
<Filter>Source Files\soap\impl</Filter>\r
</ClCompile>\r
+ <ClCompile Include="version.cpp">\r
+ <Filter>Source Files</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="AbstractAttributeExtensibleXMLObject.h">\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<ClCompile Include="xmltoolingtest.cpp">\r
<Filter>Generated Code</Filter>\r
</ClCompile>\r
+ <ClCompile Include="SOAPTest.cpp">\r
+ <Filter>Generated Code</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="XMLObjectBaseTestCase.h">\r
<CustomBuild Include="xmltoolingtest.h">\r
<Filter>Unit Tests</Filter>\r
</CustomBuild>\r
+ <CustomBuild Include="SOAPTest.h">\r
+ <Filter>Unit Tests</Filter>\r
+ </CustomBuild>\r
</ItemGroup>\r
</Project>
\ No newline at end of file