[java-idp-testbed COMMIT] in /trunk/src/main/java: idp/PrepareOutboundMessageContext.java sp/Saml2Controller.java

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 28 11:53:17 2014
New Revision: 128

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=128&view=rev
Log:
Add @Qualifiers to idp and sp credentials.

Modified:
    trunk/src/main/java/idp/PrepareOutboundMessageContext.java
    trunk/src/main/java/sp/Saml2Controller.java

Modified: trunk/src/main/java/idp/PrepareOutboundMessageContext.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/idp/PrepareOutboundMessageContext.java?rev=128&r1=127&r2=128&view=diff
==============================================================================
--- trunk/src/main/java/idp/PrepareOutboundMessageContext.java (original)
+++ trunk/src/main/java/idp/PrepareOutboundMessageContext.java Tue Jan 28 11:53:17 2014
@@ -23,6 +23,7 @@
 import org.opensaml.xmlsec.messaging.SecurityParametersContext;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
 
@@ -32,6 +33,7 @@
 	private XMLObjectBuilderFactory builderFactory;
 	
 	@Autowired
+	@Qualifier("idp.Credential")
 	private Credential signingCredential;
 	
 	@Autowired

Modified: trunk/src/main/java/sp/Saml2Controller.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/sp/Saml2Controller.java?rev=128&r1=127&r2=128&view=diff
==============================================================================
--- trunk/src/main/java/sp/Saml2Controller.java (original)
+++ trunk/src/main/java/sp/Saml2Controller.java Tue Jan 28 11:53:17 2014
@@ -69,6 +69,7 @@
 	private ParserPool parserPool;
 	
 	@Autowired
+	@Qualifier("sp.Credential")
 	private Credential spCredential;
 
 	@RequestMapping(value="/InitSSO/Redirect", method=RequestMethod.GET)