Updated for 1.2

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

diff --git a/installshield/Component Definitions/Default.fgl b/installshield/Component Definitions/Default.fgl
index 570b006..991a82b 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.10.000\r
+Version=1.20.000\r
 \r

diff --git a/installshield/File Groups/Default.fdf b/installshield/File Groups/Default.fdf
index 25944b3..2614dca 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.00.000\r
+Version=1.20.000\r
 Name=\r
 \r
 [shibboleth]\r

diff --git a/installshield/File Groups/shibboleth.fgl b/installshield/File Groups/shibboleth.fgl
index d2a86a9..296ddd3 100644 (file)
--- a/installshield/File Groups/shibboleth.fgl
+++ b/installshield/File Groups/shibboleth.fgl
@@ -1,8 +1,9 @@
 [libexec]
 file0=..\isapi_shib\Release\isapi_shib.dll
-file1=..\mod_shibrm\Release\mod_shibrm.dll
-file2=..\mod_shire\Release\mod_shire.dll
-file3=..\shib-mysql-ccache\Release\shib-mysql-ccache.dll
+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
 SubDir0=libexec\debug
 
 [include\rpc]
@@ -27,44 +28,42 @@ file0=\mysql-4.0.13\share\english\errmsg.sys
 file1=\mysql-4.0.13\share\english\errmsg.txt
 
 [lib\debug]
-file15=..\..\..\opensaml\c\saml\Debug\saml_4D.dll
-file16=..\shib-target\Debug\shibtarget_4D.lib
-file0=\libapreq-1.3\c\Debug\libapreq.lib
-file17=..\shib-target\Debug\shibtarget_4D.dll
-file1=\libapreq-1.3\c\Debug\libapreq.dll
-file18=..\shib\Debug\shib_5D.lib
-file2=\curl-7.10.8\lib\libcurld.lib
-file19=..\shib\Debug\shib_5D.dll
-file3=\curl-7.10.8\lib\libcurld.dll
-file4=\openssl-0.9.7c\out32dll.dbg\ssleay32.lib
-file5=\openssl-0.9.7c\out32dll.dbg\libeay32.lib
-file6=\openssl-0.9.7c\out32dll.dbg\ssleay32.dll
-file7=\openssl-0.9.7c\out32dll.dbg\libeay32.dll
+file2=\curl-7.11.1\lib\libcurld.lib
+file3=\curl-7.11.1\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
 file9=\log4cpp-0.3.4b\msvc6\log4cppDLL\Debug\log4cppD.lib
-file20=\xerces-c2_4_0-win32\bin\xerces-c_2_4_0D.dll
-file21=\xerces-c2_4_0-win32\lib\xerces-c_2D.lib
+file20=\xerces-c2_5_0-win32\bin\xerces-c_2_5_0D.dll
+file21=\xerces-c2_5_0-win32\lib\xerces-c_2D.lib
 file10=\log4cpp-0.3.4b\msvc6\log4cppDLL\Debug\log4cppD.dll
-file22=\xml-security-c-1.0.0\Build\Win32\VC6\Debug\xsec_1D.lib
+file22=\xml-security-c-1.1.0\Build\Win32\VC6\Debug\xsec_1D.lib
 file11=\log4cpp-0.3.4b\msvc6\log4cppDLL\Debug\NTEventLogAppender.dll
-file23=\xml-security-c-1.0.0\Build\Win32\VC6\Debug\xsec_1_0_0D.dll
+file23=\xml-security-c-1.1.0\Build\Win32\VC6\Debug\xsec_1_1_0D.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
 
 [bin]
+file0=\openssl-0.9.7d\out32dll\openssl.exe
 file15=..\posttest\Release\posttest.exe
 file16=..\oncrpc\Release\oncrpc.dll
-file0=\libapreq-1.3\c\Release\libapreq.dll
 file17=\log4cpp-0.3.4b\msvc6\log4cppDLL\Release\NTEventLogAppender.dll
