[java-identity-provider COMMIT] in /trunk: idp-attribute-cli/src/main/resources/conf/internal.xml idp-conf/src/main/r...

[noreply at shibboleth.net]

Author: iay
Date: Thu Jul 10 13:03:41 2014
New Revision: 6268

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6268&view=rev
Log:
IDP-404 XML schema validity

Modified:
    trunk/idp-attribute-cli/src/main/resources/conf/internal.xml
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPNoEndpoints.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/empty-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/names-entities-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/nodepth-entities-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-3keyinfo-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entities-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entity-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/threeset-entity-entities-entities-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-2authorities-entities-metadata-pkix.xml
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-entity-entities-metadata-pkix.xml
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-attribute-cli/src/main/resources/conf/internal.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/internal.xml?rev=6268&r1=6267&r2=6268&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/internal.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/internal.xml Thu Jul 10 13:03:41 2014
@@ -7,9 +7,7 @@
 
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">
         <property name="id" value="shibboleth.LogbackLogging"/>
-        <property name="loggingConfiguration">
-            <constructor-arg value="conf/logging.xml"/>
-        </property>
+        <property name="loggingConfiguration" value="conf/logging.xml"/>
         <property name="reloadCheckDelay" value="0"/>
     </bean>
     

Modified: trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/metadata/example-metadata.xml?rev=6268&r1=6267&r2=6268&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Thu Jul 10 13:03:41 2014
@@ -90,6 +90,7 @@
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://localhost:8443/sp/SAML1/POST/ACS" index="10"/>
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://localhost:8443/sp/SAML1/Artifact/ACS" index="11"/>
         <AttributeConsumingService isDefault="true" index="1">
+            <ServiceName xml:lang="en">Service Name</ServiceName>
             <RequestedAttribute FriendlyName="displayName"
                 Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" />
             <RequestedAttribute FriendlyName="displayName" isRequired="true"

Modified: trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPNoEndpoints.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPNoEndpoints.xml?rev=6268&r1=6267&r2=6268&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPNoEndpoints.xml (original)
+++ trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPNoEndpoints.xml Thu Jul 10 13:03:41 2014
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:SPSSODescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" />
+<md:SPSSODescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="required"/>

Modified: trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml?rev=6268&r1=6267&r2=6268&view=diff
==============================================================================

[... 250 lines stripped ...]