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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 10 19:45:06 2014
New Revision: 5360

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5360&view=rev
Log:
Move xmlsig mapping to idp-core, add the rest.

Modified:
    trunk/idp-attribute-filter-spring/src/main/resources/META-INF/spring.schemas
    trunk/idp-core/src/main/resources/META-INF/spring.schemas

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=5360&r1=5359&r2=5360&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 19:45:06 2014
@@ -5,6 +5,3 @@
 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

Modified: trunk/idp-core/src/main/resources/META-INF/spring.schemas
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/resources/META-INF/spring.schemas?rev=5360&r1=5359&r2=5360&view=diff
==============================================================================
--- trunk/idp-core/src/main/resources/META-INF/spring.schemas (original)
+++ trunk/idp-core/src/main/resources/META-INF/spring.schemas Mon Feb 10 19:45:06 2014
@@ -1,4 +1,18 @@
+# This will move somewhere once we implement it.
 http\://shibboleth.net/schema/idp/shibboleth-security.xsd = schema/shibboleth-security.xsd
 classpath\:/schema/shibboleth-2.0-security.xsd = schema/shibboleth-security.xsd
 
+# This mapping seems to be missing from SWF jar.
 http\://www.springframework.org/schema/webflow/spring-webflow.xsd = org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
+
+# These need to be somewhere, leaving here for want of a better choice for now.
+
+http\://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd = schema/xmldsig-core-schema.xsd
+http\://www.w3.org/TR/2013/REC-xmldsig-core1-20130411/xmldsig11-schema.xsd = schema/xmldsig11-schema.xsd
+http\://www.w3.org/TR/xmlenc-core/xenc-schema.xsd = schema/xenc-schema.xsd
+http\://www.w3.org/TR/2013/REC-xmlenc-core1-20130411/xenc-schema-11.xsd = schema/xenc11-schema.xsd
+
+classpath\:/schema/xmldsig-core-schema.xsd = schema/xmldsig-core-schema.xsd
+classpath\:/schema/xmldsig11-schema.xsd = schema/xmldsig11-schema.xsd
+classpath\:/schema/xenc-schema.xsd = schema/xenc-schema.xsd
+classpath\:/schema/xenc11-schema.xsd = schema/xenc11-schema.xsd