-file1=\xml-security-c-1.0.0\Build\Win32\VC6\Release\xsec_1_0_0.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
-file2=\xerces-c2_4_0-win32\bin\xerces-c_2_4_0.dll
-file3=\openssl-0.9.7c\out32dll\ssleay32.dll
-file4=\curl-7.10.8\lib\libcurl.dll
-file5=\openssl-0.9.7c\out32dll\libeay32.dll
+file2=\xerces-c2_5_0-win32\bin\xerces-c_2_5_0.dll
+file3=\openssl-0.9.7d\out32dll\ssleay32.dll
+file4=\curl-7.11.1\lib\libcurl.dll
+file5=\openssl-0.9.7d\out32dll\libeay32.dll
 file6=\log4cpp-0.3.4b\msvc6\log4cppDLL\Release\log4cpp.dll
-file7=\openssl-0.9.7c\out32dll\openssl.exe
+file7=\openssl-0.9.7d\out32dll\openssl.exe
 SubDir0=bin\debug
 file8=..\siterefresh\Release\siterefresh.exe
 file9=..\..\..\opensaml\c\test\Release\signtest.exe
@@ -93,13 +92,15 @@ file4=..\..\..\opensaml\c\doc\LOG4CPP.LICENSE
 file5=..\..\..\opensaml\c\doc\NEWS.txt
 file6=..\..\..\opensaml\c\doc\OPENSSL.LICENSE
 file7=..\..\..\opensaml\c\doc\README.txt
+file8=..\..\..\opensaml\c\doc\INSTALL-WIN32.txt
 
 [include\saml]
 file0=..\..\..\opensaml\c\saml\saml.h
 file1=..\..\..\opensaml\c\saml\config_pub_win32.h
+file2=..\..\..\opensaml\c\saml\version.h
 
 [etc\shibboleth]
-file15=..\configs\shibboleth.ini.in
+file15=..\configs\shibboleth.xml.in
 file16=..\configs\shibboleth.logger
 file0=..\schemas\xmldsig-filter2.xsd
 file17=..\configs\shire.logger.in
@@ -115,17 +116,22 @@ file7=..\schemas\xmldsig-core-schema.xsd
 file8=..\schemas\cs-sstc-schema-assertion-01.xsd
 file9=..\configs\trust.xml
 file20=..\configs\AAP.xml
-file21=..\configs\internet2.pem
+file21=..\configs\inqueue.pem
 file10=..\configs\accessError.html
 file11=..\configs\apache.config.in
-file12=..\configs\creds.xml.in
+file12=..\schemas\credentials.xsd
 file13=..\configs\rmError.html
 file14=..\configs\shar.logger.in
-file22=\openssl-0.9.7c\apps\openssl.cnf
+file22=\openssl-0.9.7d\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
 
 [include\shib]
 file0=..\shib\shib.h
+file1=..\shib\shib-threads-win32.h
 
 [TopDir]
 SubDir0=bin
@@ -136,10 +142,17 @@ SubDir4=include
 SubDir5=lib
 SubDir6=libexec
 SubDir7=share
+SubDir8=var
 
 [share]
 SubDir0=share\english
 
+[var]
+SubDir0=var\log
+
+[var\log]
+SubDir0=var\log\shibboleth
+
 [doc\shibboleth]
 file0=..\doc\CREDITS.txt
 file1=..\doc\CURL.LICENSE
@@ -155,9 +168,11 @@ file10=..\doc\NEWS.txt
 file11=..\doc\OPENSSL.LICENSE
 file12=..\doc\README.txt
 file13=..\doc\UPGRADE-GUIDE.html
+file14=..\doc\main.css
+file15=..\doc\logo.jpg
 
 [bin\debug]
-file0=\openssl-0.9.7c\out32dll.dbg\openssl.exe
+file0=\openssl-0.9.7d\out32dll.dbg\openssl.exe
 file1=..\posttest\Debug\posttest.exe
 file2=..\shar\Debug\shar.exe
 file3=..\shibtest\Debug\shibtest.exe
@@ -168,13 +183,14 @@ file5=..\siterefresh\Debug\siterefresh.exe
 
 [General]
 Type=FILELIST
-Version=1.10.000
+Version=1.20.000
 
 [libexec\debug]
