[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/conf: global-system.xml security-system.xml

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 12 00:26:22 2014
New Revision: 7075

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7075&view=rev
Log:
Undo bean move.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/security-system.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7075&r1=7074&r2=7075&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Fri Dec 12 00:26:22 2014
@@ -184,5 +184,34 @@
 
     <bean id="shibboleth.DefaultIdentifierGenerationStrategy"
         class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy" />
+
+    <!-- Beans that implement the mashing of security configurations into final parameter sets. -->
+    
+    <bean id="shibboleth.SignatureValidationParametersResolver"
+        class="org.opensaml.xmlsec.impl.BasicSignatureValidationParametersResolver" />
+    <bean id="shibboleth.SignatureSigningParametersResolver"
+        class="org.opensaml.saml.security.impl.SAMLMetadataSignatureSigningParametersResolver" />
+    <bean id="shibboleth.DecryptionParametersResolver"
+        class="org.opensaml.xmlsec.impl.BasicDecryptionParametersResolver" />
+    <bean id="shibboleth.EncryptionParametersResolver"
+        class="org.opensaml.saml.security.impl.SAMLMetadataEncryptionParametersResolver"
+        c:resolver-ref="shibboleth.MetadataCredentialResolver" />
+    <bean id="shibboleth.ClientTLSValidationParametersResolver"
+        class="org.opensaml.security.x509.tls.impl.BasicClientTLSValidationParametersResolver" />
+
+    <!--
+    The beans below are primarily used by trust engines in relying-party-system.xml, but also in the
+    resolver for encryption parameters above.
+    -->
+
+    <bean id="shibboleth.MetadataCredentialResolver"
+        class="org.opensaml.saml.security.impl.MetadataCredentialResolver"
+         p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
+         p:keyInfoCredentialResolver-ref="shibboleth.KeyInfoCredentialResolver">
+    </bean>
+
+    <bean id="shibboleth.KeyInfoCredentialResolver"
+        class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap"
+        factory-method="buildBasicInlineKeyInfoCredentialResolver" />
     
  </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/security-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/security-system.xml?rev=7075&r1=7074&r2=7075&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/security-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/security-system.xml Fri Dec 12 00:26:22 2014
@@ -40,34 +40,5 @@
         class="org.opensaml.xmlsec.impl.BasicDecryptionConfiguration"
         p:whitelistedAlgorithms="#{getObject('shibboleth.EncryptionWhitelist')}"
         p:blacklistedAlgorithms="#{getObject('shibboleth.EncryptionBlacklist')}" />
-    
-    <!-- Beans that implement the mashing of security configurations into final parameter sets. -->
-    
-    <bean id="shibboleth.SignatureValidationParametersResolver"
-        class="org.opensaml.xmlsec.impl.BasicSignatureValidationParametersResolver" />
-    <bean id="shibboleth.SignatureSigningParametersResolver"
-        class="org.opensaml.saml.security.impl.SAMLMetadataSignatureSigningParametersResolver" />
-    <bean id="shibboleth.DecryptionParametersResolver"
-        class="org.opensaml.xmlsec.impl.BasicDecryptionParametersResolver" />
-    <bean id="shibboleth.EncryptionParametersResolver"
-        class="org.opensaml.saml.security.impl.SAMLMetadataEncryptionParametersResolver"
-        c:resolver-ref="shibboleth.MetadataCredentialResolver" />
-    <bean id="shibboleth.ClientTLSValidationParametersResolver"
-        class="org.opensaml.security.x509.tls.impl.BasicClientTLSValidationParametersResolver" />
-
-    <!--
-    The beans below are primarily used by trust engines in relying-party-system.xml, but also in the
-    resolver for encryption parameters above.
-    -->
-
-    <bean id="shibboleth.MetadataCredentialResolver"
-        class="org.opensaml.saml.security.impl.MetadataCredentialResolver"
-         p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
-         p:keyInfoCredentialResolver-ref="shibboleth.KeyInfoCredentialResolver">
-    </bean>
-
-    <bean id="shibboleth.KeyInfoCredentialResolver"
-        class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap"
-        factory-method="buildBasicInlineKeyInfoCredentialResolver" />
-    
+        
 </beans>