From c88350c124d867ae1126c495acde8246065d3df9 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 30 May 2006 21:36:15 +0000
Subject: [PATCH] Renamed 2.0 source files to fix automake collision.

---
 saml/Makefile.am                                   |  6 ++--
 saml/saml.vcproj                                   | 40 ++--------------------
 .../{AssertionsImpl.cpp => Assertions20Impl.cpp}   |  0
 ...dators.cpp => Assertions20SchemaValidators.cpp} |  0
 4 files changed, 5 insertions(+), 41 deletions(-)
 rename saml/saml2/core/impl/{AssertionsImpl.cpp => Assertions20Impl.cpp} (100%)
 rename saml/saml2/core/impl/{AssertionsSchemaValidators.cpp => Assertions20SchemaValidators.cpp} (100%)

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 8b0ffcb..20c354f 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -20,7 +20,7 @@ libsamlinclude_HEADERS = \
 
 siginclude_HEADERS = \
     signature/ContentReference.h \
-    signature/SignableObject.h \ 
+    signature/SignableObject.h \
     signature/SignatureProfileValidator.h
 
 utilinclude_HEADERS = \
@@ -42,8 +42,8 @@ libsaml_la_SOURCES = \
     saml1/core/impl/AssertionsSchemaValidators.cpp \
     saml1/core/impl/ProtocolsImpl.cpp \
     saml1/core/impl/ProtocolsSchemaValidators.cpp \
-    saml2/core/impl/AssertionsImpl.cpp \
-    saml2/core/impl/AssertionsSchemaValidators.cpp \
+    saml2/core/impl/Assertions20Impl.cpp \
+    saml2/core/impl/Assertions20SchemaValidators.cpp \
     signature/ContentReference.cpp \
     signature/SignatureProfileValidator.cpp \
     util/SAMLConstants.cpp
diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 2fe8368..5e0939e 100644
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -243,48 +243,12 @@
 						Name="impl"
 						>
 						<File
-							RelativePath=".\saml2\core\impl\AssertionsImpl.cpp"
+							RelativePath=".\saml2\core\impl\Assertions20Impl.cpp"
 							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									ObjectFile="$(IntDir)\$(InputName)1.obj"
-									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									ObjectFile="$(IntDir)\$(InputName)1.obj"
-									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-								/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\saml2\core\impl\AssertionsSchemaValidators.cpp"
+							RelativePath=".\saml2\core\impl\Assertions20SchemaValidators.cpp"
 							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									ObjectFile="$(IntDir)\$(InputName)1.obj"
-									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									ObjectFile="$(IntDir)\$(InputName)1.obj"
-									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-								/>
-							</FileConfiguration>
 						</File>
 					</Filter>
 				</Filter>
diff --git a/saml/saml2/core/impl/AssertionsImpl.cpp b/saml/saml2/core/impl/Assertions20Impl.cpp
similarity index 100%
rename from saml/saml2/core/impl/AssertionsImpl.cpp
rename to saml/saml2/core/impl/Assertions20Impl.cpp
diff --git a/saml/saml2/core/impl/AssertionsSchemaValidators.cpp b/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
similarity index 100%
rename from saml/saml2/core/impl/AssertionsSchemaValidators.cpp
rename to saml/saml2/core/impl/Assertions20SchemaValidators.cpp
-- 
2.1.4