-file0=..\isapi_shib\Debug\isapi_shib.dll
-file1=..\mod_shibrm\Debug\mod_shibrm.dll
-file2=..\mod_shire\Debug\mod_shire.dll
-file3=..\shib-mysql-ccache\Debug\shib-mysql-ccache.dll
+file0=..\isapi_shib\Release\isapi_shib.dll
+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
@@ -189,26 +205,24 @@ file7=..\..\..\opensaml\c\schemas\cs-sstc-schema-assertion-01.xsd
 [lib]
 file15=..\shib-target\Release\shibtarget_4.dll
 file16=..\shib\Release\shib_5.lib
-file0=\libapreq-1.3\c\Release\libapreq.dll
 file17=..\shib\Release\shib_5.dll
-file1=\libapreq-1.3\c\Release\libapreq.lib
-file18=\openssl-0.9.7c\out32dll\ssleay32.lib
-file2=\curl-7.10.8\lib\libcurl.lib
-file19=\openssl-0.9.7c\out32dll\ssleay32.dll
-file3=\curl-7.10.8\lib\libcurl.dll
-file4=\openssl-0.9.7c\out32dll\libeay32.lib
-file5=\openssl-0.9.7c\out32dll\libeay32.dll
+file18=\openssl-0.9.7d\out32dll\ssleay32.lib
+file2=\curl-7.11.1\lib\libcurl.lib
+file19=\openssl-0.9.7d\out32dll\ssleay32.dll
+file3=\curl-7.11.1\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
 file7=\log4cpp-0.3.4b\msvc6\log4cppDLL\Release\log4cpp.lib
 SubDir0=lib\debug
 file8=\log4cpp-0.3.4b\msvc6\log4cppDLL\Release\log4cpp.dll
 file9=\log4cpp-0.3.4b\msvc6\log4cppDLL\Release\NTEventLogAppender.dll
-file20=\xerces-c2_4_0-win32\lib\xerces-c_2.lib
-file21=\xerces-c2_4_0-win32\bin\xerces-c_2_4_0.dll
+file20=\xerces-c2_5_0-win32\lib\xerces-c_2.lib
+file21=\xerces-c2_5_0-win32\bin\xerces-c_2_5_0.dll
 file10=..\oncrpc\Release\oncrpc.lib
 file11=..\oncrpc\Release\oncrpc.dll
-file22=\xml-security-c-1.0.0\Build\Win32\VC6\Release\xsec_1.lib
-file23=\xml-security-c-1.0.0\Build\Win32\VC6\Release\xsec_1_0_0.dll
+file22=\xml-security-c-1.1.0\Build\Win32\VC6\Release\xsec_1.lib
+file23=\xml-security-c-1.1.0\Build\Win32\VC6\Release\xsec_1_1_0.dll
 file12=..\..\..\opensaml\c\saml\Release\saml_4.dll
 file13=..\..\..\opensaml\c\saml\Release\saml_4.lib
 file14=..\shib-target\Release\shibtarget_4.lib
@@ -216,7 +230,6 @@ file14=..\shib-target\Release\shibtarget_4.lib
 [include\shib-target]
 file0=..\shib-target\shib-target.h
 file1=..\shib-target\shibrpc.h
-file2=..\shib-target\ccache-utils.h
 
 [etc]
 SubDir0=etc\opensaml

diff --git a/installshield/Registry Entries/Default.rge b/installshield/Registry Entries/Default.rge
index 7b63ed1..18fce9b 100644 (file)
--- a/installshield/Registry Entries/Default.rge
+++ b/installshield/Registry Entries/Default.rge
@@ -1,4 +1,4 @@
 [General]\r
 Type=REGISTRYDATA\r
-Version=1.00.000\r
+Version=1.20.000\r
 \r

diff --git a/installshield/Script Files/setup.rul b/installshield/Script Files/setup.rul
index 3235e0e..580f9a0 100644 (file)
--- a/installshield/Script Files/setup.rul
+++ b/installshield/Script Files/setup.rul
@@ -369,55 +369,47 @@ begin
        // Rename the Unix-preinstall files
        svOldTargetDir = TARGETDIR;
        TARGETDIR = SRCDIR;
