First cut for 1.3

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1629 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/installshield/Component Definitions/Default.fgl b/installshield/Component Definitions/Default.fgl
index 991a82b..a416acb 100644 (file)
--- a/installshield/Component Definitions/Default.fgl
+++ b/installshield/Component Definitions/Default.fgl
@@ -38,5 +38,5 @@ SubDir3=USERDEFINED
 \r
 [General]\r
 Type=FILELIST\r
-Version=1.20.000\r
+Version=1.30.000\r
 \r

diff --git a/installshield/File Groups/Default.fdf b/installshield/File Groups/Default.fdf
index 2614dca..7db7f2c 100644 (file)
--- a/installshield/File Groups/Default.fdf
+++ b/installshield/File Groups/Default.fdf
@@ -3,7 +3,7 @@ group0=shibboleth
 \r
 [Info]\r
 Type=FileGrp\r
-Version=1.20.000\r
+Version=1.30.000\r
 Name=\r
 \r
 [shibboleth]\r

diff --git a/installshield/File Groups/shibboleth.fgl b/installshield/File Groups/shibboleth.fgl
index 37e5d12..fd1b940 100644 (file)
--- a/installshield/File Groups/shibboleth.fgl
+++ b/installshield/File Groups/shibboleth.fgl
@@ -4,25 +4,9 @@ file1=..\apache\Release\mod_shib_13.so
 file2=..\apache\mod_shib20___Win32_Release\mod_shib_20.so
 file3=..\shib-mysql-ccache\Release\shib-mysql-ccache.so
 file4=..\xmlproviders\Release\xmlproviders.so
+file5=..\nsapi_shib\Release\nsapi_shib.dll
 SubDir0=libexec\debug
 
-[include\rpc]
-file0=..\oncrpc\rpc\clnt.h
-file1=..\oncrpc\rpc\auth_unix.h
-file2=..\oncrpc\rpc\bcopy.h
-file3=..\oncrpc\rpc\auth.h
-file4=..\oncrpc\rpc\Makefile.am
-file5=..\oncrpc\rpc\netdb.h
-file6=..\oncrpc\rpc\pmap_clnt.h
-file7=..\oncrpc\rpc\pmap_prot.h
-file8=..\oncrpc\rpc\pmap_rmt.h
-file9=..\oncrpc\rpc\rpc.h
-file10=..\oncrpc\rpc\rpc_msg.h
-file11=..\oncrpc\rpc\svc.h
-file12=..\oncrpc\rpc\svc_auth.h
-file13=..\oncrpc\rpc\types.h
-file14=..\oncrpc\rpc\xdr.h
-
 [share\english]
 file0=\mysql-4.0.13\share\english\errmsg.sys
 file1=\mysql-4.0.13\share\english\errmsg.txt
@@ -30,13 +14,13 @@ file1=\mysql-4.0.13\share\english\errmsg.txt
 [lib\debug]
 file0=\xml-security-c-1.1.0\Build\Win32\VC6\Debug\xsec_1_1_0D.dll
 file1=\xml-security-c-1.1.0\Build\Win32\VC6\Debug\xsec_1D.lib
-file2=\curl-7.12.2\lib\libcurld.lib
-file3=\curl-7.12.2\lib\libcurld.dll
-file4=\openssl-0.9.7d\out32dll.dbg\ssleay32.lib
-file5=\openssl-0.9.7d\out32dll.dbg\libeay32.lib
-file6=\openssl-0.9.7d\out32dll.dbg\ssleay32.dll
-file7=\openssl-0.9.7d\out32dll.dbg\libeay32.dll
-file8=\mysql-4.0.13\lib_debug\libmysqld.dll
+file2=\curl-7.13.1\lib\libcurld_imp.lib
+file3=\curl-7.13.1\lib\libcurld.dll
+file4=\openssl-0.9.7e\out32dll.dbg\ssleay32.lib
+file5=\openssl-0.9.7e\out32dll.dbg\libeay32.lib
+file6=\openssl-0.9.7e\out32dll.dbg\ssleay32.dll
+file7=\openssl-0.9.7e\out32dll.dbg\libeay32.dll
+file8=\mysql-4.1.10a\lib_debug\libmysqld.dll
 file9=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Debug\log4cppD.lib
 file20=\xerces-c2_6_1-win32\bin\xerces-c_2_6D.dll
 file21=\xerces-c2_6_1-win32\lib\xerces-c_2D.lib
