Renamed 2.0 source files to fix automake collision.

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 8b0ffcb..20c354f 100644 (file)
--- 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 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -243,48 +243,12 @@
                                                Name="impl"\r
                                                >\r
                                                <File\r
-                                                       RelativePath=".\saml2\core\impl\AssertionsImpl.cpp"\r
+                                                       RelativePath=".\saml2\core\impl\Assertions20Impl.cpp"\r
                                                        >\r
-                                                       <FileConfiguration\r
-                                                               Name="Debug|Win32"\r
-                                                               >\r
-                                                               <Tool\r
-                                                                       Name="VCCLCompilerTool"\r
-                                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                                               />\r
-                                                       </FileConfiguration>\r
-                                                       <FileConfiguration\r
-                                                               Name="Release|Win32"\r
-                                                               >\r
-                                                               <Tool\r
-                                                                       Name="VCCLCompilerTool"\r
-                                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                                               />\r
-                                                       </FileConfiguration>\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath=".\saml2\core\impl\AssertionsSchemaValidators.cpp"\r
+                                                       RelativePath=".\saml2\core\impl\Assertions20SchemaValidators.cpp"\r
                                                        >\r
-                                                       <FileConfiguration\r
-                                                               Name="Debug|Win32"\r
-                                                               >\r
-                                                               <Tool\r
-                                                                       Name="VCCLCompilerTool"\r
-                                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                                               />\r
-                                                       </FileConfiguration>\r
-                                                       <FileConfiguration\r
-                                                               Name="Release|Win32"\r
-                                                               >\r
-                                                               <Tool\r
-                                                                       Name="VCCLCompilerTool"\r
-                                                                       ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                                                       XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                                               />\r
-                                                       </FileConfiguration>\r
                                                </File>\r
                                        </Filter>\r
                                </Filter>\r

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