Moved artifact source code into binding folders.

diff --git a/.cdtproject b/.cdtproject
index 1c5b930..7827afa 100644 (file)
--- a/.cdtproject
+++ b/.cdtproject
@@ -60,7 +60,9 @@
 <pathentry include="C:/cxxtest" kind="inc" path="" system="true"/>\r
 <pathentry kind="out" path=""/>\r
 <pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>\r
-<pathentry excluding="util/|saml1/|signature/|saml2/|encryption/|security/|security/impl/|saml1/binding/|saml1/binding/impl/|saml2/binding/|saml2/binding/impl/" kind="src" path="saml"/>\r
+<pathentry excluding="util/|saml1/|signature/|saml2/|encryption/|security/|security/impl/|saml1/binding/|saml1/binding/impl/|saml2/binding/|saml2/binding/impl/|binding/|binding/impl/" kind="src" path="saml"/>\r
+<pathentry excluding="impl/" kind="src" path="saml/binding"/>\r
+<pathentry kind="src" path="saml/binding/impl"/>\r
 <pathentry excluding="impl/" kind="src" path="saml/saml1/core"/>\r
 <pathentry kind="src" path="saml/saml1/core/impl"/>\r
 <pathentry excluding="impl/" kind="src" path="saml/saml1/binding"/>\r

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 91cd7ce..fa066a9 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -22,9 +22,11 @@ libsamlinclude_HEADERS = \
        base.h \
        exceptions.h \
        version.h \
-       SAMLArtifact.h \
        SAMLConfig.h
 
+samlbindinclude_HEADERS = \
+       SAMLArtifact.h
+
 encinclude_HEADERS = \
        encryption/EncryptedKeyResolver.h
 
@@ -45,13 +47,17 @@ utilinclude_HEADERS = \
 
 saml1coreinclude_HEADERS = \
        saml1/core/Assertions.h \
-       saml1/core/Protocols.h \
+       saml1/core/Protocols.h
+
+saml1bindinclude_HEADERS = \
        saml1/core/SAMLArtifactType0001.h \
        saml1/core/SAMLArtifactType0002.h
 
 saml2coreinclude_HEADERS = \
        saml2/core/Assertions.h \
-       saml2/core/Protocols.h \
+       saml2/core/Protocols.h
+
+saml2bindinclude_HEADERS = \
        saml2/core/SAML2Artifact.h \ 
        saml2/core/SAML2ArtifactType0004.h
 
@@ -67,20 +73,18 @@ noinst_HEADERS = \
        internal.h
 
 libsaml_la_SOURCES = \
-       SAMLArtifact.cpp \
        SAMLConfig.cpp \
+       binding/SAMLArtifact.cpp \
        saml1/core/impl/AssertionsImpl.cpp \
        saml1/core/impl/AssertionsSchemaValidators.cpp \
        saml1/core/impl/ProtocolsImpl.cpp \
        saml1/core/impl/ProtocolsSchemaValidators.cpp \
-       saml1/core/impl/SAMLArtifactType0001.cpp \
-       saml1/core/impl/SAMLArtifactType0002.cpp \
+       saml1/binding/impl/SAMLArtifactType0001.cpp \
+       saml1/binding/impl/SAMLArtifactType0002.cpp \
        saml2/core/impl/Assertions20Impl.cpp \
        saml2/core/impl/Assertions20SchemaValidators.cpp \
        saml2/core/impl/Protocols20Impl.cpp \
        saml2/core/impl/Protocols20SchemaValidators.cpp \
-       saml2/core/impl/SAML2Artifact.cpp \
-       saml2/core/impl/SAML2ArtifactType0004.cpp \
        saml2/metadata/impl/AbstractMetadataProvider.cpp \
        saml2/metadata/impl/BlacklistMetadataFilter.cpp \
        saml2/metadata/impl/ChainingMetadataProvider.cpp \
@@ -91,6 +95,8 @@ libsaml_la_SOURCES = \
        saml2/metadata/impl/ObservableMetadataProvider.cpp \
        saml2/metadata/impl/SignatureMetadataFilter.cpp \
        saml2/metadata/impl/WhitelistMetadataFilter.cpp \
