You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/21 14:40:17 UTC
[02/18] incubator-usergrid git commit: Added qualifiers to beans with
more than 1 possibility
Added qualifiers to beans with more than 1 possibility
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3b85da79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3b85da79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3b85da79
Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 3b85da791071191bef448e5af33af7b347a694eb
Parents: 2ac22fd
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Feb 17 23:03:21 2015 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Feb 17 23:03:21 2015 -0800
----------------------------------------------------------------------
.../java/org/apache/usergrid/rest/filters/MeteringFilter.java | 2 ++
.../usergrid/rest/security/SecuredResourceFilterFactory.java | 2 ++
.../usergrid/rest/security/shiro/filters/SecurityFilter.java | 3 +++
3 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b85da79/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
index 8bb84d7..b483f5f 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Context;
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.stereotype.Component;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManager;
@@ -90,6 +91,7 @@ public class MeteringFilter implements ContainerRequestFilter, ContainerResponse
@Autowired
+ @Qualifier("properties")
public void setProperties( Properties properties ) {
this.properties = properties;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b85da79/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
index 3b7603b..202eb31 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
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.stereotype.Component;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.ManagementService;
@@ -104,6 +105,7 @@ public class SecuredResourceFilterFactory implements ResourceFilterFactory {
@Autowired
+ @Qualifier("properties")
public void setProperties( Properties properties ) {
this.properties = properties;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b85da79/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
index 46c68f8..53f9354 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
@@ -26,6 +26,8 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManagerFactory;
import org.apache.usergrid.security.tokens.TokenService;
@@ -88,6 +90,7 @@ public abstract class SecurityFilter implements ContainerRequestFilter {
@Autowired
+ @Qualifier("properties")
public void setProperties( Properties properties ) {
this.properties = properties;
}