Tagging 1.2.1 release.

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

diff --git a/Makefile.am b/Makefile.am
index c3c55a9..2f06a8d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,13 @@ dist-hook:
 
 SUBDIRS = doc schemas xmltooling xmltoolingtest
 
-GENFILES = xmltooling.spec pkginfo Portfile
-
 if DX_COND_doc
-all-local: doxygen-doc $(GENFILES)
+all-local: doxygen-doc
 else
-all-local: $(GENFILES)
+all-local:
 endif
 
-$(GENFILES): %: %.in Makefile
-       rm -f $@.tmp
-       sed < $@.in > $@.tmp \
-           -e 's:@-VERSION-@:${VERSION}:'
-       mv $@.tmp $@
+GENFILES = xmltooling.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
         cpp-xmltooling.sln \
@@ -39,5 +33,3 @@ EXTRA_DIST = $(DX_CONFIG) \
         $(GENFILES:%=%.in) \
         depend \
         postinstall
-
-DISTCLEANFILES = $(GENFILES)

diff --git a/Portfile.in b/Portfile.in
index 4a6b118..ecebc3a 100644 (file)
--- a/Portfile.in
+++ b/Portfile.in
@@ -1,24 +1,29 @@
 PortSystem 1.0
 
-name               xmltooling
-version            @-VERSION-@
-categories         shibboleth
-maintainers        cantor.2@osu.edu
-description        XMLTooling library for C++
-long_description   Toolkit for security-aware XML processing
-homepage           http://www.opensaml.org/
-master_sites       http://shibboleth.internet2.edu/downloads/opensaml/cpp/@-VERSION-@/
-checksums          sha1 @CHECKSUM@
+name                @PACKAGE@
+version             @PACKAGE_VERSION@
+categories          security textproc xml shibboleth
+maintainers         snc scantor
+description         XMLTooling library for C++
+long_description    Toolkit for security-aware XML processing
+homepage            http://www.opensaml.org/
+  
+platforms           darwin
+depends_lib         port:curl \
+                    port:xercesc3 \
+                    port:xml-security-c \
+                    port:log4shib
 
-configure.args     --disable-static \
-                   --with-log4shib=${prefix} \
-                   --with-openssl=${prefix} \
-                   --with-curl=${prefix} \
-                   --with-xerces=${prefix} \
-                   --with-xmlsec=${prefix}
-
-
-depends_lib        port:curl \
-                   port:xercesc \
-                   port:xml-security-c \
-                   port:log4shib
+master_sites        http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2/
+checksums           sha1 @CHECKSUM@
+  
+configure.args      --disable-static \
+                    --with-openssl=${prefix} \
+                    --with-curl=${prefix} \
+                    --with-xerces=${prefix} \
+                    --with-xmlsec=${prefix}
+  
+  
+livecheck.check     regex
+livecheck.url       http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/mac/ports/shibboleth/xmltooling/Portfile
+livecheck.regex     "version *(\\d+\\.\\d+(\\.\\d+)?)"

diff --git a/configure.ac b/configure.ac
index ee72165..560d804 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -364,5 +364,7 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
 LIBTOOL="$LIBTOOL --silent"
 
-# output makefiles
-AC_OUTPUT(Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile)
+# output packaging and makefiles
+AC_CONFIG_FILES([xmltooling.spec pkginfo Portfile])
+AC_CONFIG_FILES([Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile])
+AC_OUTPUT

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f40c98f..7ad576f 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,12 +3,11 @@ AUTOMAKE_OPTIONS = foreign
 pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
 
 install-data-hook:
-    rm -rf $(DESTDIR)$(pkgdocdir)/api
-    cp -r doc/api $(DESTDIR)$(pkgdocdir)
-    rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`
+       cp -r api $(DESTDIR)$(pkgdocdir)
+       rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`
 
 docfiles = \
-    README.txt \
+       README.txt \
        LICENSE.txt \
        NOTICE.txt \
        OPENSSL.LICENSE \

