[java-identity-provider COMMIT] /trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 22 16:53:40 2014
New Revision: 6554

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6554&view=rev
Log:
IDP-79 - draft schema for PredicateFilter

Modified:
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd?rev=6554&r1=6553&r2=6554&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd Mon Sep 22 16:53:40 2014
@@ -17,14 +17,10 @@
     <complexType name="ChainingMetadataProvider">
         <annotation>
             <documentation>
-                A metadata provider that composes other metadata providers. During a lookup operation member
-                providers
-                are searched in the order they listed in this providers configuration until one provides a
-                response to
-                the lookup. That response is then returned, no subsequent member providers are inspected.
-                Note, that
-                metadata filters and the require valid metadata flag expressed on this configuration overrides
-                those
+                A metadata provider that composes other metadata providers. During a lookup operation member providers
+                are searched in the order they listed in this providers configuration until one provides a response to
+                the lookup. That response is then returned, no subsequent member providers are inspected. Note, that
+                metadata filters and the require valid metadata flag expressed on this configuration overrides those
                 settings on member providers.
             </documentation>
         </annotation>
@@ -90,10 +86,8 @@
     <complexType name="FileBackedHTTPMetadataProvider">
         <annotation>
             <documentation>
-                A metadata provider that periodically pulls metadata from a given URL. If the metadata is
-                valid it is
-                stored to disk. If the the provided URL can not be reached or the metadata retrieved is
-                invalid this
+                A metadata provider that periodically pulls metadata from a given URL. If the metadata is valid it is
+                stored to disk. If the the provided URL can not be reached or the metadata retrieved is invalid this
                 provider will fall back to its on-disk copy.
             </documentation>
         </annotation>
@@ -172,16 +166,14 @@
                 <attribute name="basicAuthUser" type="string">
                     <annotation>
                         <documentation>
-                            The user name to provide, during basic authentication, when connecting to the
-                            remote server.
+                            The user name to provide, during basic authentication, when connecting to the remote server.
                         </documentation>
                     </annotation>
                 </attribute>
                 <attribute name="basicAuthPassword" type="string">
                     <annotation>
                         <documentation>
-                            The password to provide, during basic authentication, when connecting to the
-                            remote server.
+                            The password to provide, during basic authentication, when connecting to the remote server.
                         </documentation>
                     </annotation>
                 </attribute>
@@ -273,12 +265,9 @@
         <attribute name="requireValidMetadata" type="string">
             <annotation>
                 <documentation>
-                    A boolean flag indicating whether the
-                    metadata retrieved must be valid. At a minimum, metadata is
-                    valid only if the date expressed in
-                    entity's validUntil attribute has not passed. Specific
-                    implementations may add additional
-                    constraints.
+                    A boolean flag indicating whether the metadata retrieved must be valid. At a minimum, metadata is
+                    valid only if the date expressed in entity's validUntil attribute has not passed. Specific
+                    implementations may add additional constraints.
                 </documentation>
             </annotation>
         </attribute>
@@ -324,8 +313,7 @@
     <complexType name="RequiredValidUntil">
         <annotation>
             <documentation>
-                A filter that requires the presence of a validUntil attribute on the root of the metadata
-                and,
+                A filter that requires the presence of a validUntil attribute on the root of the metadata and,

[... 178 lines stripped ...]