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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 16 15:41:09 2013
New Revision: 13

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=13&view=rev
Log:
Qualify autowiring to avoid conflict.

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

Modified: trunk/src/main/java/idp/BuildMockSaml2Response.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/idp/BuildMockSaml2Response.java?rev=13&r1=12&r2=13&view=diff
==============================================================================
--- trunk/src/main/java/idp/BuildMockSaml2Response.java (original)
+++ trunk/src/main/java/idp/BuildMockSaml2Response.java Wed Oct 16 15:41:09 2013
@@ -19,6 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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;
 
@@ -30,6 +31,7 @@
 	private XMLObjectBuilderFactory builderFactory;
 	
 	@Autowired
+	@Qualifier("testbed.IdGenerator")
 	private IdentifierGenerationStrategy idGenerator;
 
 

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=13&r1=12&r2=13&view=diff
==============================================================================
--- trunk/src/main/java/sp/Saml2Controller.java (original)
+++ trunk/src/main/java/sp/Saml2Controller.java Wed Oct 16 15:41:09 2013
@@ -37,6 +37,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -58,6 +59,7 @@
 	private MarshallerFactory marshallerFactory;
 	
 	@Autowired
+	@Qualifier("testbed.IdGenerator")
 	private IdentifierGenerationStrategy idGenerator;
 	
 	@Autowired