diff --git a/doc/README.txt b/doc/README.txt
index 81ece25..a136e2a 100644 (file)
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -1,20 +1,20 @@
-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=10161&status=5&status=6&sorter/field=issuekey&sorter/order=ASC\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
+VERSION 1.2.1
+
+Issues addressed by this release:
+---------------------------------
+https://bugs.internet2.edu/jira/secure/IssueNavigator.jspa?reset=true&&pid=10009&fixfor=10230&status=5&status=6&sorter/field=issuekey&sorter/order=ASC
+
+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/pkginfo.in b/pkginfo.in
index 76b88a6..f2e85c0 100644 (file)
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -1,6 +1,6 @@
 PKG=SHIBxmltool
-VERSION=@-VERSION-@
-NAME=xmltooling-c
+VERSION=@PACKAGE_VERSION@
+NAME=@PACKAGE@-c
 CATEGORY=application,textproc,security
 DESC=Library for DOM processing with Signature/Encryption for C++
 VENDOR=Internet2

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 11c6912..bdfd9a6 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -1,5 +1,5 @@
-Name:          xmltooling
-Version:       @-VERSION-@
+Name:          @PACKAGE@
+Version:       @PACKAGE_VERSION@
 Release:       1
 Summary:    OpenSAML XMLTooling library
 Group:         System Environment/Libraries
@@ -9,16 +9,18 @@ URL:          http://www.opensaml.org/
 Source:            %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %if 0%{?suse_version} > 1030
-%define libpkgprefix lib
 BuildRequires:  libXerces-c-devel >= 2.8.0
