[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/profile-defaults.xml idp-profile-spring/s...

[noreply at shibboleth.net]

Author: scantor
Date: Sat May 17 13:08:46 2014
New Revision: 5944

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5944&view=rev
Log:
Global defaults are in, so we don't need to override them.

Modified:
    trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java

Modified: trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/profile-defaults.xml?rev=5944&r1=5943&r2=5944&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/profile-defaults.xml Sat May 17 13:08:46 2014
@@ -66,46 +66,5 @@
         c:_0="1111" />
     <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/shibboleth-sso" />
-        
-	<!-- And the global default security configuration. -->
-
-	<bean id="shibboleth.DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
-        <property name="signatureSigningConfiguration">
-            <bean class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration">
-                <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" />
-                    </util:list>
-                </property>
-                <property name="signatureCanonicalizationAlgorithm">
-                    <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS" />
-                </property>
-            </bean>
-        </property>
-        <property name="encryptionConfiguration">
-            <bean class="org.opensaml.xmlsec.impl.BasicEncryptionConfiguration">
-                <property name="dataEncryptionAlgorithms">
-                    <util:list>
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM" />
-                    </util:list>
-                </property>
-                <property name="keyTransportEncryptionAlgorithms">
-                    <util:list>
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP" />
-                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP11" />
-                    </util:list>
-                </property>
-            </bean>
-        </property>
-    </bean>
-    
-    <util:map id="shibboleth.DefaultSecurityConfigurationMap" />
-    
+            
 </beans>

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java?rev=5944&r1=5943&r2=5944&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java Sat May 17 13:08:46 2014
@@ -84,10 +84,6 @@
                         parserContext);
         builder.addPropertyValue("anonymousConfiguration", anonRps.get(0));
         
-        // The default security is specified in an external bean file.
-        builder.addPropertyReference("securityConfigurationMap", "shibboleth.DefaultSecurityConfigurationMap");
-        builder.addPropertyReference("defaultSecurityConfiguration", "shibboleth.DefaultSecurityConfiguration");
-
         // Metadata
 
         final List<BeanDefinition> metadataProviders =