+       saml2/binding/impl/SAML2Artifact.cpp \
+       saml2/binding/impl/SAML2ArtifactType0004.cpp \
        encryption/EncryptedKeyResolver.cpp \
        security/impl/TrustEngine.cpp \
        security/impl/AbstractPKIXTrustEngine.cpp \

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index a842faf..80a49e1 100644 (file)
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -23,8 +23,8 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "SAMLArtifact.h"
 #include "SAMLConfig.h"
+#include "binding/SAMLArtifact.h"
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
 #include "saml2/core/Protocols.h"

diff --git a/saml/SAMLArtifact.h b/saml/binding/SAMLArtifact.h
similarity index 96%
rename from saml/SAMLArtifact.h
rename to saml/binding/SAMLArtifact.h
index 18ebcaf..aadac32 100644 (file)
--- a/saml/SAMLArtifact.h
+++ b/saml/binding/SAMLArtifact.h
@@ -15,7 +15,7 @@
  */\r
 \r
 /**\r
- * @file saml/SAMLArtifact.h\r
+ * @file saml/binding/SAMLArtifact.h\r
  * \r
  * Base class for SAML 1.x and 2.0 artifacts \r
  */\r

diff --git a/saml/SAMLArtifact.cpp b/saml/binding/impl/SAMLArtifact.cpp
similarity index 99%
rename from saml/SAMLArtifact.cpp
rename to saml/binding/impl/SAMLArtifact.cpp
index 5c8d0fe..c28ef5b 100644 (file)
--- a/saml/SAMLArtifact.cpp
+++ b/saml/binding/impl/SAMLArtifact.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "SAMLArtifact.h"
+#include "binding/SAMLArtifact.h"
 
 #include <xercesc/util/Base64.hpp>
 

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 40d6d78..7db28ff 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -182,10 +182,6 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\SAMLArtifact.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\SAMLConfig.cpp"\r
                                >\r
                        </File>\r
@@ -222,14 +218,6 @@
                                                        RelativePath=".\saml1\core\impl\ProtocolsSchemaValidators.cpp"\r
                                                        >\r
                                                </File>\r
-                                               <File\r
-                                                       RelativePath=".\saml1\core\impl\SAMLArtifactType0001.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\saml1\core\impl\SAMLArtifactType0002.cpp"\r
-                                                       >\r
-                                               </File>\r
                                        </Filter>\r
                                </Filter>\r
                                <Filter\r
@@ -246,6 +234,14 @@
                                        <Filter\r
                                                Name="impl"\r
                                                >\r
+                                               <File\r
+                                                       RelativePath=".\saml1\binding\impl\SAMLArtifactType0001.cpp"\r
+                                                       >\r
+                                               </File>\r
+                                               <File\r
+                                                       RelativePath=".\saml1\binding\impl\SAMLArtifactType0002.cpp"\r
+                                                       >\r
+                                               </File>\r
                                        </Filter>\r
                                </Filter>\r
                        </Filter>\r
@@ -286,14 +282,6 @@
                                                        RelativePath=".\saml2\core\impl\Protocols20SchemaValidators.cpp"\r
                                                        >\r
                                                </File>\r
-                                               <File\r
-                                                       RelativePath=".\saml2\core\impl\SAML2Artifact.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\saml2\core\impl\SAML2ArtifactType0004.cpp"\r
-                                                       >\r
-                                               </File>\r
                                        </Filter>\r
                                </Filter>\r
                                <Filter\r
@@ -350,6 +338,50 @@
                                        <Filter\r
                                                Name="impl"\r
                                                >\r
+                                               <File\r
+                                                       RelativePath=".\saml2\binding\impl\SAML2Artifact.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\binding\impl\SAML2ArtifactType0004.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
                        </Filter>\r
@@ -385,6 +417,18 @@
                                        </File>\r
                                </Filter>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="binding"\r
+                               >\r
+                               <Filter\r
+                                       Name="impl"\r
+                                       >\r
+                                       <File\r
+                                               RelativePath=".\binding\impl\SAMLArtifact.cpp"\r
+                                               >\r
+                                       </File>\r
+                               </Filter>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
@@ -404,10 +448,6 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SAMLArtifact.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\SAMLConfig.h"\r
                                >\r
                        </File>\r
@@ -437,14 +477,6 @@
                                                RelativePath=".\saml1\core\Protocols.h"\r
                                                >\r
                                        </File>\r
