[java-identity-provider COMMIT] in /trunk/idp-core/src/main/java/net/shibboleth/idp/service: AbstractSpringReloadable...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Nov 14 15:12:26 2013
New Revision: 4947

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4947&view=rev
Log:
IDP-329 Make AbstractSpringService implement ApplicationContextAware so the parent context is set appropriately.

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringReloadableService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringService.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringReloadableService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringReloadableService.java?rev=4947&r1=4946&r2=4947&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringReloadableService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringReloadableService.java Thu Nov 14 15:12:26 2013
@@ -52,6 +52,7 @@
  * 
  * @see AbstractSpringService
  */
+// TODO Probably need to implement ApplicationContextAware. 
 @ThreadSafe
 public abstract class AbstractSpringReloadableService extends AbstractReloadableService {
 

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringService.java?rev=4947&r1=4946&r2=4947&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringService.java Thu Nov 14 15:12:26 2013
@@ -32,6 +32,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.GenericApplicationContext;
 
 import com.google.common.base.Predicates;
@@ -52,7 +53,7 @@
  * change occurs the service context will not be replaced until after all current reads have completed.
  */
 @ThreadSafe
-public abstract class AbstractSpringService extends AbstractService {
+public abstract class AbstractSpringService extends AbstractService implements ApplicationContextAware {
 
     /** Key under which the Spring Application Context is stored in the start/stop context. */
     public static final String APP_CTX_CTX_KEY = "appContext";
@@ -100,6 +101,13 @@
      */
     @Nonnull public List<Resource> getServiceConfigurations() {
         return serviceConfigurations;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setApplicationContext(ApplicationContext applicationContext) {
+        setParentContext(applicationContext);
     }
 
     /**