Fix svn properties

diff --git a/saml/version.cpp b/saml/version.cpp
index ab98b61..b234837 100644 (file)
--- a/saml/version.cpp
+++ b/saml/version.cpp
@@ -16,20 +16,20 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific
  * language governing permissions and limitations under the License.
- */\r
-\r
-/**\r
- * version.cpp\r
- * \r
- * Library version macros and constants.\r
- */\r
-\r
-#include "internal.h"\r
-#include "version.h"\r
-\r
-SAML_API const char* const    gOpenSAMLVersionStr = OPENSAML_VERSIONSTR;\r
-SAML_API const char* const    gOpenSAMLFullVersionStr = OPENSAML_FULLVERSIONSTR;\r
-SAML_API const char* const    gOpenSAMLDotVersionStr = OPENSAML_FULLVERSIONDOT;\r
-SAML_API const unsigned int   gOpenSAMLMajVersion = OPENSAML_VERSION_MAJOR;\r
-SAML_API const unsigned int   gOpenSAMLMinVersion = OPENSAML_VERSION_MINOR;\r
-SAML_API const unsigned int   gOpenSAMLRevision   = OPENSAML_VERSION_REVISION;\r
+ */
+
+/**
+ * version.cpp
+ * 
+ * Library version macros and constants.
+ */
+
+#include "internal.h"
+#include "version.h"
+
+SAML_API const char* const    gOpenSAMLVersionStr = OPENSAML_VERSIONSTR;
+SAML_API const char* const    gOpenSAMLFullVersionStr = OPENSAML_FULLVERSIONSTR;
+SAML_API const char* const    gOpenSAMLDotVersionStr = OPENSAML_FULLVERSIONDOT;
+SAML_API const unsigned int   gOpenSAMLMajVersion = OPENSAML_VERSION_MAJOR;
+SAML_API const unsigned int   gOpenSAMLMinVersion = OPENSAML_VERSION_MINOR;
+SAML_API const unsigned int   gOpenSAMLRevision   = OPENSAML_VERSION_REVISION;

diff --git a/samltest/data/saml2/core/impl/template/RequestTemplate.xml b/samltest/data/saml2/core/impl/template/RequestTemplate.xml
index 55e3433..771e421 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/RequestTemplate.xml and b/samltest/data/saml2/core/impl/template/RequestTemplate.xml differ

diff --git a/samltest/data/saml2/core/impl/template/RequestTemplateChildElements.xml b/samltest/data/saml2/core/impl/template/RequestTemplateChildElements.xml
index f1b2941..6bde6c4 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/RequestTemplateChildElements.xml and b/samltest/data/saml2/core/impl/template/RequestTemplateChildElements.xml differ

diff --git a/samltest/data/saml2/core/impl/template/RequestTemplateOptionalAttributes.xml b/samltest/data/saml2/core/impl/template/RequestTemplateOptionalAttributes.xml
index 08cf4c2..d316810 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/RequestTemplateOptionalAttributes.xml and b/samltest/data/saml2/core/impl/template/RequestTemplateOptionalAttributes.xml differ

diff --git a/samltest/data/saml2/core/impl/template/StatusResponseTemplate.xml b/samltest/data/saml2/core/impl/template/StatusResponseTemplate.xml
index ffc67e8..fd84fb1 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/StatusResponseTemplate.xml and b/samltest/data/saml2/core/impl/template/StatusResponseTemplate.xml differ

diff --git a/samltest/data/saml2/core/impl/template/StatusResponseTemplateChildElements.xml b/samltest/data/saml2/core/impl/template/StatusResponseTemplateChildElements.xml
index 990c208..3e94fc7 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/StatusResponseTemplateChildElements.xml and b/samltest/data/saml2/core/impl/template/StatusResponseTemplateChildElements.xml differ

diff --git a/samltest/data/saml2/core/impl/template/StatusResponseTemplateOptionalAttributes.xml b/samltest/data/saml2/core/impl/template/StatusResponseTemplateOptionalAttributes.xml
index 7d205fb..6373273 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/StatusResponseTemplateOptionalAttributes.xml and b/samltest/data/saml2/core/impl/template/StatusResponseTemplateOptionalAttributes.xml differ

