[Amdatu-commits] SVN r2284 - in trunk/amdatu-auth: oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/osgi tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi

[subversion]

Author: ivo...@gmail.com
Date: Wed Apr 25 12:21:32 2012
New Revision: 2284

Log:
[AMDATUAUTH-123] Added missing Tenant dependencies

Modified:
   
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/osgi/Activator.java
   
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java

Modified: 
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/osgi/Activator.java
==============================================================================
--- 
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/osgi/Activator.java
   (original)
+++ 
trunk/amdatu-auth/oauth-consumerregistry/src/main/java/org/amdatu/auth/oauth/consumerregistry/osgi/Activator.java
   Wed Apr 25 12:21:32 2012
@@ -21,6 +21,7 @@
 import 
org.amdatu.auth.oauth.consumerregistry.service.OAuthServiceConsumerRegistryResourceProviderImpl;
 import org.amdatu.auth.tokenprovider.TokenProvider;
 import org.amdatu.libraries.osgi.ServiceDependentActivator;
+import org.amdatu.tenant.Tenant;
 import org.amdatu.web.httpcontext.ResourceProvider;
 import org.amdatu.web.rest.jaxrs.JaxRsSpi;
 
@@ -66,6 +67,7 @@
                 
.setInterface(OAuthServiceConsumerRegistryREST.class.getName(), null)
                 .setImplementation(OAuthServiceConsumerRegistryRESTImpl.class)
                 
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+                
.add(createServiceDependency().setService(Tenant.class).setRequired(true))
                 
.add(createServiceDependency().setService(TokenProvider.class).setRequired(true))
                 
.add(createServiceDependency().setService(OAuthServiceConsumerRegistry.class).setRequired(true))
                 .add(createServiceDependency().setService(UserAdmin.class)));

Modified: 
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java
==============================================================================
--- 
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java
     (original)
+++ 
trunk/amdatu-auth/tokenprovider/src/main/java/org/amdatu/auth/tokenprovider/osgi/Activator.java
     Wed Apr 25 12:21:32 2012
@@ -19,6 +19,7 @@
 import org.amdatu.auth.tokenprovider.TokenStorageProvider;
 import org.amdatu.auth.tokenprovider.service.TokenProviderImpl;
 import org.amdatu.libraries.osgi.ServiceDependentActivator;
+import org.amdatu.tenant.Tenant;
 import org.amdatu.web.rest.jaxrs.JaxRsSpi;
 
 import org.apache.felix.dm.DependencyManager;
@@ -45,6 +46,7 @@
             createComponent()
                 .setInterface(new String[] {ManagedService.class.getName(), 
TokenProvider.class.getName()}, null)
                 .setImplementation(TokenProviderImpl.class)
+                
.add(createServiceDependency().setService(Tenant.class).setRequired(true))
                 
.add(createServiceDependency().setService(LogService.class).setRequired(true))
                 
.add(createServiceDependency().setService(TokenStorageProvider.class).setRequired(true))
                 
.add(createConfigurationDependency().setPid(TokenProvider.PID)));
_______________________________________________
Amdatu-commits mailing list
Amdatu-commits@amdatu.org
http://lists.amdatu.org/mailman/listinfo/amdatu-commits