[java-shib-metadata] branch main updated: Move mis-located Spring schema.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=3046bc66cc9ff844d796e79bdb23463599bdb886

The following commit(s) were added to refs/heads/main by this push:
     new 3046bc66c Move mis-located Spring schema.
3046bc66c is described below

commit 3046bc66cc9ff844d796e79bdb23463599bdb886
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 5 15:51:16 2022 -0400

    Move mis-located Spring schema.
---
 .../src/main/resources/META-INF/spring.schemas     | 35 ----------------------
 .../src/main/resources/META-INF/spring.schemas     | 35 ++++++++++++++++++++--
 .../main/resources/schema/shibboleth-metadata.xsd  |  0
 3 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/shib-metadata-api/src/main/resources/META-INF/spring.schemas b/shib-metadata-api/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 7e7584d41..000000000
--- a/shib-metadata-api/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1,35 +0,0 @@
-# Current Metadata
-http\://shibboleth.net/schema/idp/shibboleth-metadata.xsd = schema/shibboleth-metadata.xsd
-
-# Legacy Metadata
-classpath\:/schema/shibboleth-2.0-metadata.xsd = schema/shibboleth-metadata.xsd
-
-# Core schemas
-http\://www.w3.org/2001/xml.xsd = schema/xml.xsd
-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
-http\://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd = schema/saml-schema-assertion-2.0.xsd
-http\://docs.oasis-open.org/security/saml/v2.0/saml-schema-protocol-2.0.xsd = schema/saml-schema-protocol-2.0.xsd
-http\://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd = schema/saml-schema-metadata-2.0.xsd
-http\://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-algsupport-v1.0.xsd = schema/sstc-saml-metadata-algsupport-v1.0.xsd
-http\://www.oasis-open.org/committees/download.php/1376/oasis-sstc-saml-schema-assertion-1.0.xsd = schema/oasis-sstc-saml-schema-assertion-1.0.xsd
-http\://www.oasis-open.org/committees/download.php/1377/oasis-sstc-saml-schema-protocol-1.0.xsd = schema/oasis-sstc-saml-schema-protocol-1.0.xsd
-http\://www.oasis-open.org/committees/download.php/3408/oasis-sstc-saml-schema-assertion-1.1.xsd = schema/oasis-sstc-saml-schema-assertion-1.1.xsd
-http\://www.oasis-open.org/committees/download.php/3407/oasis-sstc-saml-schema-protocol-1.1.xsd = schema/oasis-sstc-saml-schema-protocol-1.1.xsd
-
-# Legacy core schemas 
-classpath\:/schema/xml.xsd = schema/xml.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
-classpath\:/schema/saml-schema-assertion-2.0.xsd = schema/saml-schema-assertion-2.0.xsd
-classpath\:/schema/saml-schema-protocol-2.0.xsd = schema/saml-schema-protocol-2.0.xsd
-classpath\:/schema/saml-schema-metadata-2.0.xsd = schema/saml-schema-metadata-2.0.xsd
-classpath\:/schema/oasis-sstc-saml-schema-assertion-1.0.xsd = schema/oasis-sstc-saml-schema-assertion-1.0.xsd
-classpath\:/schema/oasis-sstc-saml-schema-protocol-1.0.xsd = schema/oasis-sstc-saml-schema-protocol-1.0.xsd
-classpath\:/schema/oasis-sstc-saml-schema-assertion-1.1.xsd = schema/oasis-sstc-saml-schema-assertion-1.1.xsd
-classpath\:/schema/oasis-sstc-saml-schema-protocol-1.1.xsd = schema/oasis-sstc-saml-schema-protocol-1.1.xsd
-
diff --git a/shib-metadata-spring/src/main/resources/META-INF/spring.schemas b/shib-metadata-spring/src/main/resources/META-INF/spring.schemas
index c71f89d10..11cc37a8f 100644
--- a/shib-metadata-spring/src/main/resources/META-INF/spring.schemas
+++ b/shib-metadata-spring/src/main/resources/META-INF/spring.schemas
@@ -1,5 +1,36 @@
-# Modern variant
+# Current Metadata
 http\://shibboleth.net/schema/idp/shibboleth-security.xsd = schema/shibboleth-security.xsd
+http\://shibboleth.net/schema/idp/shibboleth-metadata.xsd = schema/shibboleth-metadata.xsd
 
-# Legacy variant
+# Legacy Metadata
 classpath\:/schema/shibboleth-2.0-security.xsd = schema/shibboleth-security.xsd
+classpath\:/schema/shibboleth-2.0-metadata.xsd = schema/shibboleth-metadata.xsd
+
+# Core schemas
+http\://www.w3.org/2001/xml.xsd = schema/xml.xsd
+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
+http\://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd = schema/saml-schema-assertion-2.0.xsd
+http\://docs.oasis-open.org/security/saml/v2.0/saml-schema-protocol-2.0.xsd = schema/saml-schema-protocol-2.0.xsd
+http\://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd = schema/saml-schema-metadata-2.0.xsd
+http\://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-algsupport-v1.0.xsd = schema/sstc-saml-metadata-algsupport-v1.0.xsd
+http\://www.oasis-open.org/committees/download.php/1376/oasis-sstc-saml-schema-assertion-1.0.xsd = schema/oasis-sstc-saml-schema-assertion-1.0.xsd
+http\://www.oasis-open.org/committees/download.php/1377/oasis-sstc-saml-schema-protocol-1.0.xsd = schema/oasis-sstc-saml-schema-protocol-1.0.xsd
+http\://www.oasis-open.org/committees/download.php/3408/oasis-sstc-saml-schema-assertion-1.1.xsd = schema/oasis-sstc-saml-schema-assertion-1.1.xsd
+http\://www.oasis-open.org/committees/download.php/3407/oasis-sstc-saml-schema-protocol-1.1.xsd = schema/oasis-sstc-saml-schema-protocol-1.1.xsd
+
+# Legacy core schemas 
+classpath\:/schema/xml.xsd = schema/xml.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
+classpath\:/schema/saml-schema-assertion-2.0.xsd = schema/saml-schema-assertion-2.0.xsd
+classpath\:/schema/saml-schema-protocol-2.0.xsd = schema/saml-schema-protocol-2.0.xsd
+classpath\:/schema/saml-schema-metadata-2.0.xsd = schema/saml-schema-metadata-2.0.xsd
+classpath\:/schema/oasis-sstc-saml-schema-assertion-1.0.xsd = schema/oasis-sstc-saml-schema-assertion-1.0.xsd
+classpath\:/schema/oasis-sstc-saml-schema-protocol-1.0.xsd = schema/oasis-sstc-saml-schema-protocol-1.0.xsd
+classpath\:/schema/oasis-sstc-saml-schema-assertion-1.1.xsd = schema/oasis-sstc-saml-schema-assertion-1.1.xsd
+classpath\:/schema/oasis-sstc-saml-schema-protocol-1.1.xsd = schema/oasis-sstc-saml-schema-protocol-1.1.xsd
diff --git a/shib-metadata-api/src/main/resources/schema/shibboleth-metadata.xsd b/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
similarity index 100%
rename from shib-metadata-api/src/main/resources/schema/shibboleth-metadata.xsd
rename to shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.