From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Tue, 9 Nov 2010 20:18:37 +0000 (+0000)
Subject: Fix up config file management for 2.4 release.
X-Git-Tag: 2.4.2~33
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=b8d1dcef59c5beb130942d3f828d70939bf6474f

Fix up config file management for 2.4 release.

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

diff --git a/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs
index fcfdfe7..5b70b0a 100644
--- a/msi/scripts/shib_edit_config_files.vbs
+++ b/msi/scripts/shib_edit_config_files.vbs
@@ -171,14 +171,6 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "shibboleth.logger", ConfigDir, false
   End If
 
-  If (NOT FileSystemObj.FileExists(ConfigDir & "example-metadata.xml")) then
-    FileSystemObj.CopyFile DistDir & "example-metadata.xml", ConfigDir, false
-  End If
-
-  If (NOT FileSystemObj.FileExists(ConfigDir & "example-shibboleth2.xml")) then
-    FileSystemObj.CopyFile DistDir & "example-shibboleth2.xml", ConfigDir, false
-  End If
-
   If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-map.xml")) then
     FileSystemObj.CopyFile DistDir & "attribute-map.xml", ConfigDir, false
   End If
@@ -191,7 +183,11 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "security-policy.xml", ConfigDir, false
   End If
 
-  ' Finally, fix up schema catalogs.
+  If (NOT FileSystemObj.FileExists(ConfigDir & "protocols.xml")) then
+    FileSystemObj.CopyFile DistDir & "protocols.xml", ConfigDir, false
+  End If
+  
+  'Finally, fix up schema catalogs.
   
   XMLDir = InstallDir & "\share\xml\xmltooling\"
   ConfigFile = XMLDir & "catalog.xml"