[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: metadata-providers.xml relying-party.xml

[noreply at shibboleth.net]

Author: scantor
Date: Tue May  6 15:13:52 2014
New Revision: 5856

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5856&view=rev
Log:
Fix classpath schema locations.

Modified:
    trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml

Modified: trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/metadata-providers.xml?rev=5856&r1=5855&r2=5856&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/metadata-providers.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/metadata-providers.xml Tue May  6 15:13:52 2014
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This file is an EXAMPLE metadata configuration file. -->
 <MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider"
-	xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml"
 	xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource"
-	xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml"
+	xmlns:security="urn:mace:shibboleth:2.0:security"
 	xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party classpath:/schema/shibboleth-2.0-relying-party.xsd
-                                          urn:mace:shibboleth:2.0:relying-party:saml classpath:/schema/shibboleth-2.0-relying-party-saml.xsd
-                                          urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd
-                                          urn:mace:shibboleth:2.0:resource classpath:/schema/shibboleth-2.0-resource.xsd 
-                                          urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd
-                                          urn:mace:shibboleth:2.0:security:saml classpath:/schema/shibboleth-2.0-security-policy-saml.xsd
-                                          urn:oasis:names:tc:SAML:2.0:metadata classpath:/schema/saml-schema-metadata-2.0.xsd">
+	xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
+                        urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd 
+                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
+                        urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
 	<!-- ========================================== -->
 	<!-- Metadata Configuration -->
 	<!-- ========================================== -->

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party.xml?rev=5856&r1=5855&r2=5856&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Tue May  6 15:13:52 2014
@@ -10,13 +10,12 @@
                       xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource" 
                       xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml" 
                       xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                      xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party classpath:/schema/shibboleth-2.0-relying-party.xsd
-                                          urn:mace:shibboleth:2.0:relying-party:saml classpath:/schema/shibboleth-2.0-relying-party-saml.xsd
-                                          urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd
-                                          urn:mace:shibboleth:2.0:resource classpath:/schema/shibboleth-2.0-resource.xsd 
-                                          urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd
-                                          urn:mace:shibboleth:2.0:security:saml classpath:/schema/shibboleth-2.0-security-policy-saml.xsd
-                                          urn:oasis:names:tc:SAML:2.0:metadata classpath:/schema/saml-schema-metadata-2.0.xsd">
+                      xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party http://shibboleth.net/schema/idp/shibboleth-relying-party.xsd
+                                          urn:mace:shibboleth:2.0:relying-party:saml http://shibboleth.net/schema/idp/shibboleth-relying-party-saml.xsd

[... 8 lines stripped ...]