[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: credentials.xml relying-party-native.xml

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 27 23:15:02 2014
New Revision: 5978

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5978&view=rev
Log:
Some adjustments pending final class changes from Brent

Modified:
    trunk/idp-conf/src/main/resources/conf/credentials.xml
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml

Modified: trunk/idp-conf/src/main/resources/conf/credentials.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/credentials.xml?rev=5978&r1=5977&r2=5978&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Tue May 27 23:15:02 2014
@@ -84,13 +84,40 @@
         </constructor-arg>
     </bean>
 
-    <bean id="defaultEncryptionCredentials" class="org.opensaml.xmlsec.keyinfo.impl.CollectionKeyInfoCredentialResolver">
-        <constructor-arg>
+    <!-- TODO: Waiting on Brent to finalize the right classes here. -->
+    <bean id="defaultKeyEncryptionCredentialResolver" class="org.opensaml.xmlsec.keyinfo.impl.LocalKeyInfoCredentialResolver">
+        <constructor-arg name="localCredentialResolver">
+            <bean class="org.opensaml.xmlsec.keyinfo.impl.CollectionKeyInfoCredentialResolver">
+                <constructor-arg>
+                    <util:list>
+                        <ref bean="defaultEncryptionCredential" />
+                        <ref bean="secondaryEncryptionCredential" />
+                    </util:list>
+                </constructor-arg>
+            </bean>
+        </constructor-arg>
+        <constructor-arg name="keyInfoProviders">
             <util:list>
-                <ref bean="defaultEncryptionCredential" />
-                <ref bean="secondaryEncryptionCredential" />
+                <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.RSAKeyValueProvider" />
+                <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.DSAKeyValueProvider" />
+                <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.DEREncodedKeyValueProvider" />
+                <bean class="org.opensaml.xmlsec.keyinfo.impl.provider.InlineX509DataProvider" />
             </util:list>
         </constructor-arg>
     </bean>
 
+    <!-- TODO: once Spring config is facilitated. -->
+    <!--
+    <bean id="defaultEncryptedKeyResolver" class="org.opensaml.xmlsec.encryption.support.ChainingEncryptedKeyResolver">
+        <constructor-arg>
+            <util:list>
+                <bean class="org.opensaml.xmlsec.encryption.support.InlineEncryptedKeyResolver" />
+                <bean class="org.opensaml.saml.saml2.encryption.EncryptedElementTypeEncryptedKeyResolver" />
+                <bean class="org.opensaml.xmlsec.encryption.support.SimpleRetrievalMethodEncryptedKeyResolver" />
+                <bean class="org.opensaml.xmlsec.encryption.support.SimpleKeyInfoReferenceEncryptedKeyResolver" />
+            </util:list>
+        </constructor-arg>
+    </bean>
+    -->
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-native.xml?rev=5978&r1=5977&r2=5978&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-native.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-native.xml Tue May 27 23:15:02 2014
@@ -23,53 +23,7 @@
         p:defaultSecurityConfiguration-ref="DefaultSecurityConfiguration" />
 
     <bean id="RelyingParty" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration" abstract="true"
-        p:responderId-ref="entityID" p:detailedErrors="${idp.errors.detailed}" />
-        
-    <!-- Your IdP's default name, set via property file. -->
-    <bean id="entityID" class="java.lang.String" c:_0="${idp.entity.id}" />
-
-    <!-- Security Configuration Defaults -->
-
-    <bean id="DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
-    
-        <property name="signatureSigningConfiguration">
-            <bean class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
-                    p:signingCredentials-ref="defaultSigningCredential">
-                <property name="signatureAlgorithms">
-                    <util:list>
-                        <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256" />
-                        <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA256" />
-                    </util:list>
-                </property>
-                <property name="signatureReferenceDigestMethods">
-                    <util:list>
-                        <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_DIGEST_SHA256" />

[... 81 lines stripped ...]