#define PACKAGE_NAME "xmltooling"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 1.2.2"
+#define PACKAGE_STRING "xmltooling 1.3"
/* 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.2.2"
+#define PACKAGE_VERSION "1.3"
/* 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.2.2"
+#define VERSION "1.3"
/* Define if you wish to disable XML-Security-dependent features. */
/* #undef XMLTOOLING_NO_XMLSEC */
AC_PREREQ([2.50])
-AC_INIT([xmltooling], [1.2.2], [mace-opensaml-users@internet2.edu], [xmltooling])
+AC_INIT([xmltooling], [1.3], [mace-opensaml-users@internet2.edu], [xmltooling])
AM_CONFIG_HEADER(config.h)
AM_CONFIG_HEADER(xmltooling/config_pub.h)
-AM_INIT_AUTOMAKE([xmltooling], [1.2.2])
+AM_INIT_AUTOMAKE([xmltooling], [1.3])
sinclude(doxygen.m4)
sinclude(acx_pthread.m4)
+VERSION 1.3
+
+Unreleased
+
VERSION 1.2.2
Issues addressed by this release:
libxmltooling_lite_la_SOURCES = \
${common_sources}
libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
-libxmltooling_lite_la_LDFLAGS = -version-info 3:2:0
+libxmltooling_lite_la_LDFLAGS = -version-info 4:0:0
if BUILD_XMLSEC
-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 3:2:0
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 4:0:0
libxmltooling_la_SOURCES = \
${common_sources} \
${xmlsec_sources}
QName::QName(const XMLCh* uri, const XMLCh* localPart, const XMLCh* prefix)
{
-#ifndef HAVE_GOOD_STL
- m_uri=m_prefix=m_local=NULL;
-#endif
setNamespaceURI(uri);
setLocalPart(localPart);
setPrefix(prefix);
QName::QName(const char* uri, const char* localPart, const char* prefix)
{
-#ifndef HAVE_GOOD_STL
- m_uri=m_prefix=m_local=NULL;
-#endif
setNamespaceURI(uri);
setLocalPart(localPart);
setPrefix(prefix);
QName::~QName()
{
-#ifndef HAVE_GOOD_STL
- XMLString::release(&m_uri);
- XMLString::release(&m_prefix);
- XMLString::release(&m_local);
-#endif
}
void QName::setPrefix(const XMLCh* prefix)
{
-#ifdef HAVE_GOOD_STL
if (prefix)
m_prefix=prefix;
else
m_prefix.erase();
-#else
- if (m_prefix)
- XMLString::release(&m_prefix);
- m_prefix=XMLString::replicate(prefix);
-#endif
}
void QName::setNamespaceURI(const XMLCh* uri)
{
-#ifdef HAVE_GOOD_STL
if (uri)
m_uri=uri;
else
m_uri.erase();
-#else
- if (m_uri)
- XMLString::release(&m_uri);
- m_uri=XMLString::replicate(uri);
-#endif
}
void QName::setLocalPart(const XMLCh* localPart)
{
-#ifdef HAVE_GOOD_STL
if (localPart)
m_local=localPart;
else
m_local.erase();
-#else
- if (m_local)
- XMLString::release(&m_local);
- m_local=XMLString::replicate(localPart);
-#endif
}
void QName::setPrefix(const char* prefix)
{
-#ifdef HAVE_GOOD_STL
if (prefix) {
auto_ptr_XMLCh temp(prefix);
m_prefix=temp.get();
}
else
m_prefix.erase();
-#else
- if (m_prefix)
- XMLString::release(&m_prefix);
- m_prefix=XMLString::transcode(prefix);
-#endif
}
void QName::setNamespaceURI(const char* uri)
{
-#ifdef HAVE_GOOD_STL
if (uri) {
auto_ptr_XMLCh temp(uri);
m_uri=temp.get();
}
else
m_uri.erase();
-#else
- if (m_uri)
- XMLString::release(&m_uri);
- m_uri=XMLString::transcode(uri);
-#endif
}
void QName::setLocalPart(const char* localPart)
{
-#ifdef HAVE_GOOD_STL
if (localPart) {
auto_ptr_XMLCh temp(localPart);
m_local=temp.get();
}
else
m_local.erase();
-#else
- if (m_local)
- XMLString::release(&m_local);
- m_local=XMLString::transcode(localPart);
-#endif
}
-#ifndef HAVE_GOOD_STL
-QName::QName(const QName& src)
-{
- m_uri=XMLString::replicate(src.getNamespaceURI());
- m_prefix=XMLString::replicate(src.getPrefix());
- m_local=XMLString::replicate(src.getLocalPart());
-}
-
-QName& QName::operator=(const QName& src)
-{
- m_uri=XMLString::replicate(src.getNamespaceURI());
- m_prefix=XMLString::replicate(src.getPrefix());
- m_local=XMLString::replicate(src.getLocalPart());
- return *this;
-}
-#endif
-
bool xmltooling::operator==(const QName& op1, const QName& op2)
{
if (&op1 == &op2)
QName(const char* uri, const char* localPart, const char* prefix=NULL);
~QName();
-#ifndef HAVE_GOOD_STL
- /**
- * Deep copy constructor
- */
- QName(const QName& src);
-
- /**
- * Deep assignment operator
- */
- QName& operator=(const QName& src);
-#endif
-#ifdef HAVE_GOOD_STL
/**
* Indicates whether the QName has a prefix.
* @return true iff the prefix is non-empty
* @return Null-terminated Unicode string containing the local name
*/
const XMLCh* getLocalPart() const { return m_local.c_str(); }
-#else
- /**
- * Indicates whether the QName has a prefix.
- * @return true iff the prefix is non-empty
- */
- bool hasPrefix() const { return m_prefix && *m_prefix; }
-
- /**
- * Indicates whether the QName has a non-empty namespace.
- * @return true iff the namespace is non-empty
- */
- bool hasNamespaceURI() const { return m_uri && *m_uri; }
-
- /**
- * Indicates whether the QName has a non-empty local name.
- * @return true iff the local name is non-empty
- */
- bool hasLocalPart() const { return m_local && *m_local; }
-
- /**
- * Returns the namespace prefix
- * @return Null-terminated Unicode string containing the prefix, without the colon
- */
- const XMLCh* getPrefix() const { return m_prefix; }
-
- /**
- * Returns the namespace URI
- * @return Null-terminated Unicode string containing the URI
- */
- const XMLCh* getNamespaceURI() const { return m_uri; }
-
- /**
- * Returns the local part of the name
- * @return Null-terminated Unicode string containing the local name
- */
- const XMLCh* getLocalPart() const { return m_local; }
-#endif
/**
* Sets the namespace prefix
std::string toString() const;
private:
-#ifdef HAVE_GOOD_STL
xstring m_uri;
xstring m_local;
xstring m_prefix;
-#else
- XMLCh* m_uri;
- XMLCh* m_local;
- XMLCh* m_prefix;
-#endif
};
#if defined (_MSC_VER)
*/
#define XMLTOOLING_VERSION_MAJOR 1
-#define XMLTOOLING_VERSION_MINOR 2
-#define XMLTOOLING_VERSION_REVISION 2
+#define XMLTOOLING_VERSION_MINOR 3
+#define XMLTOOLING_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_3D.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
LinkIncremental="2"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_3D.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
LinkIncremental="2"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_3.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
OptimizeReferences="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_3.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
OptimizeReferences="2"\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,2,2,0\r
+ FILEVERSION 1,3,0,0\r
PRODUCTVERSION 2,2,1,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
#else\r
VALUE "FileDescription", "OpenSAML XMLTooling Library\0"\r
#endif\r
- VALUE "FileVersion", "1, 2, 2, 0\0"\r
+ VALUE "FileVersion", "1, 3, 0, 0\0"\r
#ifdef XMLTOOLING_LITE\r
#ifdef _DEBUG\r
- VALUE "InternalName", "xmltooling-lite1_2D\0"\r
+ VALUE "InternalName", "xmltooling-lite1_3D\0"\r
#else\r
- VALUE "InternalName", "xmltooling-lite1_2\0"\r
+ VALUE "InternalName", "xmltooling-lite1_3\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "InternalName", "xmltooling1_2D\0"\r
+ VALUE "InternalName", "xmltooling1_3D\0"\r
#else\r
- VALUE "InternalName", "xmltooling1_2\0"\r
+ VALUE "InternalName", "xmltooling1_3\0"\r
#endif\r
#endif\r
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
VALUE "LegalTrademarks", "\0"\r
#ifdef XMLTOOLING_LITE\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "xmltooling-lite1_2D.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling-lite1_3D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "xmltooling-lite1_2.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling-lite1_3.dll\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "xmltooling1_2D.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling1_3D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "xmltooling1_2.dll\0"\r
+ VALUE "OriginalFilename", "xmltooling1_3.dll\0"\r
#endif\r
#endif\r
VALUE "PrivateBuild", "\0"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_3D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
LinkIncremental="2"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_3D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
LinkIncremental="2"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_3.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
OptimizeReferences="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_3.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
OptimizeReferences="2"\r