[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-spring/src/main/resources: META-INF/spring.schemas sch...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 10 10:41:41 2014
New Revision: 5351

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5351&view=rev
Log:
IDP-303: Rename filter schemas and update mappings.

Added:
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-basic.xsd
      - copied, changed from r5350, trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-basic.xsd
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-saml.xsd
      - copied, changed from r5350, trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp.xsd
      - copied, changed from r5350, trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.xsd
Modified:
    trunk/idp-attribute-filter-spring/src/main/resources/META-INF/spring.schemas
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-basic.xsd
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.xsd

Modified: trunk/idp-attribute-filter-spring/src/main/resources/META-INF/spring.schemas
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/resources/META-INF/spring.schemas?rev=5351&r1=5350&r2=5351&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/resources/META-INF/spring.schemas (original)
+++ trunk/idp-attribute-filter-spring/src/main/resources/META-INF/spring.schemas Mon Feb 10 10:41:41 2014
@@ -1,3 +1,10 @@
-urn\:mace\:shibboleth\:2.0\:afp = schema/shibboleth-2.0-afp.xsd
-urn\:mace\:shibboleth\:2.0\:afp\:mf\:basic = schema/shibboleth-2.0-afp-mf-basic.xsd
-urn\:mace\:shibboleth\:2.0\:afp\:mf\:saml = schema/shibboleth-2.0-afp-mf-saml.xsd
+http\://shibboleth.net/schema/idp/shibboleth-afp.xsd = schema/shibboleth-afp.xsd
+http\://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd = schema/shibboleth-afp-mf-basic.xsd
+http\://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd = schema/shibboleth-afp-mf-saml.xsd
+
+classpath\:/schema/shibboleth-2.0-afp.xsd = schema/shibboleth-afp.xsd
+classpath\:/schema/shibboleth-2.0-afp-mf-basic.xsd = schema/shibboleth-afp-mf-basic.xsd
+classpath\:/schema/shibboleth-2.0-afp-mf-saml.xsd = schema/shibboleth-afp-mf-saml.xsd
+
+http\://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd = schema/xmldsig-core-schema.xsd
+classpath\:/schema/xmldsig-core-schema.xsd = schema/xmldsig-core-schema.xsd

Copied: trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-basic.xsd (from r5350, trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-basic.xsd)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-basic.xsd?p2=trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-basic.xsd&p1=trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-basic.xsd&r1=5350&r2=5351&rev=5351&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-basic.xsd (original)
+++ trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-basic.xsd Mon Feb 10 10:41:41 2014
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp" targetNamespace="urn:mace:shibboleth:2.0:afp:mf:basic" elementFormDefault="qualified">
 
-    <import namespace="urn:mace:shibboleth:2.0:afp" schemaLocation="classpath:/schema/shibboleth-2.0-afp.xsd"/>
+    <import namespace="urn:mace:shibboleth:2.0:afp" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-afp.xsd"/>
 
     <!-- Blanket Match Function -->
     <complexType name="ANY">

Copied: trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-saml.xsd (from r5350, trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-saml.xsd?p2=trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-saml.xsd&p1=trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd&r1=5350&r2=5351&rev=5351&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd (original)
+++ trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-afp-mf-saml.xsd Mon Feb 10 10:41:41 2014
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

[... 23 lines stripped ...]