-       RenameFile("shibboleth.ini.in", "shibboleth.ini");
+       RenameFile("shibboleth.xml.in", "shibboleth.xml");
        RenameFile("shar.logger.in", "shar.logger");
        RenameFile("shire.logger.in", "shire.logger");
        RenameFile("apache.config.in", "apache.config");
        RenameFile("apache2.config.in", "apache2.config");
-       RenameFile("creds.xml.in", "creds.xml");
        TARGETDIR = svOldTargetDir;
        
        // Update config files for Windows
-       svFileName = "shibboleth.ini";
-       ReplaceTextInFile(svFileName, "sharsocket=/tmp/shar-socket", "sharsocket=127.0.0.1:" + svSharPort);     
-       ReplaceTextInFile(svFileName, "shib-mysql-ccache.so", "shib-mysql-ccache.dll");
+       svFileName = "shibboleth.xml";
+       ReplaceTextInFile(svFileName,
+               "<UnixListener address=\"/tmp/shar-socket\"/>",
+               "<!-- <UnixListener address=\"/tmp/shar-socket\"/> -->"
+               );
+       ReplaceTextInFile(svFileName,
+               "<!-- <TCPListener address=\"127.0.0.1\" port=\"12345\" acl=\"127.0.0.1\"/> -->",
+               "<TCPListener address=\"127.0.0.1\" port=\"" + svSharPort + "\" acl=\"127.0.0.1\"/>"
+               );
        ReplaceTextInFile(svFileName, "@-PKGSYSCONFDIR-@", svDirectory + "/etc/shibboleth");
        ReplaceTextInFile(svFileName, "@-LIBEXECDIR-@", svDirectory + "/libexec");
-       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/etc/shibboleth");
+       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/var/log/shibboleth");
        ReplaceTextInFile(svFileName, "@-PREFIX-@", svDirectory);
+
        svFileName = "shar.logger";
-       ReplaceTextInFile(svFileName, "@-PKGSYSCONFDIR-@", svDirectory + "/etc/shibboleth");
-       ReplaceTextInFile(svFileName, "@-LIBEXECDIR-@", svDirectory + "/libexec");
-       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/etc/shibboleth");
-       ReplaceTextInFile(svFileName, "@-PREFIX-@", svDirectory);
+       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/var/log/shibboleth");
+       svFileName = "shire.logger";
+       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/var/log/shibboleth");
+
        svFileName = "apache.config";
-       ReplaceTextInFile(svFileName, "mod_shibrm.so", "mod_shibrm.dll");
-       ReplaceTextInFile(svFileName, "mod_shire.so", "mod_shire.dll");
        ReplaceTextInFile(svFileName, "@-PKGSYSCONFDIR-@", svDirectory + "/etc/shibboleth");
        ReplaceTextInFile(svFileName, "@-LIBEXECDIR-@", svDirectory + "/libexec");
-       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/etc/shibboleth");
+       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/var/log/shibboleth");
        ReplaceTextInFile(svFileName, "@-PREFIX-@", svDirectory);
        svFileName = "apache2.config";
-       ReplaceTextInFile(svFileName, "mod_apreq.so", "mod_apreq.dll");
-       ReplaceTextInFile(svFileName, "mod_shib.so", "mod_shib.dll");
        ReplaceTextInFile(svFileName, "@-PKGSYSCONFDIR-@", svDirectory + "/etc/shibboleth");
        ReplaceTextInFile(svFileName, "@-LIBEXECDIR-@", svDirectory + "/libexec");
-       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/etc/shibboleth");
-       ReplaceTextInFile(svFileName, "@-PREFIX-@", svDirectory);
-       svFileName = "shire.logger";
-       ReplaceTextInFile(svFileName, "@-PKGSYSCONFDIR-@", svDirectory + "/etc/shibboleth");
-       ReplaceTextInFile(svFileName, "@-LIBEXECDIR-@", svDirectory + "/libexec");
-       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/etc/shibboleth");
-       ReplaceTextInFile(svFileName, "@-PREFIX-@", svDirectory);
-       svFileName = "creds.xml";
-       ReplaceTextInFile(svFileName, "@-PKGSYSCONFDIR-@", svDirectory + "/etc/shibboleth");
-       ReplaceTextInFile(svFileName, "@-LIBEXECDIR-@", svDirectory + "/libexec");
-       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/etc/shibboleth");
+       ReplaceTextInFile(svFileName, "@-LOGDIR-@", svDirectory + "/var/log/shibboleth");
        ReplaceTextInFile(svFileName, "@-PREFIX-@", svDirectory);
        Delay(2);
