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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Sep 11 05:44:09 2016
New Revision: 8383

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8383&view=rev
Log:
IDP-813 Modify tests

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

Move a test file over to new schema.  Modify the new schema test file for LDAP to use the widely used "sec:X509ResourceBased" TrustCertificate (prior to making that a short cut).

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap.crt   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml?rev=8383&r1=8382&r2=8383&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml	Sun Sep 11 05:44:09 2016
@@ -5,301 +5,295 @@
 	data connectors. Not all attribute definitions, data connectors, or principal 
 	connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation 
 	for a complete list of components and their options. -->
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
-                            xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-                            xmlns:sec="urn:mace:shibboleth:2.0:security" 
-                            xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                                               urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
-                                               urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                                               urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                                               urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                                               urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                   xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
+                   xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+                                       urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd">
 
     <!-- ========================================== -->
     <!--      Attribute Definitions                 -->
     <!-- ========================================== -->
 
-    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation" sourceAttributeID="staticEpA">
-        <resolver:Dependency ref="staticAttributes" />
-    </resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="simpleEPE" sourceAttributeID="eduPersonEntitlement" dependencyOnly="true">
-        <resolver:Dependency ref="staticAttributes" />
-    </resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="simpleEPE" sourceAttributeID="eduPersonEntitlement" dependencyOnly="true">
-        <resolver:Dependency ref="staticAttributes" />
-    </resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="broken" sourceAttributeID="staticEpA">
-        <resolver:Dependency ref="simpleEPE" />
-        <resolver:Dependency ref="eduPersonAffiliation" />
-        <resolver:Dependency ref="staticAttributes" />
-    </resolver:AttributeDefinition>
-

[... 636 lines stripped ...]