@@ -44,45 +28,46 @@ file10=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Debug\log4cppD.dll
 file11=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Debug\NTEventLogAppender.dll
 file12=..\oncrpc\Debug\oncrpc.lib
 file13=..\oncrpc\Debug\oncrpc.dll
-file14=..\..\..\opensaml\c\saml\Debug\saml_4D.lib
-file15=..\..\..\opensaml\c\saml\Debug\saml_4D.dll
-file16=..\shib-target\Debug\shibtarget_4D.lib
-file17=..\shib-target\Debug\shibtarget_4D.dll
-file18=..\shib\Debug\shib_5D.lib
-file19=..\shib\Debug\shib_5D.dll
+file14=..\..\..\opensaml\c\saml\Debug\saml_5D.lib
+file15=..\..\..\opensaml\c\saml\Debug\saml_5D.dll
+file16=..\shib-target\Debug\shibtarget_5D.lib
+file17=..\shib-target\Debug\shibtarget_5D.dll
+file18=..\shib\Debug\shib_6D.lib
+file19=..\shib\Debug\shib_6D.dll
+
+[sbin]
+SubDir0=sbin\debug
+file0=..\shar\Release\shibd.exe
+file1=..\siterefresh\Release\siterefresh.exe
 
 [bin]
 file0=\openssl-0.9.7d\out32dll\openssl.exe
-file15=..\posttest\Release\posttest.exe
-file16=..\oncrpc\Release\oncrpc.dll
-file17=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Release\NTEventLogAppender.dll
+file13=..\oncrpc\Release\oncrpc.dll
+file14=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Release\NTEventLogAppender.dll
 file1=\xml-security-c-1.1.0\Build\Win32\VC6\Release\xsec_1_1_0.dll
-file18=\mysql-4.0.13\lib_release\libmysqld.dll
-file19=\curl-7.12.2\src\release\curl.exe
+file15=\mysql-4.1.10a\lib_release\libmysqld.dll
+file16=\curl-7.13.1\src\release\curl.exe
 file2=\xerces-c2_6_1-win32\bin\xerces-c_2_6.dll
-file3=\openssl-0.9.7d\out32dll\ssleay32.dll
-file4=\curl-7.12.2\lib\libcurl.dll
-file5=\openssl-0.9.7d\out32dll\libeay32.dll
+file3=\openssl-0.9.7e\out32dll\ssleay32.dll
+file4=\curl-7.13.1\lib\libcurl.dll
+file5=\openssl-0.9.7e\out32dll\libeay32.dll
 file6=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Release\log4cpp.dll
-file7=\openssl-0.9.7d\out32dll\openssl.exe
+file7=\openssl-0.9.7e\out32dll\openssl.exe
 SubDir0=bin\debug
-file8=..\siterefresh\Release\siterefresh.exe
-file9=..\..\..\opensaml\c\test\Release\signtest.exe
-file10=..\shib\Release\shib_5.dll
-file11=..\shibtest\Release\shibtest.exe
-file12=..\shib-target\Release\shibtarget_4.dll
-file13=..\shar\Release\shar.exe
-file14=..\..\..\opensaml\c\saml\Release\saml_4.dll
+file8=..\..\..\opensaml\c\test\Release\signtest.exe
+file9=..\shib\Release\shib_6.dll
+file10=..\shibtest\Release\shibtest.exe
+file11=..\shib-target\Release\shibtarget_5.dll
+file12=..\..\..\opensaml\c\saml\Release\saml_5.dll
 
 [doc]
 SubDir0=doc\opensaml
 SubDir1=doc\shibboleth
 
 [include]
-SubDir0=include\rpc
-SubDir1=include\saml
-SubDir2=include\shib
-SubDir3=include\shib-target
+SubDir0=include\saml
+SubDir1=include\shib
+SubDir2=include\shib-target
 
 [doc\opensaml]
 file0=..\..\..\opensaml\c\doc\CURL.LICENSE
@@ -99,40 +84,55 @@ file8=..\..\..\opensaml\c\doc\INSTALL-WIN32.txt
 file0=..\..\..\opensaml\c\saml\saml.h
 file1=..\..\..\opensaml\c\saml\config_pub_win32.h
 file2=..\..\..\opensaml\c\saml\version.h
+file3=..\..\..\opensaml\c\saml\SAMLDateTime.h
+file4=..\..\..\opensaml\c\saml\hresult.h
 
 [etc\shibboleth]
 file15=..\configs\shibboleth.xml.in
 file16=..\configs\shibboleth.logger