-       SdShowMsg("",FALSE);    
+       SdShowMsg("",FALSE);
 
-       // Install the shar as a service if so directed 
+       // Install the shar as a service if so directed
        if (bInstallSharAsService = TRUE) then
                SdShowMsg("Installing the shar service...", TRUE);      
                // Remove any existing Default shar service install
@@ -426,10 +418,11 @@ begin
                nResult = LaunchAppAndWait(svSharExe, svSharInstallParms, WAIT);
                // Now install the new Default                  
                svSharExe = TARGETDIR + "\\bin\\shar.exe";
-               svSharInstallParms = "-install Default -config " + (TARGETDIR + "\\etc\\shibboleth\\shibboleth.ini");
+               svSharInstallParms = "-install Default -config " + (TARGETDIR + "\\etc\\shibboleth\\shibboleth.xml -schemadir ") +
+                       (TARGETDIR + "\\etc\shibboleth");
                nResult = LaunchAppAndWait(svSharExe, svSharInstallParms, WAIT);        
                if (nResult < 0) then
-                       MessageBox("Shar service installation FAILED!", WARNING);
+                       MessageBox("SHAR service installation FAILED!", WARNING);
                endif;                  
                Delay(2);
                SdShowMsg("",FALSE);            
@@ -971,10 +964,12 @@ end;
 ////////////////////////////////////////////////////////////////////////////////
 function AddShibConfigEnvironmentVar()
        NUMBER nResult;
+       NUMBER nResult2;
        NUMBER nvType;
        NUMBER nvSize;
        STRING szKey;
        STRING svShibConfigPath;
+       STRING svShibSchemaPath;
        STRING szEnv;
        POINTER pEnv;
        
@@ -982,16 +977,18 @@ begin
 
        Disable(LOGGING) ;
 
-       svShibConfigPath = TARGETDIR + "\\etc\\shibboleth\\shibboleth.ini"; // The string you want to store in Shibconfig environment variable
        szKey="SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment";
+       svShibConfigPath = TARGETDIR + "\\etc\\shibboleth\\shibboleth.xml";
+       svShibSchemaPath = TARGETDIR + "\\etc\\shibboleth";
 
        RegDBSetDefaultRoot(HKEY_LOCAL_MACHINE);
 
        // Set the Shibconfig environment variable
-       nResult=RegDBSetKeyValueEx(szKey,"ShibConfig",REGDB_STRING_EXPAND,svShibConfigPath,-1);
+       nResult=RegDBSetKeyValueEx(szKey,"SHIBCONFIG",REGDB_STRING_EXPAND,svShibConfigPath,-1);
+       nResult2=RegDBSetKeyValueEx(szKey,"SHIBSCHEMAS",REGDB_STRING_EXPAND,svShibSchemaPath,-1);
 
        if (nResult < 0) then
-               MessageBox("Setup was unable to add the Shibconfig environment variable!",WARNING);             
+               MessageBox("Setup was unable to add the SHIBCONFIG/SHIBSCHEMAS environment variables!",WARNING);
        else
                // Flush the NT registry to all applications.   
                szEnv = "Environment";

diff --git a/installshield/Setup Files/Compressed Files/Language Independent/OS Independent/license.txt b/installshield/Setup Files/Compressed Files/Language Independent/OS Independent/license.txt
index 494e341..2dc2dc8 100644 (file)
--- a/installshield/Setup Files/Compressed Files/Language Independent/OS Independent/license.txt
+++ b/installshield/Setup Files/Compressed Files/Language Independent/OS Independent/license.txt
@@ -1,5 +1,5 @@
 The Shibboleth License, Version 1. 