-                                       <File\r
-                                               RelativePath=".\saml1\core\SAMLArtifactType0001.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\saml1\core\SAMLArtifactType0002.h"\r
-                                               >\r
-                                       </File>\r
                                </Filter>\r
                                <Filter\r
                                        Name="profile"\r
@@ -453,6 +485,14 @@
                                <Filter\r
                                        Name="binding"\r
                                        >\r
+                                       <File\r
+                                               RelativePath=".\saml1\binding\SAMLArtifactType0001.h"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath=".\saml1\binding\SAMLArtifactType0002.h"\r
+                                               >\r
+                                       </File>\r
                                </Filter>\r
                        </Filter>\r
                        <Filter\r
@@ -485,14 +525,6 @@
                                                RelativePath=".\saml2\core\Protocols.h"\r
                                                >\r
                                        </File>\r
-                                       <File\r
-                                               RelativePath=".\saml2\core\SAML2Artifact.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\saml2\core\SAML2ArtifactType0004.h"\r
-                                               >\r
-                                       </File>\r
                                </Filter>\r
                                <Filter\r
                                        Name="metadata"\r
@@ -525,6 +557,14 @@
                                <Filter\r
                                        Name="binding"\r
                                        >\r
+                                       <File\r
+                                               RelativePath=".\saml2\binding\SAML2Artifact.h"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath=".\saml2\binding\SAML2ArtifactType0004.h"\r
+                                               >\r
+                                       </File>\r
                                </Filter>\r
                        </Filter>\r
                        <Filter\r
@@ -559,6 +599,14 @@
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="binding"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\binding\SAMLArtifact.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r

diff --git a/saml/saml1/core/SAMLArtifactType0001.h b/saml/saml1/binding/SAMLArtifactType0001.h
similarity index 94%
rename from saml/saml1/core/SAMLArtifactType0001.h
rename to saml/saml1/binding/SAMLArtifactType0001.h
index 2fdf887..837409e 100644 (file)
--- a/saml/saml1/core/SAMLArtifactType0001.h
+++ b/saml/saml1/binding/SAMLArtifactType0001.h
@@ -15,7 +15,7 @@
  */\r
 \r
 /**\r
- * @file saml/saml1/core/SAMLArtifactType0001.h\r
+ * @file saml/saml1/binding/SAMLArtifactType0001.h\r
  * \r
  * Type 0x0001 SAML 1.x artifact class\r
  */\r
@@ -23,7 +23,7 @@
 #ifndef __saml_artifacttype0001_h__\r
 #define __saml_artifacttype0001_h__\r
 \r
