[cpp-xmltooling COMMIT] in /branches/REL_1: config_win32.h configure.ac cpp-xmltooling.sln xmltooling/Makefile.am xml...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Sep  6 12:28:45 2012
New Revision: 993

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=993&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-498

Modified:
    branches/REL_1/config_win32.h
    branches/REL_1/configure.ac
    branches/REL_1/cpp-xmltooling.sln
    branches/REL_1/xmltooling/Makefile.am
    branches/REL_1/xmltooling/util/ParserPool.cpp
    branches/REL_1/xmltooling/util/PathResolver.cpp
    branches/REL_1/xmltooling/version.h
    branches/REL_1/xmltooling/xmltooling.rc

Modified: branches/REL_1/config_win32.h
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/config_win32.h?rev=993&r1=992&r2=993&view=diff
==============================================================================
--- branches/REL_1/config_win32.h (original)
+++ branches/REL_1/config_win32.h Thu Sep  6 12:28:45 2012
@@ -114,13 +114,13 @@
 #define PACKAGE_NAME "xmltooling"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 1.5.0"
+#define PACKAGE_STRING "xmltooling 1.5.1"
 
 /* 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.5.0"
+#define PACKAGE_VERSION "1.5.1"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -133,7 +133,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "1.5.0"
+#define VERSION "1.5.1"
 
 /* Define if you wish to disable XML-Security-dependent features. */
 /* #undef XMLTOOLING_NO_XMLSEC */

Modified: branches/REL_1/configure.ac
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/configure.ac?rev=993&r1=992&r2=993&view=diff
==============================================================================
--- branches/REL_1/configure.ac (original)
+++ branches/REL_1/configure.ac Thu Sep  6 12:28:45 2012
@@ -1,6 +1,6 @@
 # Process this file with autoreconf
 AC_PREREQ([2.50])
-AC_INIT([xmltooling],[1.5.0],[https://issues.shibboleth.net/],[xmltooling])
+AC_INIT([xmltooling],[1.5.1],[https://issues.shibboleth.net/],[xmltooling])
 AC_CONFIG_SRCDIR(xmltooling)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)

Modified: branches/REL_1/cpp-xmltooling.sln
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/cpp-xmltooling.sln?rev=993&r1=992&r2=993&view=diff
==============================================================================
--- branches/REL_1/cpp-xmltooling.sln (original)
+++ branches/REL_1/cpp-xmltooling.sln Thu Sep  6 12:28:45 2012
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{61BF324D-2532-49C9-93CE-DF0E89529D4F}"
 	ProjectSection(SolutionItems) = preProject
 		m4\acinclude.m4 = m4\acinclude.m4

Modified: branches/REL_1/xmltooling/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/Makefile.am?rev=993&r1=992&r2=993&view=diff
==============================================================================
--- branches/REL_1/xmltooling/Makefile.am (original)
+++ branches/REL_1/xmltooling/Makefile.am Thu Sep  6 12:28:45 2012
@@ -204,13 +204,13 @@
 libxmltooling_lite_la_SOURCES = \
 	${common_sources}
 libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
-libxmltooling_lite_la_LDFLAGS = -version-info 6:0:0
+libxmltooling_lite_la_LDFLAGS = -version-info 6:1:0
 
 if BUILD_XMLSEC
 libxmltooling_la_SOURCES = \
 	${common_sources} \
 	${xmlsec_sources}
-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:1:0
 endif
 
 install-exec-hook:

Modified: branches/REL_1/xmltooling/util/ParserPool.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/ParserPool.cpp?rev=993&r1=992&r2=993&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/ParserPool.cpp (original)
+++ branches/REL_1/xmltooling/util/ParserPool.cpp Thu Sep  6 12:28:45 2012
@@ -229,8 +229,13 @@
         return false;
     }
 
+    // Roundtrip to local code page and back to translate path as needed.
+    string topath(p.get());
+    XMLToolingConfig::getConfig().getPathResolver()->resolve(topath, PathResolver::XMLTOOLING_XML_FILE);
+    auto_ptr_XMLCh temp(topath.c_str());
+
     Lock lock(m_lock);
-    m_schemaLocMap[nsURI]=pathname;
+    m_schemaLocMap[nsURI] = temp.get();
     m_schemaLocations.erase();
     for_each(m_schemaLocMap.begin(), m_schemaLocMap.end(), doubleit<xstring>(m_schemaLocations,chSpace));
 
@@ -251,7 +256,9 @@
 
 bool ParserPool::loadCatalog(const char* pathname)
 {
-    auto_ptr_XMLCh temp(pathname);
+    string p(pathname);
+    XMLToolingConfig::getConfig().getPathResolver()->resolve(p, PathResolver::XMLTOOLING_XML_FILE);
+    auto_ptr_XMLCh temp(p.c_str());

[... 99 lines stripped ...]