From 466119cb7e540f468c095baaac56b6b4a3dc5c99 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 1 Jul 2008 17:02:13 +0000
Subject: [PATCH] Rev version and add README file.

---
 .cproject                         | 15 ++++++++++-----
 configure.ac                      |  4 ++--
 doc/Makefile.am                   |  1 +
 doc/README.txt                    | 16 ++++++++++++++++
 xmltooling.spec.in                |  1 +
 xmltooling/version.h              |  4 ++--
 xmltooling/xmltooling-lite.vcproj |  8 ++++----
 xmltooling/xmltooling.rc          | 28 ++++++++++++++--------------
 xmltooling/xmltooling.vcproj      |  8 ++++----
 9 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 doc/README.txt

diff --git a/.cproject b/.cproject
index 8cb2825..8474fe4 100644
--- a/.cproject
+++ b/.cproject
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><?fileVersion 4.0.0?><cproject>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
 <storageModule moduleId="org.eclipse.cdt.core.settings">
 <cconfiguration id="converted.config.943130369">
 <storageModule moduleId="scannerConfiguration">
@@ -53,12 +56,16 @@
 <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 </extensions>
 </storageModule>
+
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 <storageModule moduleId="org.eclipse.cdt.core.pathentry">
 <pathentry include="C:/log4shib-1.0/include" kind="inc" path="" system="true"/>
 <pathentry include="C:/xerces-c_2_8_0-x86-windows-vc_8_0/include" kind="inc" path="" system="true"/>
 <pathentry include="C:/xml-security-c-1.4.0/include" kind="inc" path="" system="true"/>
-<pathentry include="C:/openssl-0.9.8g/inc32" kind="inc" path="" system="true"/>
-<pathentry include="C:/curl-7.17.1/include" kind="inc" path="" system="true"/>
+<pathentry include="C:/openssl-0.9.8h/inc32" kind="inc" path="" system="true"/>
+<pathentry include="C:/curl-7.18.2/include" kind="inc" path="" system="true"/>
 <pathentry include="C:/cxxtest" kind="inc" path="" system="true"/>
 <pathentry base-path="cpp-xmltooling" include="" kind="inc" path="" system="true"/>
 <pathentry base-path="cpp-xmltooling" include="xmltooling" kind="inc" path="" system="true"/>
@@ -83,8 +90,6 @@
 <pathentry kind="src" path="xmltooling/validation"/>
 <pathentry kind="src" path="xmltoolingtest"/>
 </storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 </cconfiguration>
 </storageModule>
 </cproject>
diff --git a/configure.ac b/configure.ac
index e17b5df..3e22b5a 100644
--- 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
--- 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
index 0000000..ee032e2
--- /dev/null
+++ b/doc/README.txt
@@ -0,0 +1,16 @@
+VERSION 1.1
+
+Documentation:
+--------------
+The OpenSAML wiki is the home for any documentation on the XMLTooling package.
+https://spaces.internet2.edu/display/OpenSAML/
+
+Reporting Bugs:
+---------------
+A Jira instance is available.
+https://bugs.internet2.edu/
+
+Support:
+--------
+A mailing list is available.
+https://spaces.internet2.edu/display/OpenSAML/MailingList
diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 8cac0f4..c7bd1a5 100644
--- 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
--- 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
--- a/xmltooling/xmltooling-lite.vcproj
+++ b/xmltooling/xmltooling-lite.vcproj
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -228,7 +228,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -307,7 +307,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/xmltooling/xmltooling.rc b/xmltooling/xmltooling.rc
index 4c09635..d1156c5 100644
--- a/xmltooling/xmltooling.rc
+++ b/xmltooling/xmltooling.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 1,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,38 +51,38 @@ BEGIN
 #else
             VALUE "FileDescription", "OpenSAML XMLTooling Library\0"
 #endif
-            VALUE "FileVersion", "1, 0, 0, 0\0"
+            VALUE "FileVersion", "1, 1, 0, 0\0"
 #ifdef XMLTOOLING_LITE
 #ifdef _DEBUG
-            VALUE "InternalName", "xmltooling-lite1_0D\0"
+            VALUE "InternalName", "xmltooling-lite1_1D\0"
 #else
-            VALUE "InternalName", "xmltooling-lite1_0\0"
+            VALUE "InternalName", "xmltooling-lite1_1\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "InternalName", "xmltooling1_0D\0"
+            VALUE "InternalName", "xmltooling1_1D\0"
 #else
-            VALUE "InternalName", "xmltooling1_0\0"
+            VALUE "InternalName", "xmltooling1_1\0"
 #endif
 #endif
-            VALUE "LegalCopyright", "Copyright © 2007 Internet2\0"
+            VALUE "LegalCopyright", "Copyright © 2008 Internet2\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef XMLTOOLING_LITE
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "xmltooling-lite1_0D.dll\0"
+            VALUE "OriginalFilename", "xmltooling-lite1_1D.dll\0"
 #else
-            VALUE "OriginalFilename", "xmltooling-lite1_0.dll\0"
+            VALUE "OriginalFilename", "xmltooling-lite1_1.dll\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "xmltooling1_0D.dll\0"
+            VALUE "OriginalFilename", "xmltooling1_1D.dll\0"
 #else
-            VALUE "OriginalFilename", "xmltooling1_0.dll\0"
+            VALUE "OriginalFilename", "xmltooling1_1.dll\0"
 #endif
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "OpenSAML 2.0\0"
-            VALUE "ProductVersion", "2, 0, 0, 0\0"
+            VALUE "ProductName", "OpenSAML 2.1\0"
+            VALUE "ProductVersion", "2, 1, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/xmltooling/xmltooling.vcproj b/xmltooling/xmltooling.vcproj
index 311a29b..ca39462 100644
--- a/xmltooling/xmltooling.vcproj
+++ b/xmltooling/xmltooling.vcproj
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -227,7 +227,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_2D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -305,7 +305,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_2.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0.dll"
+				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
-- 
2.1.4