diff --git a/samltest/data/saml2/core/impl/template/SubjectQueryTemplate.xml b/samltest/data/saml2/core/impl/template/SubjectQueryTemplate.xml
index 55e3433..771e421 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/SubjectQueryTemplate.xml and b/samltest/data/saml2/core/impl/template/SubjectQueryTemplate.xml differ

diff --git a/samltest/data/saml2/core/impl/template/SubjectQueryTemplateChildElements.xml b/samltest/data/saml2/core/impl/template/SubjectQueryTemplateChildElements.xml
index 87bcd41..3dc8f60 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/SubjectQueryTemplateChildElements.xml and b/samltest/data/saml2/core/impl/template/SubjectQueryTemplateChildElements.xml differ

diff --git a/samltest/data/saml2/core/impl/template/SubjectQueryTemplateOptionalAttributes.xml b/samltest/data/saml2/core/impl/template/SubjectQueryTemplateOptionalAttributes.xml
index 08cf4c2..d316810 100644 (file)
Binary files a/samltest/data/saml2/core/impl/template/SubjectQueryTemplateOptionalAttributes.xml and b/samltest/data/saml2/core/impl/template/SubjectQueryTemplateOptionalAttributes.xml differ

diff --git a/schemas/sstc-saml-metadata-ui-v1.0.xsd b/schemas/sstc-saml-metadata-ui-v1.0.xsd
index a281227..9182e07 100644 (file)
--- a/schemas/sstc-saml-metadata-ui-v1.0.xsd
+++ b/schemas/sstc-saml-metadata-ui-v1.0.xsd
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<schema \r
-  targetNamespace="urn:oasis:names:tc:SAML:metadata:ui"\r
-  xmlns="http://www.w3.org/2001/XMLSchema"\r
-  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"\r
-  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"\r
-  elementFormDefault="unqualified"\r
-  attributeFormDefault="unqualified"\r
-  blockDefault="substitution"\r
-  version="1.0">\r
-\r
-  <annotation>\r
-    <documentation>\r
-      Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0\r
-      Document identifier: sstc-saml-metadata-ui-v1.0.xsd\r
-      Location: http://docs.oasis-open.org/security/saml/Post2.0/\r
-      Revision history:\r
-      16 November 2010:\r
-        Added Keywords element/type.\r
-      01 November 2010\r
-        Changed filename.\r
-      September 2010:\r
-        Initial version.\r
-    </documentation>\r
-  </annotation>\r
-\r
-  <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"\r
-    schemaLocation="saml-schema-metadata-2.0.xsd"/>\r
-  <import namespace="http://www.w3.org/XML/1998/namespace"\r
-    schemaLocation="http://www.w3.org/2001/xml.xsd"/>\r
-\r
-  <element name="UIInfo" type="mdui:UIInfoType" />\r
-  <complexType name="UIInfoType">\r
-    <choice minOccurs="0" maxOccurs="unbounded">\r
-      <element ref="mdui:DisplayName"/>\r
-      <element ref="mdui:Description"/>\r
-      <element ref="mdui:Keywords"/>\r
-      <element ref="mdui:Logo"/>\r
-      <element ref="mdui:InformationURL"/>\r
-      <element ref="mdui:PrivacyStatementURL"/>\r
-      <any namespace="##other" processContents="lax"/>\r
-    </choice>\r
-  </complexType>\r
-\r
-  <element name="DisplayName" type="md:localizedNameType"/>\r
-  <element name="Description" type="md:localizedNameType"/>\r
-  <element name="InformationURL" type="md:localizedURIType"/>\r
-  <element name="PrivacyStatementURL" type="md:localizedURIType"/>\r
-\r
-  <element name="Keywords" type="mdui:KeywordsType"/>\r
-  <complexType name="KeywordsType">\r
-    <simpleContent>\r
-      <extension base="mdui:listOfStrings">\r
-        <attribute ref="xml:lang" use="required"/>\r
-      </extension>\r
-    </simpleContent>\r
-  </complexType>\r
-  \r
-  <simpleType name="listOfStrings">\r
-    <list itemType="string"/>\r
-  </simpleType>\r
-\r
-  <element name="Logo" type="mdui:LogoType"/>\r
-  <complexType name="LogoType">\r
-    <simpleContent>\r
-      <extension base="anyURI">\r
-        <attribute name="height" type="positiveInteger" use="required"/>\r
-        <attribute name="width" type="positiveInteger" use="required"/>\r
-        <attribute ref="xml:lang"/>\r
-      </extension>\r
-    </simpleContent>\r
-  </complexType>\r
-\r
-  <element name="DiscoHints" type="mdui:DiscoHintsType"/>\r
-  <complexType name="DiscoHintsType">\r
-    <choice minOccurs="0" maxOccurs="unbounded">\r
-      <element ref="mdui:IPHint"/>\r
-      <element ref="mdui:DomainHint"/>\r
-      <element ref="mdui:GeolocationHint"/>\r
-      <any namespace="##other" processContents="lax"/>\r
-    </choice>\r
-  </complexType>\r
-\r
-  <element name="IPHint" type="string"/>\r
-  <element name="DomainHint" type="string"/>   \r
-  <element name="GeolocationHint" type="anyURI"/>\r
-\r
-</schema>\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>
+<schema 
+  targetNamespace="urn:oasis:names:tc:SAML:metadata:ui"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+  elementFormDefault="unqualified"
+  attributeFormDefault="unqualified"
+  blockDefault="substitution"
+  version="1.0">
+
+  <annotation>
+    <documentation>
+      Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0
+      Document identifier: sstc-saml-metadata-ui-v1.0.xsd
+      Location: http://docs.oasis-open.org/security/saml/Post2.0/
+      Revision history:
+      16 November 2010:
+        Added Keywords element/type.
+      01 November 2010
+        Changed filename.
+      September 2010:
+        Initial version.
+    </documentation>
+  </annotation>
+
+  <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"
+    schemaLocation="saml-schema-metadata-2.0.xsd"/>
+  <import namespace="http://www.w3.org/XML/1998/namespace"
+    schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+  <element name="UIInfo" type="mdui:UIInfoType" />
+  <complexType name="UIInfoType">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <element ref="mdui:DisplayName"/>
+      <element ref="mdui:Description"/>
+      <element ref="mdui:Keywords"/>
+      <element ref="mdui:Logo"/>
+      <element ref="mdui:InformationURL"/>
+      <element ref="mdui:PrivacyStatementURL"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </complexType>
+
+  <element name="DisplayName" type="md:localizedNameType"/>
+  <element name="Description" type="md:localizedNameType"/>
+  <element name="InformationURL" type="md:localizedURIType"/>
+  <element name="PrivacyStatementURL" type="md:localizedURIType"/>
+
+  <element name="Keywords" type="mdui:KeywordsType"/>
+  <complexType name="KeywordsType">
+    <simpleContent>
+      <extension base="mdui:listOfStrings">
+        <attribute ref="xml:lang" use="required"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+  
+  <simpleType name="listOfStrings">
+    <list itemType="string"/>
+  </simpleType>
+
+  <element name="Logo" type="mdui:LogoType"/>
+  <complexType name="LogoType">
+    <simpleContent>
+      <extension base="anyURI">
+        <attribute name="height" type="positiveInteger" use="required"/>
+        <attribute name="width" type="positiveInteger" use="required"/>
+        <attribute ref="xml:lang"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+  <element name="DiscoHints" type="mdui:DiscoHintsType"/>
+  <complexType name="DiscoHintsType">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <element ref="mdui:IPHint"/>
+      <element ref="mdui:DomainHint"/>
+      <element ref="mdui:GeolocationHint"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </complexType>
+
+  <element name="IPHint" type="string"/>
+  <element name="DomainHint" type="string"/>   
+  <element name="GeolocationHint" type="anyURI"/>
+
+</schema>
+