Cleanup test configuration files

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1890 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/testresources/basicIdpHome/arps/arp.site.xml b/testresources/basicIdpHome/arps/arp.site.xml
index f42644a..5624c2a 100644 (file)
--- a/testresources/basicIdpHome/arps/arp.site.xml
+++ b/testresources/basicIdpHome/arps/arp.site.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AttributeReleasePolicy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:arp:1.0" xsi:schemaLocation="urn:mace:shibboleth:arp:1.0 ../../schemas/shibboleth-arp-1.0.xsd" >
+<AttributeReleasePolicy 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+       xmlns="urn:mace:shibboleth:arp:1.0" 
+       xsi:schemaLocation="urn:mace:shibboleth:arp:1.0 ../../../src/schemas/shibboleth-arp-1.0.xsd" >
        <Description>Simplest possible ARP.</Description>
        <Rule>
                <Target>
@@ -20,5 +23,11 @@
                <Attribute name="urn:mace:dir:attribute-def:title">
                        <AnyValue release="permit"/>
                </Attribute>
+               <Attribute name="urn:mace:dir:attribute-def:givenName">
+                       <AnyValue release="permit"/>
+               </Attribute>
+               <Attribute name="urn:mace:dir:attribute-def:surname">
+                       <AnyValue release="permit"/>
+               </Attribute>
        </Rule>
 </AttributeReleasePolicy>

diff --git a/testresources/basicIdpHome/idpconfig.xml b/testresources/basicIdpHome/idpconfig.xml
index db1fecb..a4ec99c 100644 (file)
--- a/testresources/basicIdpHome/idpconfig.xml
+++ b/testresources/basicIdpHome/idpconfig.xml
@@ -40,10 +40,12 @@
     <!-- Logging Configuration
                The defaults work fine in this section, but it is sometimes helpful to use "DEBUG" as the level for 
                the <ErrorLog/> when trying to diagnose problems -->
+       <!--            
        <Logging>
                <ErrorLog level="WARN" location="file:/temp/shib-error.log" />
                <TransactionLog level="INFO" location="file:/temp/shib-access.log" />
        </Logging>
+       -->             
        <!-- Uncomment the configuration section below and comment out the one above if you would like to manually configure log4j -->
     <!--
        <Logging>

diff --git a/testresources/basicIdpHome/resolver.xml b/testresources/basicIdpHome/resolver.xml
index a1a3184..79f48f5 100644 (file)
--- a/testresources/basicIdpHome/resolver.xml
+++ b/testresources/basicIdpHome/resolver.xml
@@ -3,43 +3,37 @@
        xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 ../../src/schemas/shibboleth-resolver-1.0.xsd">
        
        <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonEntitlement">
-               <DataConnectorDependency requires="echo"/>
+               <DataConnectorDependency requires="jutest"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
-               <DataConnectorDependency requires="echo"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:title">
+               <DataConnectorDependency requires="jutest"/>
        </SimpleAttributeDefinition>
        
-       
-       <!-- To use these attributes, you should change the smartScope value to match your site's domain name. -->
-       <!--
-       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" smartScope="shibdev.edu">
-               <AttributeDependency requires="urn:mace:dir:attribute-def:eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
+               <DataConnectorDependency requires="jutest"/>
        </SimpleAttributeDefinition>
-
-       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonPrincipalName" smartScope="shibdev.edu">
-       <DataConnectorDependency requires="echo"/>
+               
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonScopedAffiliation">
+               <DataConnectorDependency requires="jutest"/>
        </SimpleAttributeDefinition>
-       -->
-       
        
-       <!-- Example persistent id attribute.  Since this configuration is permanent, some thought is required before 
-               deploying in production. Consider replacing this with a database-backed mechanism of some sort. -->      
-       <!--
-       <SAML2PersistentID id="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" sourceName="guid">
-               <DataConnectorDependency requires="echo"/>
-               <Salt keyStorePath="file:///usr/local/shibboleth-idp/etc/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
-       </SAML2PersistentID>
-       -->
-       <!--  Deprecated persistent id example, use only with SPs that are already relying on your values. -->
-       <!--
-       <PersistentIDAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonTargetedID" scope="shibdev.edu" sourceName="guid">
-               <DataConnectorDependency requires="echo"/>
-               <Salt keyStorePath="file:///usr/local/shibboleth-idp/etc/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
-       </PersistentIDAttributeDefinition>
-       -->
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:telephoneNumber">
+               <DataConnectorDependency requires="jutest"/>
+       </SimpleAttributeDefinition>
        
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:cn">
+               <DataConnectorDependency requires="jutest"/>
+       </SimpleAttributeDefinition>
        
-       <CustomDataConnector id="echo" class="edu.internet2.middleware.shibboleth.aa.attrresolv.provider.SampleConnector"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:givenName">
+               <DataConnectorDependency requires="jutest"/>
+       </SimpleAttributeDefinition>
+               
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:surname">
+               <DataConnectorDependency requires="jutest"/>
+       </SimpleAttributeDefinition>
+                       
+       <CustomDataConnector id="jutest" class="edu.internet2.middleware.shibboleth.runner.AttributeSourceForTests"/>
 
 </AttributeResolver>

diff --git a/testresources/basicSpHome/AAP.xml b/testresources/basicSpHome/AAP.xml
index 31fa959..e726fb5 100644 (file)
--- a/testresources/basicSpHome/AAP.xml
+++ b/testresources/basicSpHome/AAP.xml
@@ -1,6 +1,6 @@
 <AttributeAcceptancePolicy xmlns="urn:mace:shibboleth:1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:mace:shibboleth:1.0 ../schemas/shibboleth.xsd">
+    xsi:schemaLocation="urn:mace:shibboleth:1.0 ../../src/schemas/shibboleth.xsd">
 
        <!--
        An AAP is a set of AttributeRule elements, each one
@@ -97,7 +97,6 @@
        </AttributeRule>
        
        <!-- Some more eduPerson attributes, uncomment these to use them... -->
-       <!--
        
        <AttributeRule Name="urn:mace:dir:attribute-def:eduPersonNickname">
         <AnySite>
@@ -135,11 +134,9 @@
         </AnySite>
        </AttributeRule>
 
-       -->
 
 
        <!--Examples of common LDAP-based attributes, uncomment to use these... -->
-       <!--
        
        <AttributeRule Name="urn:mace:dir:attribute-def:cn" Header="Shib-Person-commonName">
                <AnySite>
@@ -153,6 +150,12 @@
         </AnySite>
        </AttributeRule>
        
+       <AttributeRule Name="urn:mace:dir:attribute-def:surname" Header="Shib-Person-surname">
+               <AnySite>
+            <AnyValue/>
+        </AnySite>
+       </AttributeRule>
+               
        <AttributeRule Name="urn:mace:dir:attribute-def:telephoneNumber" Header="Shib-Person-telephoneNumber">
                <AnySite>
             <AnyValue/>
@@ -291,6 +294,5 @@
         </AnySite>
        </AttributeRule>
        
-       -->
 
 </AttributeAcceptancePolicy>