Rev version and add README file.

diff --git a/.cproject b/.cproject
index 8cb2825..8474fe4 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><?fileVersion 4.0.0?><cproject>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<?fileVersion 4.0.0?>\r
+\r
+<cproject>\r
 <storageModule moduleId="org.eclipse.cdt.core.settings">\r
 <cconfiguration id="converted.config.943130369">\r
 <storageModule moduleId="scannerConfiguration">\r
@@ -53,12 +56,16 @@
 <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>\r
 </extensions>\r
 </storageModule>\r
+\r
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.pathentry">\r
 <pathentry include="C:/log4shib-1.0/include" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/xerces-c_2_8_0-x86-windows-vc_8_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.8g/inc32" kind="inc" path="" system="true"/>\r
-<pathentry include="C:/curl-7.17.1/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:/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
@@ -83,8 +90,6 @@
 <pathentry kind="src" path="xmltooling/validation"/>\r
 <pathentry kind="src" path="xmltoolingtest"/>\r
 </storageModule>\r
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 </cconfiguration>\r
 </storageModule>\r
 </cproject>\r

diff --git a/configure.ac b/configure.ac
index e17b5df..3e22b5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ([2.50])
-AC_INIT([xmltooling], [1.0.1], [mace-opensaml-users@internet2.edu], [xmltooling])
+AC_INIT([xmltooling], [1.1], [mace-opensaml-users@internet2.edu], [xmltooling])
 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(xmltooling/config_pub.h)
-AM_INIT_AUTOMAKE([xmltooling], [1.0.1])
+AM_INIT_AUTOMAKE([xmltooling], [1.1])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 06ac078..25d6f2d 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign
 pkgdocdir = $(datadir)/doc/@PACKAGE@
 
 docfiles = \
+    README.txt \
        LICENSE.txt \
        NOTICE.txt \
        OPENSSL.LICENSE \

diff --git a/doc/README.txt b/doc/README.txt
new file mode 100644 (file)
index 0000000..ee032e2
--- /dev/null
+++ b/doc/README.txt
@@ -0,0 +1,16 @@
+VERSION 1.1\r
+\r
+Documentation:\r
+--------------\r
+The OpenSAML wiki is the home for any documentation on the XMLTooling package.\r
+https://spaces.internet2.edu/display/OpenSAML/\r
+\r
+Reporting Bugs:\r
+---------------\r
+A Jira instance is available.\r
+https://bugs.internet2.edu/\r
+\r
+Support:\r
+--------\r
+A mailing list is available.\r
+https://spaces.internet2.edu/display/OpenSAML/MailingList\r

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 8cac0f4..c7bd1a5 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -80,6 +80,7 @@ find $RPM_BUILD_ROOT/%{_bindir} -type f |
 %dir %{_datadir}/xml/xmltooling
 %{_datadir}/xml/xmltooling
 %docdir %{_datadir}/doc/xmltooling
+%{_datadir}/doc/xmltooling/README.txt
 %{_datadir}/doc/xmltooling/LICENSE.txt
 %{_datadir}/doc/xmltooling/NOTICE.txt
 %{_datadir}/doc/xmltooling/CURL.LICENSE

diff --git a/xmltooling/version.h b/xmltooling/version.h
index 48ad3ca..b4f6957 100644 (file)
--- a/xmltooling/version.h
+++ b/xmltooling/version.h
@@ -38,8 +38,8 @@
  */
 
 #define XMLTOOLING_VERSION_MAJOR 1
-#define XMLTOOLING_VERSION_MINOR 0
-#define XMLTOOLING_VERSION_REVISION 1
+#define XMLTOOLING_VERSION_MINOR 1
+#define XMLTOOLING_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 

diff --git a/xmltooling/xmltooling-lite.vcproj b/xmltooling/xmltooling-lite.vcproj
index 136e4d4..d45dc86 100644 (file)
--- a/xmltooling/xmltooling-lite.vcproj
+++ b/xmltooling/xmltooling-lite.vcproj
@@ -67,7 +67,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -145,7 +145,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -228,7 +228,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -307,7 +307,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/xmltooling/xmltooling.rc b/xmltooling/xmltooling.rc
index 4c09635..d1156c5 100644 (file)
--- a/xmltooling/xmltooling.rc
+++ b/xmltooling/xmltooling.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,0,0,0\r
- PRODUCTVERSION 2,0,0,0\r
+ FILEVERSION 1,1,0,0\r
+ PRODUCTVERSION 2,1,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -51,38 +51,38 @@ BEGIN
 #else\r
             VALUE "FileDescription", "OpenSAML XMLTooling Library\0"\r
 #endif\r
-            VALUE "FileVersion", "1, 0, 0, 0\0"\r
+            VALUE "FileVersion", "1, 1, 0, 0\0"\r
 #ifdef XMLTOOLING_LITE\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "xmltooling-lite1_0D\0"\r
+            VALUE "InternalName", "xmltooling-lite1_1D\0"\r
 #else\r
-            VALUE "InternalName", "xmltooling-lite1_0\0"\r
+            VALUE "InternalName", "xmltooling-lite1_1\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "xmltooling1_0D\0"\r
+            VALUE "InternalName", "xmltooling1_1D\0"\r
 #else\r
-            VALUE "InternalName", "xmltooling1_0\0"\r
+            VALUE "InternalName", "xmltooling1_1\0"\r
 #endif\r
 #endif\r
-            VALUE "LegalCopyright", "Copyright © 2007 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2008 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef XMLTOOLING_LITE\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "xmltooling-lite1_0D.dll\0"\r
+            VALUE "OriginalFilename", "xmltooling-lite1_1D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "xmltooling-lite1_0.dll\0"\r
+            VALUE "OriginalFilename", "xmltooling-lite1_1.dll\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "xmltooling1_0D.dll\0"\r
+            VALUE "OriginalFilename", "xmltooling1_1D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "xmltooling1_0.dll\0"\r
+            VALUE "OriginalFilename", "xmltooling1_1.dll\0"\r
 #endif\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "OpenSAML 2.0\0"\r
-            VALUE "ProductVersion", "2, 0, 0, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.1\0"\r
+            VALUE "ProductVersion", "2, 1, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/xmltooling/xmltooling.vcproj b/xmltooling/xmltooling.vcproj
index 311a29b..ca39462 100644 (file)
--- a/xmltooling/xmltooling.vcproj
+++ b/xmltooling/xmltooling.vcproj
@@ -67,7 +67,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -144,7 +144,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -227,7 +227,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -305,7 +305,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_0.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_1.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r