-file0=..\schemas\xmldsig-filter2.xsd
-file17=..\configs\shire.logger.in
-file1=..\schemas\cs-sstc-schema-assertion-1.1.xsd
-file18=..\configs\shireError.html
-file2=..\schemas\cs-sstc-schema-protocol-01.xsd
+file17=..\configs\native.logger.in
+file18=..\configs\sessionError.html
 file19=..\configs\IQ-sites.xml
-file3=..\schemas\cs-sstc-schema-protocol-1.1.xsd
-file4=..\schemas\shibboleth.xsd
-file5=..\schemas\soap-envelope.xsd
-file6=..\schemas\xml.xsd
-file7=..\schemas\xmldsig-core-schema.xsd
-file8=..\schemas\cs-sstc-schema-assertion-01.xsd
-file9=..\configs\IQ-trust.xml
-file20=..\configs\AAP.xml
+file20=..\configs\AAP.xml.in
 file21=..\configs\inqueue.pem
 file10=..\configs\accessError.html
 file11=..\configs\apache.config.in
-file12=..\schemas\credentials.xsd
 file13=..\configs\rmError.html
-file14=..\configs\shar.logger.in
-file22=\openssl-0.9.7d\apps\openssl.cnf
+file14=..\configs\shibd.logger.in
+file22=\openssl-0.9.7e\apps\openssl.cnf
 file23=..\configs\apache2.config.in
-file24=..\configs\shar.crt
-file25=..\configs\shar.key
-file26=..\schemas\shibboleth-targetconfig-1.0.xsd
-file27=..\schemas\shibboleth-trust-1.0.xsd
+file24=..\configs\sp-example.crt
+file25=..\configs\sp-example.key
+
+[share\xml\opensaml]
+file0=..\schemas\cs-sstc-schema-assertion-01.xsd
+file1=..\schemas\cs-sstc-schema-assertion-1.1.xsd
+file2=..\schemas\cs-sstc-schema-protocol-01.xsd
+file3=..\schemas\cs-sstc-schema-protocol-1.1.xsd
+file4=..\schemas\soap-envelope.xsd
+file5=..\schemas\xml.xsd
+file6=..\schemas\xmldsig-core-schema.xsd
+
+[share\xml\shibboleth]
+file0=..\schemas\cs-sstc-schema-assertion-01.xsd
+file1=..\schemas\cs-sstc-schema-assertion-1.1.xsd
+file2=..\schemas\cs-sstc-schema-protocol-01.xsd
+file3=..\schemas\cs-sstc-schema-protocol-1.1.xsd
+file5=..\schemas\soap-envelope.xsd
+file6=..\schemas\xml.xsd
+file7=..\schemas\xmldsig-core-schema.xsd
+file8=..\schemas\shibboleth-targetconfig-1.0.xsd
+file9=..\schemas\shibboleth-trust-1.0.xsd
+file10=..\schemas\shibboleth.xsd
+file11=..\schemas\credentials.xsd
+file12=..\schemas\saml-schema-metadata-2.0.xsd
+file13=..\schemas\saml-schema-assertion-2.0.xsd
+file14=..\schemas\shibboleth-metadata-1.0.xsd
 
 [include\shib]
 file0=..\shib\shib.h
 file1=..\shib\shib-threads.h
+file2=..\shib\hresult.h
 
 [TopDir]
 SubDir0=bin
@@ -144,9 +144,15 @@ SubDir5=lib
 SubDir6=libexec
 SubDir7=share
 SubDir8=var
+SubDir9=sbin
 
 [share]
 SubDir0=share\english
+SubDir1=share\xml
+
+[share\xml]
+SubDir0=share\xml\opensaml
+SubDir1=share\xml\shibboleth
 
 [var]
 SubDir0=var\log
@@ -171,20 +177,21 @@ file12=..\doc\README.txt
 file13=..\doc\main.css
 file14=..\doc\logo.jpg
 
+[sbin\debug]
+file0=..\shar\Debug\shibd.exe
+file1=..\siterefresh\Debug\siterefresh.exe
+
 [bin\debug]
-file0=\openssl-0.9.7d\out32dll.dbg\openssl.exe
-file1=..\posttest\Debug\posttest.exe
-file2=..\shar\Debug\shar.exe
-file3=..\shibtest\Debug\shibtest.exe
-file4=..\..\..\opensaml\c\test\Debug\signtest.exe
-file5=..\siterefresh\Debug\siterefresh.exe
-file6=\curl-7.12.2\src\debug\curl.exe
+file0=\openssl-0.9.7e\out32dll.dbg\openssl.exe
+file1=..\shibtest\Debug\shibtest.exe
+file2=..\..\..\opensaml\c\test\Debug\signtest.exe
+file3=\curl-7.13.1\src\debug\curl.exe
 
 [data]
 
 [General]
 Type=FILELIST
