[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-resolver-full.xml attribute-res...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 17 11:34:10 2014
New Revision: 7150

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7150&view=rev
Log:
Pull some old features and unneeded examples from the resolver configs.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=7150&r1=7149&r2=7150&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml Wed Dec 17 11:34:10 2014
@@ -9,13 +9,13 @@
     and their options.
 -->
 <resolver:AttributeResolver
-        xmlns:resolver="urn:mace:shibboleth:2.0:resolver" 
+        xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
         xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
-        xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
+        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:enc="urn:mace:shibboleth:2.0:attribute:encoder"
         xmlns:sec="urn:mace:shibboleth:2.0:security"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     	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
@@ -251,24 +251,6 @@
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
     </resolver:AttributeDefinition>
     -->
-        
-    <!--
-    <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTargetedID" 
-                                  nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="computedID">
-        <resolver:Dependency ref="computedID" />
-        <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
-        <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
-    </resolver:AttributeDefinition>
-    -->
-    
-    <!-- Do NOT use the version of eduPersonTargetedID defined below unless you understand 
-         why it was deprecated and know that this reason does not apply to you. -->
-    <!--
-    <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonTargetedID.old" scope="%{idp.scope}" sourceAttributeID="computedID">
-        <resolver:Dependency ref="computedID" />
-        <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonTargetedID" />
-    </resolver:AttributeDefinition>
-    -->
 
     <!-- ========================================== -->
     <!--      Data Connectors                       -->
@@ -279,10 +261,6 @@
     <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
         <dc:Attribute id="eduPersonAffiliation">
             <dc:Value>member</dc:Value>
-        </dc:Attribute>
-        <dc:Attribute id="eduPersonEntitlement">
-            <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
-            <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
         </dc:Attribute>
     </resolver:DataConnector>
     -->
@@ -323,16 +301,5 @@
         </dc:StartTLSTrustCredential>
     </resolver:DataConnector>
     -->
-    
-    <!-- Computed targeted ID connector -->
-    <!--
-    <resolver:DataConnector xsi:type="dc:ComputedId"
-                            id="computedID"
-                            generatedAttributeID="computedID"
-                            sourceAttributeID="uid"
-                            salt="your random string here">
-        <resolver:Dependency ref="myLDAP" />
-    </resolver:DataConnector> 
-    -->
 
 </resolver:AttributeResolver>

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml?rev=7150&r1=7149&r2=7150&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml Wed Dec 17 11:34:10 2014
@@ -95,10 +95,6 @@
         <dc:Attribute id="staticEpA">

[... 10 lines stripped ...]