Author: [email protected]
Date: Wed Apr 25 15:20:08 2012
New Revision: 2287
Log:
[AMDATUAUTH-123] Updated consumer and provider examples for new multi-tenancy
design
Modified:
trunk/amdatu-auth/oauth-example/consumer/pom.xml
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/osgi/Activator.java
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/service/OAuthGadgetDefinition.java
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/osgi/Activator.java
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
Modified: trunk/amdatu-auth/oauth-example/consumer/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-example/consumer/pom.xml (original)
+++ trunk/amdatu-auth/oauth-example/consumer/pom.xml Wed Apr 25 15:20:08 2012
@@ -110,7 +110,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.auth.example.oauth.consumer.osgi.Activator</Bundle-Activator>
+ <X-MultiTenant-Version>1</X-MultiTenant-Version>
+
<X-MultiTenant-Bundle-Activator>org.amdatu.auth.example.oauth.consumer.osgi.Activator</X-MultiTenant-Bundle-Activator>
+ <X-MultiTenant-Binding>TENANTS</X-MultiTenant-Binding>
+
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService))</X-MultiTenant-Scope>
+
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Export-Package />
Modified:
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/osgi/Activator.java
Wed Apr 25 15:20:08 2012
@@ -74,9 +74,10 @@
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
// Register a OAuth gadget definition for each tenant
- manager.add(createAdapterService(Tenant.class, null)
+ manager.add(createComponent()
.setInterface(GadgetDefinitionProvider.class.getName(), null)
.setImplementation(OAuthGadgetDefinition.class)
+
.add(createServiceDependency().setService(Tenant.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(false)));
}
Modified:
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/service/OAuthGadgetDefinition.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/service/OAuthGadgetDefinition.java
(original)
+++
trunk/amdatu-auth/oauth-example/consumer/src/main/java/org/amdatu/auth/example/oauth/consumer/service/OAuthGadgetDefinition.java
Wed Apr 25 15:20:08 2012
@@ -42,7 +42,6 @@
private static final String SERVICE_NAME = "oauth-example";
public void start() {
- //FIXME: was m_tenant.getId()
m_logService.log(LogService.LOG_INFO,
"Service '" + getClass().getName() + "' started for tenant '" +
m_tenant.getPID() + "'");
}
Modified:
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/osgi/Activator.java
Wed Apr 25 15:20:08 2012
@@ -18,6 +18,7 @@
import org.amdatu.auth.example.oauth.provider.service.DummyInterface;
import org.amdatu.auth.example.oauth.provider.service.OAuthProtectedResource;
import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
+import org.amdatu.auth.oauth.server.OAuthTokenProvider;
import org.amdatu.tenant.Tenant;
import org.amdatu.libraries.osgi.ServiceDependentActivator;
import org.amdatu.web.rest.jaxrs.JaxRsSpi;
@@ -68,10 +69,12 @@
properties.put(org.amdatu.web.jsp.Constants.JSP_ALIAS_KEY, JSP_ALIAS);
properties.put(org.amdatu.web.resource.Constants.RESOURCE_ALIAS_KEY,
RES_ALIAS);
- manager.add(createAdapterService(Tenant.class, null)
+ manager.add(createComponent()
.setInterface(DummyInterface.class.getName(), null)
.setImplementation(OAuthProtectedResource.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService(Tenant.class).setRequired(true))
+
.add(createServiceDependency().setService(OAuthTokenProvider.class).setRequired(true))
.add(createServiceDependency().setService(OAuthServiceConsumerRegistry.class).setRequired(true)));
}
Modified:
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
==============================================================================
---
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
(original)
+++
trunk/amdatu-auth/oauth-example/provider/src/main/java/org/amdatu/auth/example/oauth/provider/service/OAuthProtectedResource.java
Wed Apr 25 15:20:08 2012
@@ -75,25 +75,10 @@
private volatile OAuthTokenProvider m_tokenProvider;
private volatile OAuthServiceConsumerRegistry m_consumerRegistry;
- public void init(final Component component) {
- List<ServiceDependency> dependencies = new
ArrayList<ServiceDependency>();
- dependencies.add(getTenantServiceDependency(OAuthTokenProvider.class));
- component.add(dependencies);
- }
-
public void start() {
registerConsumer();
}
- private ServiceDependency getTenantServiceDependency(final Class<?> clazz)
{
- String tenantFilter = "(&(" + org.amdatu.tenant.Constants.PID_KEY +
"=" + m_tenant.getPID()
- + ")(" + Constants.OBJECTCLASS + "=" + clazz.getName() + "))";
- return m_dependencyManager.createServiceDependency()
- .setService(clazz, tenantFilter)
- .setRequired(true)
- .setInstanceBound(true);
- }
-
@GET
@Produces({MediaType.TEXT_HTML})
public Response getResource(@Context final HttpServletRequest request) {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
