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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Nov 10 10:43:58 2014
New Revision: 6867

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6867&view=rev
Log:
IDP-508 relax schema to allow multiple attribute resolver files.  enable multiple resolver file test and fix test file.

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java?rev=6867&r1=6866&r2=6867&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java Mon Nov 10 10:43:58 2014
@@ -367,7 +367,7 @@
         Assert.assertTrue(resolutionContext.getResolvedIdPAttributes().isEmpty());
     }
     
-    @Test(enabled=false) public void multiFile() throws ResolutionException {
+    @Test public void multiFile() throws ResolutionException {
         final ReloadableService<AttributeResolver> attributeResolverService = getResolver("net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml");
         
         final AttributeResolutionContext resolutionContext =

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml?rev=6867&r1=6866&r2=6867&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml Mon Nov 10 10:43:58 2014
@@ -15,7 +15,7 @@
     <!-- ========================================== -->
 
     <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation2" sourceAttributeID="eduPersonAffiliation">
-        <resolver:Dependency ref="eduPersonAffiliation56" />
+        <resolver:Dependency ref="eduPersonAffiliation" />
     </resolver:AttributeDefinition>
     
 </resolver:AttributeResolver>

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=6867&r1=6866&r2=6867&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 Mon Nov 10 10:43:58 2014
@@ -16,25 +16,6 @@
 			<documentation>Root of the attribute resolver configuration file.
 			</documentation>
 		</annotation>
-		<keyref name="AttributeDefinitionAttributeDefinitionDependencyRef"
-			refer="resolver:PluginDependencyKey">
-			<selector xpath="./resolver:AttributeDefinition/resolver:Dependency" />
-			<field xpath="@ref" />
-		</keyref>
-		<keyref name="DataConnectorAttributeDefinitionDependencyRef"
-			refer="resolver:PluginDependencyKey">
-			<selector xpath="./resolver:DataConnector/resolver:Dependency" />
-			<field xpath="@ref" />
-		</keyref>
-		<keyref name="PrincipalConnectorAttributeDefinitionDependencyRef"
-			refer="resolver:PluginDependencyKey">
-			<selector xpath="./resolver:PrincipalConnector/resolver:Dependency" />
-			<field xpath="@ref" />
-		</keyref>
-		<key name="PluginDependencyKey">
-			<selector xpath="./resolver:AttributeDefinition|./resolver:DataConnector" />
-			<field xpath="@id" />
-		</key>
 	</element>
 	<complexType name="AttributeResolverType">
 		<choice minOccurs="0" maxOccurs="unbounded">