+BuildRequires:  libxml-security-c-devel >= 1.4.0
+%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
+%{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
 %else
-%define libpkgprefix
 BuildRequires:  xerces%{?xercesver}-c-devel >= 2.8.0
+BuildRequires:  xml-security-c-devel >= 1.4.0
+%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
+%{!?_with_log4cpp:BuildRequires: log4shib-devel}
 %endif
-BuildRequires: %{libpkgprefix}xml-security-c-devel >= 1.4.0
 BuildRequires: gcc-c++, openssl-devel, curl-devel >= 7.10.6
-%{?_with_log4cpp:BuildRequires:        %{libpkgprefix}log4cpp-devel >= 1.0}
-%{!?_with_log4cpp:BuildRequires: %{libpkgprefix}log4shib-devel}
+%{!?_without_doxygen:BuildRequires: doxygen}
 
 %if "%{_vendor}" == "suse"
 %define pkgdocdir %{_docdir}/%{name}
@@ -34,12 +36,12 @@ classes to add value around the DOM, as well as signing and encryption
 support.
 
 %if 0%{?suse_version} > 1030
-%package -n libxmltooling12
+%package -n lib@PACKAGE@3
 Summary:    OpenSAML XMLTooling library
 Group:      Development/Libraries
-Provides:   xmltooling = %{version}
+Provides:   @PACKAGE@ = %{version}
 
-%description -n libxmltooling12
+%description -n lib@PACKAGE@3
 The XMLTooling library contains generic XML parsing and processing
 classes based on the Xerces-C DOM. It adds more powerful facilities
 for declaring element- and type-specific API and implementation
@@ -50,8 +52,8 @@ This package contains just the shared library.
 %endif
 
 %if 0%{?suse_version} > 1030
-%package -n libxmltooling-devel
-Requires: libxmltooling12 = %version
+%package -n lib@PACKAGE@-devel
+Requires: lib@PACKAGE@3 = %version
 %else
 %package devel
 Requires: %name = %version
@@ -60,19 +62,21 @@ Summary: XMLTooling development Headers
 Group: Development/Libraries
 %if 0%{?suse_version} > 1030
 Requires: libXerces-c-devel >= 2.8.0
+Requires: libxml-security-c-devel >= 1.4.0
+%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
+%{!?_with_log4cpp:Requires: liblog4shib-devel}
 %else
 Requires: xerces%{?xercesver}-c-devel >= 2.8.0
+Requires: xml-security-c-devel >= 1.4.0
+%{?_with_log4cpp:Requires: log4cpp-devel >= 1.0}
+%{!?_with_log4cpp:Requires: log4shib-devel}
 %endif
-Requires: %{libpkgprefix}xml-security-c-devel >= 1.4.0
 Requires: openssl-devel, curl-devel >= 7.10.6
-%{?_with_log4cpp:Requires: %{libpkgprefix}log4cpp-devel >= 1.0}
-%{!?_with_log4cpp:Requires: %{libpkgprefix}log4shib-devel}
 
 %if 0%{?suse_version} > 1030
-%description -n libxmltooling-devel
-Requires: libxmltooling12 = %version
+%description -n lib@PACKAGE@-devel
 %else
-%description
+%description devel
 %endif
 The XMLTooling library contains generic XML parsing and processing
 classes based on the Xerces-C DOM. It adds more powerful facilities
@@ -80,19 +84,19 @@ for declaring element- and type-specific API and implementation
 classes to add value around the DOM, as well as signing and encryption
 support.
 
-This package includes files needed for development with xmltooling.
+This package includes files needed for development with XMLTooling.
 
 %prep
 %setup -q
 
 %build
-%configure %{?xmltooling_options}
+%configure %{?@PACKAGE@_options}
 %{__make}
 
 %install
 %{__make} install DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
 # Don't package unit tester if present.
-%{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest
+%{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/@PACKAGE@test
 
 %check
 %{__make} check
@@ -102,7 +106,7 @@ This package includes files needed for development with xmltooling.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%post -n libxmltooling12 -p /sbin/ldconfig
+%post -n lib@PACKAGE@3 -p /sbin/ldconfig
 %else
 %post -p /sbin/ldconfig
 %endif
@@ -110,39 +114,31 @@ This package includes files needed for development with xmltooling.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%postun -n libxmltooling12 -p /sbin/ldconfig
+%postun -n lib@PACKAGE@3 -p /sbin/ldconfig
 %else
 %postun -p /sbin/ldconfig
 %endif
 %endif
 
 %if 0%{?suse_version} > 1030
-%files -n libxmltooling12
+%files -n lib@PACKAGE@3
 %else
 %files
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libxmltooling.so.*
-%{_libdir}/libxmltooling-lite.so.*
-%dir %{_datadir}/xml/xmltooling
-%{_datadir}/xml/xmltooling
+%{_libdir}/*.so.*
+%dir %{_datadir}/xml/@PACKAGE@
+%{_datadir}/xml/@PACKAGE@/*
 
 %if 0%{?suse_version} > 1030
-%files -n libxmltooling-devel
+%files -n lib@PACKAGE@-devel
 %else
 %files devel
 %endif
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
-%docdir %{_datadir}/doc/xmltooling
-%{_datadir}/doc/xmltooling/README.txt
-%{_datadir}/doc/xmltooling/LICENSE.txt
-%{_datadir}/doc/xmltooling/NOTICE.txt
-%{_datadir}/doc/xmltooling/CURL.LICENSE
-%{_datadir}/doc/xmltooling/LOG4CPP.LICENSE
-%{_datadir}/doc/xmltooling/OPENSSL.LICENSE
-%doc %{_datadir}/doc/xmltooling/api
+%doc %{pkgdocdir}
 
 %changelog
 * Thu Aug 6 2009  Scott Cantor  <cantor.2@osu.edu>  - 1.2.1-1

diff --git a/xmltooling/security/AbstractPKIXTrustEngine.h b/xmltooling/security/AbstractPKIXTrustEngine.h
index 617bb47..9c6ef91 100644 (file)
--- a/xmltooling/security/AbstractPKIXTrustEngine.h
+++ b/xmltooling/security/AbstractPKIXTrustEngine.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.
@@ -53,6 +53,7 @@ namespace xmltooling {
          */
         AbstractPKIXTrustEngine(const xercesc::DOMElement* e=NULL);
 
+        /** Flag controls whether every issuer in the trust path must have a CRL loaded. */
         bool m_fullCRLChain;
         
         /**

diff --git a/xmltooling/soap/impl/SOAPClient.cpp b/xmltooling/soap/impl/SOAPClient.cpp
index 9082d41..43e4c19 100644 (file)
--- a/xmltooling/soap/impl/SOAPClient.cpp
+++ b/xmltooling/soap/impl/SOAPClient.cpp
@@ -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.
@@ -109,8 +109,8 @@ Envelope* SOAPClient::receive()
     
     auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
     janitor.release();
-    if (!m_validate)
-        SchemaValidators.validate(xmlObject.get());
+
+    SchemaValidators.validate(xmlObject.get());
 
     Envelope* env = dynamic_cast<Envelope*>(xmlObject.get());
     if (!env)