-Version=1.20.000
+Version=1.30.000
 
 [libexec\debug]
 file0=..\isapi_shib\Release\isapi_shib.dll
@@ -192,30 +199,21 @@ file1=..\apache\Debug\mod_shib_13.so
 file2=..\apache\mod_shib20___Win32_Debug\mod_shib_20.so
 file3=..\shib-mysql-ccache\Debug\shib-mysql-ccache.so
 file4=..\xmlproviders\Debug\xmlproviders.so
-
-[etc\opensaml]
-file0=..\..\..\opensaml\c\schemas\xmldsig-filter2.xsd
-file1=..\..\..\opensaml\c\schemas\cs-sstc-schema-assertion-1.1.xsd
-file2=..\..\..\opensaml\c\schemas\cs-sstc-schema-protocol-01.xsd
-file3=..\..\..\opensaml\c\schemas\cs-sstc-schema-protocol-1.1.xsd
-file4=..\..\..\opensaml\c\schemas\soap-envelope.xsd
-file5=..\..\..\opensaml\c\schemas\xml.xsd
-file6=..\..\..\opensaml\c\schemas\xmldsig-core-schema.xsd
-file7=..\..\..\opensaml\c\schemas\cs-sstc-schema-assertion-01.xsd
+file5=..\nsapi_shib\Release\nsapi_shib.dll
 
 [lib]
 file0=\xml-security-c-1.1.0\Build\Win32\VC6\Release\xsec_1.lib
 file1=\xml-security-c-1.1.0\Build\Win32\VC6\Release\xsec_1_1_0.dll
-file15=..\shib-target\Release\shibtarget_4.dll
-file16=..\shib\Release\shib_5.lib
-file17=..\shib\Release\shib_5.dll
-file18=\openssl-0.9.7d\out32dll\ssleay32.lib
-file2=\curl-7.12.2\lib\libcurl.lib
-file19=\openssl-0.9.7d\out32dll\ssleay32.dll
-file3=\curl-7.12.2\lib\libcurl.dll
-file4=\openssl-0.9.7d\out32dll\libeay32.lib
-file5=\openssl-0.9.7d\out32dll\libeay32.dll
-file6=\mysql-4.0.13\lib_release\libmysqld.dll
+file15=..\shib-target\Release\shibtarget_5.dll
+file16=..\shib\Release\shib_6.lib
+file17=..\shib\Release\shib_6.dll
+file18=\openssl-0.9.7e\out32dll\ssleay32.lib
+file2=\curl-7.13.1\lib\libcurl_imp.lib
+file19=\openssl-0.9.7e\out32dll\ssleay32.dll
+file3=\curl-7.13.1\lib\libcurl.dll
+file4=\openssl-0.9.7e\out32dll\libeay32.lib
+file5=\openssl-0.9.7e\out32dll\libeay32.dll
+file6=\mysql-4.1.10a\lib_release\libmysqld.dll
 file7=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Release\log4cpp.lib
 SubDir0=lib\debug
 file8=\log4cpp-0.3.5rc1\msvc6\log4cppDLL\Release\log4cpp.dll
@@ -224,15 +222,14 @@ file20=\xerces-c2_6_1-win32\lib\xerces-c_2.lib
 file21=\xerces-c2_6_1-win32\bin\xerces-c_2_6.dll
 file10=..\oncrpc\Release\oncrpc.lib
 file11=..\oncrpc\Release\oncrpc.dll
-file12=..\..\..\opensaml\c\saml\Release\saml_4.dll
-file13=..\..\..\opensaml\c\saml\Release\saml_4.lib
-file14=..\shib-target\Release\shibtarget_4.lib
+file12=..\..\..\opensaml\c\saml\Release\saml_5.dll
+file13=..\..\..\opensaml\c\saml\Release\saml_5.lib
+file14=..\shib-target\Release\shibtarget_5.lib
 
 [include\shib-target]
 file0=..\shib-target\shib-target.h
-file1=..\shib-target\shibrpc.h
+file1=..\shib-target\hresult.h
 
 [etc]
-SubDir0=etc\opensaml
-SubDir1=etc\shibboleth
+SubDir0=etc\shibboleth