Tagging 1.2 release.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/tags/1.2.0@598 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/.cproject b/.cproject
index 93f4997..f481b92 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -68,13 +68,13 @@
 <storageModule moduleId="org.eclipse.cdt.core.pathentry">\r
 <pathentry include="C:/log4shib-1.0.2/include" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/xerces-c-3.0.1-x86-windows-vc-9.0/include" kind="inc" path="" system="true"/>\r
-<pathentry include="C:/xml-security-c-1.4.0/include" kind="inc" path="" system="true"/>\r
-<pathentry include="C:/openssl-0.9.8h/inc32" kind="inc" path="" system="true"/>\r
-<pathentry include="C:/curl-7.18.2/include" kind="inc" path="" system="true"/>\r
+<pathentry include="C:/xml-security-c-1.5.0/include" kind="inc" path="" system="true"/>\r
+<pathentry include="C:/openssl-0.9.8k/inc32" kind="inc" path="" system="true"/>\r
+<pathentry include="C:/curl-7.19.5/include" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/cxxtest" kind="inc" path="" system="true"/>\r
 <pathentry base-path="cpp-xmltooling" include="" kind="inc" path="" system="true"/>\r
 <pathentry base-path="cpp-xmltooling" include="xmltooling" kind="inc" path="" system="true"/>\r
-<pathentry include="C:/Program Files/Microsoft Visual Studio 8/VC/include" kind="inc" path="" system="true"/>\r
+<pathentry include="C:/Program Files/Microsoft Visual Studio 9.0/VC/include" kind="inc" path="" system="true"/>\r
 <pathentry kind="mac" name="_MSC_VER" path="" value=""/>\r
 <pathentry kind="mac" name="WIN32" path="" value=""/>\r
 <pathentry kind="mac" name="XMLTOOL_API" path="" value=""/>\r

diff --git a/doc/README.txt b/doc/README.txt
index 1f9cd13..81ece25 100644 (file)
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -1,8 +1,8 @@
-VERSION 1.1\r
+VERSION 1.2\r
 \r
 Issues addressed by this release:\r
 ---------------------------------\r
-https://bugs.internet2.edu/jira/secure/IssueNavigator.jspa?reset=true&&pid=10009&fixfor=10134&status=5&status=6&sorter/field=issuekey&sorter/order=ASC\r
+https://bugs.internet2.edu/jira/secure/IssueNavigator.jspa?reset=true&&pid=10009&fixfor=10161&status=5&status=6&sorter/field=issuekey&sorter/order=ASC\r
 \r
 Documentation:\r
 --------------\r

diff --git a/xmltooling/soap/impl/CURLSOAPTransport.cpp b/xmltooling/soap/impl/CURLSOAPTransport.cpp
index 90e8223..0bd3715 100644 (file)
--- a/xmltooling/soap/impl/CURLSOAPTransport.cpp
+++ b/xmltooling/soap/impl/CURLSOAPTransport.cpp
@@ -311,6 +311,7 @@ CURL* CURLPool::get(const SOAPTransport::Address& addr)
     curl_easy_setopt(handle,CURLOPT_SSL_CIPHER_LIST,"ALL:!aNULL:!LOW:!EXPORT:!SSLv2");
     // Verification of the peer is via TrustEngine only.
     curl_easy_setopt(handle,CURLOPT_SSL_VERIFYPEER,0);
+    curl_easy_setopt(handle,CURLOPT_CAINFO,NULL);
     curl_easy_setopt(handle,CURLOPT_HEADERFUNCTION,&curl_header_hook);
     curl_easy_setopt(handle,CURLOPT_WRITEFUNCTION,&curl_write_hook);
     curl_easy_setopt(handle,CURLOPT_DEBUGFUNCTION,&curl_debug_hook);

diff --git a/xmltooling/util/TemplateEngine.cpp b/xmltooling/util/TemplateEngine.cpp
index 4a165d5..1e86975 100644 (file)
--- a/xmltooling/util/TemplateEngine.cpp
+++ b/xmltooling/util/TemplateEngine.cpp
@@ -27,7 +27,7 @@ using namespace xmltooling;
 using namespace std;
 
 namespace {
-    static const pair<string,string> emptyPair;
+    static const pair<const string,string> emptyPair;
 }
 
 void TemplateEngine::setTagPrefix(const char* tagPrefix)
@@ -98,7 +98,7 @@ void TemplateEngine::process(
     const char*& lastpos,
     ostream& os,
     const TemplateParameters& parameters,
-    const std::pair<std::string,std::string>& loopentry,
+    const std::pair<const std::string,std::string>& loopentry,
     const XMLToolingException* e
     ) const
 {

diff --git a/xmltooling/util/TemplateEngine.h b/xmltooling/util/TemplateEngine.h
index eba0689..2349b1e 100644 (file)
--- a/xmltooling/util/TemplateEngine.h
+++ b/xmltooling/util/TemplateEngine.h
@@ -141,7 +141,7 @@ namespace xmltooling {
             const char*& lastpos,
             std::ostream& os,
             const TemplateParameters& parameters,
-            const std::pair<std::string,std::string>& loopentry,
+            const std::pair<const std::string,std::string>& loopentry,
             const XMLToolingException* e
             ) const;
 

diff --git a/xmltoolingtest/TemplateEngineTest.h b/xmltoolingtest/TemplateEngineTest.h
index 169def6..919a025 100644 (file)
--- a/xmltoolingtest/TemplateEngineTest.h
+++ b/xmltoolingtest/TemplateEngineTest.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@ public:
         p.m_map["foo3"] = "bar3";
         p.m_map["encoded"] = "http://www.example.org/foo/bar#foobar";
         multimap<string,string>& submap = p.m_collectionMap["sub"];
-        submap.insert(pair<string,string>("subfoo1", "subbar1"));
-        submap.insert(pair<string,string>("subfoo2", "subbar2"));
+        submap.insert(pair<const string,string>("subfoo1", "subbar1"));
+        submap.insert(pair<const string,string>("subfoo2", "subbar2"));
         
         string path = data_path + "template.in";
         ifstream in(path.c_str());