-#include <saml/SAMLArtifact.h>\r
+#include <saml/binding/SAMLArtifact.h>\r
 \r
 namespace opensaml {\r
     namespace saml1p {\r

diff --git a/saml/saml1/core/SAMLArtifactType0002.h b/saml/saml1/binding/SAMLArtifactType0002.h
similarity index 93%
rename from saml/saml1/core/SAMLArtifactType0002.h
rename to saml/saml1/binding/SAMLArtifactType0002.h
index c9cb7c7..9c16081 100644 (file)
--- a/saml/saml1/core/SAMLArtifactType0002.h
+++ b/saml/saml1/binding/SAMLArtifactType0002.h
@@ -15,7 +15,7 @@
  */\r
 \r
 /**\r
- * @file saml/saml1/core/SAMLArtifactType0002.h\r
+ * @file saml/saml1/binding/SAMLArtifactType0002.h\r
  * \r
  * Type 0x0002 SAML 1.x artifact class\r
  */\r
@@ -23,7 +23,7 @@
 #ifndef __saml_artifacttype0002_h__\r
 #define __saml_artifacttype0002_h__\r
 \r
-#include <saml/SAMLArtifact.h>\r
+#include <saml/binding/SAMLArtifact.h>\r
 \r
 namespace opensaml {\r
     namespace saml1p {\r

diff --git a/saml/saml1/core/impl/SAMLArtifactType0001.cpp b/saml/saml1/binding/impl/SAMLArtifactType0001.cpp
similarity index 98%
rename from saml/saml1/core/impl/SAMLArtifactType0001.cpp
rename to saml/saml1/binding/impl/SAMLArtifactType0001.cpp
index 393d7d8..42b13d3 100644 (file)
--- a/saml/saml1/core/impl/SAMLArtifactType0001.cpp
+++ b/saml/saml1/binding/impl/SAMLArtifactType0001.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "saml1/core/SAMLArtifactType0001.h"
+#include "saml1/binding/SAMLArtifactType0001.h"
 
 using namespace opensaml::saml1p;
 using namespace opensaml;

diff --git a/saml/saml1/core/impl/SAMLArtifactType0002.cpp b/saml/saml1/binding/impl/SAMLArtifactType0002.cpp
similarity index 98%
rename from saml/saml1/core/impl/SAMLArtifactType0002.cpp
rename to saml/saml1/binding/impl/SAMLArtifactType0002.cpp
index f34fb3c..84e735f 100644 (file)
--- a/saml/saml1/core/impl/SAMLArtifactType0002.cpp
+++ b/saml/saml1/binding/impl/SAMLArtifactType0002.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "saml1/core/SAMLArtifactType0002.h"
+#include "saml1/binding/SAMLArtifactType0002.h"
 
 using namespace opensaml::saml1p;
 using namespace opensaml;

diff --git a/saml/saml2/core/SAML2Artifact.h b/saml/saml2/binding/SAML2Artifact.h
similarity index 94%
rename from saml/saml2/core/SAML2Artifact.h
rename to saml/saml2/binding/SAML2Artifact.h
index eb14aa2..79e22c5 100644 (file)
--- a/saml/saml2/core/SAML2Artifact.h
+++ b/saml/saml2/binding/SAML2Artifact.h
@@ -23,7 +23,7 @@
 #ifndef __saml2_artifact_h__\r
 #define __saml2_artifact_h__\r
 \r
-#include <saml/SAMLArtifact.h>\r
+#include <saml/binding/SAMLArtifact.h>\r
 \r
 namespace opensaml {\r
     namespace saml2p {\r

diff --git a/saml/saml2/core/SAML2ArtifactType0004.h b/saml/saml2/binding/SAML2ArtifactType0004.h
similarity index 95%
rename from saml/saml2/core/SAML2ArtifactType0004.h
rename to saml/saml2/binding/SAML2ArtifactType0004.h
index caa429d..40e2eb5 100644 (file)
--- a/saml/saml2/core/SAML2ArtifactType0004.h
+++ b/saml/saml2/binding/SAML2ArtifactType0004.h
@@ -23,7 +23,7 @@
 #ifndef __saml_artifacttype0004_h__\r
 #define __saml_artifacttype0004_h__\r
 \r
-#include <saml/saml2/core/SAML2Artifact.h>\r
+#include <saml/saml2/binding/SAML2Artifact.h>\r
 \r
 namespace opensaml {\r
     namespace saml2p {\r

diff --git a/saml/saml2/core/impl/SAML2Artifact.cpp b/saml/saml2/binding/impl/SAML2Artifact.cpp
similarity index 96%
rename from saml/saml2/core/impl/SAML2Artifact.cpp
rename to saml/saml2/binding/impl/SAML2Artifact.cpp
index dcbd0f2..343fbea 100644 (file)
--- a/saml/saml2/core/impl/SAML2Artifact.cpp
+++ b/saml/saml2/binding/impl/SAML2Artifact.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "saml2/core/SAML2Artifact.h"
+#include "saml2/binding/SAML2Artifact.h"
 
 using namespace opensaml::saml2p;
 

diff --git a/saml/saml2/core/impl/SAML2ArtifactType0004.cpp b/saml/saml2/binding/impl/SAML2ArtifactType0004.cpp
similarity index 98%
rename from saml/saml2/core/impl/SAML2ArtifactType0004.cpp
rename to saml/saml2/binding/impl/SAML2ArtifactType0004.cpp
index 22e6362..97628b4 100644 (file)
--- a/saml/saml2/core/impl/SAML2ArtifactType0004.cpp
+++ b/saml/saml2/binding/impl/SAML2ArtifactType0004.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "saml2/core/SAML2ArtifactType0004.h"
+#include "saml2/binding/SAML2ArtifactType0004.h"
 
 using namespace opensaml::saml2p;
 using namespace opensaml;

diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index 59e4303..6584a3e 100644 (file)
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "SAMLArtifact.h"
+#include "binding/SAMLArtifact.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/AbstractMetadataProvider.h"
 

diff --git a/samltest/SAMLArtifactCreationTest.h b/samltest/SAMLArtifactCreationTest.h
index a62f4c5..4190dfc 100644 (file)
--- a/samltest/SAMLArtifactCreationTest.h
+++ b/samltest/SAMLArtifactCreationTest.h
@@ -16,9 +16,9 @@
 \r
 #include "internal.h"\r
 #include <saml/SAMLConfig.h>\r
-#include <saml/saml1/core/SAMLArtifactType0001.h>\r
-#include <saml/saml1/core/SAMLArtifactType0002.h>\r
-#include <saml/saml2/core/SAML2ArtifactType0004.h>\r
+#include <saml/saml1/binding/SAMLArtifactType0001.h>\r
+#include <saml/saml1/binding/SAMLArtifactType0002.h>\r
+#include <saml/saml2/binding/SAML2ArtifactType0004.h>\r
 \r
 using namespace opensaml::saml1p;\r
 using namespace opensaml::saml2p;\r

diff --git a/samltest/SAMLArtifactType0001Test.h b/samltest/SAMLArtifactType0001Test.h
index 78ef996..8cdd9fb 100644 (file)
--- a/samltest/SAMLArtifactType0001Test.h
+++ b/samltest/SAMLArtifactType0001Test.h
@@ -16,7 +16,7 @@
 \r
 #include "internal.h"\r
 #include <saml/SAMLConfig.h>\r
-#include <saml/saml1/core/SAMLArtifactType0001.h>\r
+#include <saml/saml1/binding/SAMLArtifactType0001.h>\r
 \r
 using namespace opensaml::saml1p;\r
 using namespace opensaml;\r

diff --git a/samltest/SAMLArtifactType0002Test.h b/samltest/SAMLArtifactType0002Test.h
index 545564a..2a9ce99 100644 (file)
--- a/samltest/SAMLArtifactType0002Test.h
+++ b/samltest/SAMLArtifactType0002Test.h
@@ -16,7 +16,7 @@
 \r
 #include "internal.h"\r
 #include <saml/SAMLConfig.h>\r
-#include <saml/saml1/core/SAMLArtifactType0002.h>\r
+#include <saml/saml1/binding/SAMLArtifactType0002.h>\r
 \r
 using namespace opensaml::saml1p;\r
 using namespace opensaml;\r

diff --git a/samltest/SAMLArtifactType0004Test.h b/samltest/SAMLArtifactType0004Test.h
index 52273aa..ff8a569 100644 (file)
--- a/samltest/SAMLArtifactType0004Test.h
+++ b/samltest/SAMLArtifactType0004Test.h
@@ -16,7 +16,7 @@
 \r
 #include "internal.h"\r
 #include <saml/SAMLConfig.h>\r
-#include <saml/saml2/core/SAML2ArtifactType0004.h>\r
+#include <saml/saml2/binding/SAML2ArtifactType0004.h>\r
 \r
 using namespace opensaml::saml2p;\r
 using namespace opensaml;\r

diff --git a/samltest/saml2/metadata/FilesystemMetadataProviderTest.h b/samltest/saml2/metadata/FilesystemMetadataProviderTest.h
index 5358d3e..3e736ba 100644 (file)
--- a/samltest/saml2/metadata/FilesystemMetadataProviderTest.h
+++ b/samltest/saml2/metadata/FilesystemMetadataProviderTest.h
@@ -16,7 +16,7 @@
 \r
 #include "internal.h"\r
 #include <saml/SAMLConfig.h>\r
-#include <saml/saml2/core/SAML2ArtifactType0004.h>\r
+#include <saml/saml2/binding/SAML2ArtifactType0004.h>\r
 #include <saml/saml2/metadata/Metadata.h>\r
 #include <saml/saml2/metadata/MetadataProvider.h>\r
 \r

diff --git a/samltest/samltest.vcproj b/samltest/samltest.vcproj
index 7b160d5..7264b35 100644 (file)
--- a/samltest/samltest.vcproj
+++ b/samltest/samltest.vcproj
@@ -2307,7 +2307,7 @@
                                                >\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                />\r
                                        </FileConfiguration>\r
@@ -2316,7 +2316,7 @@
                                                >\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                />\r
                                        </FileConfiguration>\r