-Copyright (c) 2002 
+Copyright (c) 2002-2004
 University Corporation for Advanced Internet Development, Inc. 
 All rights reserved
 

diff --git a/installshield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp b/installshield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
index 76b0083..9c9e0e5 100644 (file)
Binary files a/installshield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp and b/installshield/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp differ

diff --git a/installshield/Shell Objects/Default.shl b/installshield/Shell Objects/Default.shl
index 27d9071..ffc0ab3 100644 (file)
--- a/installshield/Shell Objects/Default.shl
+++ b/installshield/Shell Objects/Default.shl
@@ -8,5 +8,5 @@ Folder2=<FOLDER_PROGRAMS>
 \r
 [Info]\r
 Type=ShellObject\r
-Version=1.00.000\r
+Version=1.20.000\r
 \r

diff --git a/installshield/Shibboleth.ipr b/installshield/Shibboleth.ipr
index a8062ee..237f38b 100644 (file)
--- a/installshield/Shibboleth.ipr
+++ b/installshield/Shibboleth.ipr
@@ -21,12 +21,12 @@ SummaryText=
 Department=
 Type=Internet Application
 Author=
-HomeURL=http://shibboleth.internet2.edu
+HomeURL=http://shibboleth.internet2.edu/
 InstallRoot=C:\cvs\shibboleth\c\installshield
 UpdateURL=http://
 set_level=Level 3
 InstallationGUID=844649c4-3072-41f2-a4bf-4774f9b6e675
-Version=1.1
+Version=1.2
 set_miffile=Status.mif
 set_args=
 set_maxerr=50

diff --git a/installshield/Shibboleth.pfw b/installshield/Shibboleth.pfw
index 67b4e92..cf4c38d 100644 (file)
--- a/installshield/Shibboleth.pfw
+++ b/installshield/Shibboleth.pfw
@@ -14,7 +14,7 @@ ApplicationName=Shibboleth
 Description=
 Comments=
 Notice=(c) UCAID, Inc.
-Version=1.1
+Version=1.2
 OutputSpec=Shibboleth.exe
 GUIDs=0
 Type=2

diff --git a/installshield/String Tables/0009-English/value.shl b/installshield/String Tables/0009-English/value.shl
index 16d4c40..330f139 100644 (file)
--- a/installshield/String Tables/0009-English/value.shl
+++ b/installshield/String Tables/0009-English/value.shl
@@ -1,18 +1,18 @@
 [Data]\r
-TITLE_MAIN=Shibboleth 1.1\r
+TITLE_MAIN=Shibboleth 1.2\r
 COMPANY_NAME=University Corporation for Advanced Internet Development, Inc.\r
 ERROR_COMPONENT=Component:\r
 COMPANY_NAME16=University Corporation for Advanced Internet Development\r
-PRODUCT_VERSION=1.1\r
+PRODUCT_VERSION=1.2\r
 ERROR_MOVEDATA=An error occurred during the move data process: %d\r
 ERROR_FILEGROUP=File Group:\r
-UNINST_KEY=Shibboleth 1.1\r
+UNINST_KEY=Shibboleth 1.2\r
 TITLE_CAPTIONBAR=Shibboleth Setup\r
 PRODUCT_NAME16=Shibboleth\r
 ERROR_VGARESOLUTION=This program requires VGA or better resolution.\r
 ERROR_FILE=File:\r
 FOLDER_NAME=Shibboleth\r
-UNINST_DISPLAY_NAME=Shibboleth 1.1\r
+UNINST_DISPLAY_NAME=Shibboleth 1.2\r
 PRODUCT_KEY=shar.exe\r
 PRODUCT_NAME=Shibboleth\r
 ERROR_UNINSTSETUP=unInstaller setup failed to initialize.  You may not be able to uninstall this product.\r
@@ -20,5 +20,5 @@ ERROR_UNINSTSETUP=unInstaller setup failed to initialize.  You may not be able t
 [General]\r
 Language=0009\r
 Type=STRINGTABLESPECIFIC\r
-Version=1.00.000\r
+Version=1.20.000\r
 \r