[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.x...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 17 12:29:29 2013
New Revision: 5046

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5046&view=rev
Log:
IDP-330 Remove services schemas and top level service definition from the attribute filter and attribute resolver custom configuration schemata.  Add version to track the fact that we have changed it
Remove the schema itself from the jar

Modified:
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.xsd
    trunk/idp-attribute-resolver-spring/src/main/resources/schema/shibboleth-2.0-attribute-resolver.xsd
    trunk/idp-core/src/main/resources/schema/shibboleth-2.0-services.xsd

Modified: trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.xsd?rev=5046&r1=5045&r2=5046&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.xsd (original)
+++ trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp.xsd Tue Dec 17 12:29:29 2013
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:service="urn:mace:shibboleth:2.0:services" targetNamespace="urn:mace:shibboleth:2.0:afp" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:services" schemaLocation="classpath:/schema/shibboleth-2.0-services.xsd"/>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+        xmlns:afp="urn:mace:shibboleth:2.0:afp"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 
+        targetNamespace="urn:mace:shibboleth:2.0:afp"
+        version="3.0.0"
+        elementFormDefault="qualified">
 
     <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="classpath:/schema/xmldsig-core-schema.xsd"/>
 
     <annotation>
         <documentation>Schema for the attribute filter policies.</documentation>
     </annotation>
-
-    <complexType name="ShibbolethAttributeFilteringEngine">
-        <annotation>
-            <documentation>Service definition for creating Shibboleth attribute filtering engines.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ReloadableServiceType"/>
-        </complexContent>
-    </complexType>
 
     <element name="AttributeFilterPolicyGroup" type="afp:AttributeFilterPolicyGroupType">
         <annotation>

Modified: trunk/idp-attribute-resolver-spring/src/main/resources/schema/shibboleth-2.0-attribute-resolver.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/resources/schema/shibboleth-2.0-attribute-resolver.xsd?rev=5046&r1=5045&r2=5046&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/resources/schema/shibboleth-2.0-attribute-resolver.xsd (original)
+++ trunk/idp-attribute-resolver-spring/src/main/resources/schema/shibboleth-2.0-attribute-resolver.xsd Tue Dec 17 12:29:29 2013
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:service="urn:mace:shibboleth:2.0:services" targetNamespace="urn:mace:shibboleth:2.0:resolver" elementFormDefault="qualified">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+        xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+        targetNamespace="urn:mace:shibboleth:2.0:resolver"
+        elementFormDefault="qualified" 
+        version="3.0">
 
     <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="classpath:/schema/xml.xsd"/>
-
-    <import namespace="urn:mace:shibboleth:2.0:services" schemaLocation="classpath:/schema/shibboleth-2.0-services.xsd"/>
 
     <annotation>
         <documentation>Shibboleth 2.0 Attribute Resolver configuration schema</documentation>
     </annotation>
-
-    <complexType name="ShibbolethAttributeResolver">
-        <annotation>
-            <documentation>Service definition for the Shibboleth attribute resolver.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ReloadableServiceType"/>
-        </complexContent>
-    </complexType>
 
     <element name="AttributeResolver" type="resolver:AttributeResolverType">
         <annotation>