[cpp-sp] branch master updated: Remove accessError.html since it's no longer used by default.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=83d54e203fa11d8e026a9b77289314e0f2138f2b

The following commit(s) were added to refs/heads/master by this push:
       new  83d54e2   Remove accessError.html since it's no longer used by default.
83d54e2 is described below

commit 83d54e203fa11d8e026a9b77289314e0f2138f2b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 11 14:42:52 2018 -0400

    Remove accessError.html since it's no longer used by default.
---
 Projects/vc15/Shibboleth.sln               | 1 -
 configs/Makefile.am                        | 1 -
 msi/WiX/ShibbolethSP-defs-x86.wxi          | 1 -
 msi/WiX/ShibbolethSP-noarch.wxs            | 3 ---
 msi/scripts/shib_edit_config_files.vbs-wix | 4 ----
 5 files changed, 10 deletions(-)

diff --git a/Projects/vc15/Shibboleth.sln b/Projects/vc15/Shibboleth.sln
index a24df33..a1a4e96 100644
--- a/Projects/vc15/Shibboleth.sln
+++ b/Projects/vc15/Shibboleth.sln
@@ -42,7 +42,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{0F17
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BCFE-B3D7-4D08-AAA5-2E284903890E}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\configs\accessError.html = ..\..\configs\accessError.html
 		..\..\configs\apache.config.in = ..\..\configs\apache.config.in
 		..\..\configs\apache2.config.in = ..\..\configs\apache2.config.in
 		..\..\configs\apache22.config.in = ..\..\configs\apache22.config.in
diff --git a/configs/Makefile.am b/configs/Makefile.am
index 9493bb1..516d458 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -42,7 +42,6 @@ CONFIGFILES = \
 	example-shibboleth2.xml \
 	console.logger \
 	native.logger \
-	accessError.html \
 	attrChecker.html \
 	sessionError.html \
 	metadataError.html \
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 161e8b2..151cc0b 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -27,7 +27,6 @@
   <ComponentRef Id="partialLogout.html" />
   <ComponentRef Id="protocols.xml" />
   <ComponentRef Id="security_policy.xml" />
-  <ComponentRef Id="accessError.html" />
   <ComponentRef Id="apache.config.in" />
   <ComponentRef Id="apache2.config.in" />
   <ComponentRef Id="apache22.config.in" />
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 3451103..769b661 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -114,9 +114,6 @@
             <Component Id="security_policy.xml" Guid="{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}">
               <File KeyPath="yes" Name="security-policy.xml" />
             </Component>
-            <Component Id="accessError.html" Guid="{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}">
-              <File KeyPath="yes" Name="accessError.html" />
-            </Component>
             <Component Id="attrChecker.html" Guid="{BDF4837C-A887-4F1C-841C-DC13DFF8A46E}">
               <File KeyPath="yes" Name="attrChecker.html" />
             </Component>
diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index 0adf209..58e959c 100644
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -142,10 +142,6 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "native.logger", ConfigDir, false
   End If
 
-  If (NOT FileSystemObj.FileExists(ConfigDir & "accessError.html")) then
-    FileSystemObj.CopyFile DistDir & "accessError.html", ConfigDir, false
-  End If
-
   If (NOT FileSystemObj.FileExists(ConfigDir & "metadataError.html")) then
     FileSystemObj.CopyFile DistDir & "metadataError.html", ConfigDir, false
   End If

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.