[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attrib...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug 26 05:16:54 2016
New Revision: 8353

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8353&view=rev
Log:
IDP-813 Flatten Attribute Resolution Namespaces - start on DataConnectors

https://issues.shibboleth.net/jira/browse/IDP-813

Introduce new intermediate base type for the flattened DataConnectors
Renamed "resolver:Script" to "resolver:ScriptedAttribute" to allow type distinction from "resolver:ScripedDataConnector"

Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFile.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeInline.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFile.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFile.xml?rev=8353&r1=8352&r2=8353&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFile.xml	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFile.xml	Fri Aug 26 05:16:54 2016
@@ -2,7 +2,7 @@
     xmlns="urn:mace:shibboleth:2.0:resolver"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     dependencyOnly="1"
-    xsi:type="Script" id="scriptedFile"
+    xsi:type="ScriptedAttribute" id="scriptedFile"
     xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
     <ScriptFile>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/file.script</ScriptFile>
 </AttributeDefinition>

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeInline.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeInline.xml?rev=8353&r1=8352&r2=8353&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeInline.xml	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeInline.xml	Fri Aug 26 05:16:54 2016
@@ -2,7 +2,7 @@
     xmlns="urn:mace:shibboleth:2.0:resolver"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     dependencyOnly="1"
-    xsi:type="Script" id="scriptedInline"
+    xsi:type="ScriptedAttribute" id="scriptedInline"
     xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
     <Script>foo="bar";</Script>
 </AttributeDefinition>

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd?rev=8353&r1=8352&r2=8353&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd	(original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd	Fri Aug 26 05:16:54 2016
@@ -161,7 +161,8 @@
             </documentation>
         </annotation>
     </element>
-    <complexType name="BaseDataConnectorType">
+
+    <complexType name="FlattenedBaseDataConnectorType">
         <annotation>
             <documentation>
                 Data connectors pull information from local infrastructure, such as
@@ -171,34 +172,49 @@
         </annotation>
         <complexContent>
             <extension base="resolver:BaseResolutionPlugInType">
-                <sequence>
+                <attribute name="noRetryDelay" type="string">
+                    <annotation>
+                        <documentation>Time to bypass connector after a failure before trying it again.</documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="springResources" type="string">
+                    <annotation>
+                        <documentation>Locations of Spring resource configurations.</documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="springResourcesRef" type="string">
+                    <annotation>

[... 80 lines stripped ...]