Author: [email protected]
Date: Tue May 8 14:14:07 2012
New Revision: 2317
Log:
[AMDATUCASSANDRA-183] Multi-tenant hack to bypass AMDATU-669
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigDispatchExtenderFilter.java
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/osgi/Activator.java
Tue May 8 14:14:07 2012
@@ -120,7 +120,9 @@
createComponent()
.setInterface(new String[]
{InternalGadgetStore.class.getName()}, null)
.setImplementation(InternalGadgetStoreImpl.class)
-
.add(createServiceDependency().setService(GadgetDefinitionProvider.class).setRequired(true))
+ .add(
+
createServiceDependency().setService(GadgetDefinitionProvider.class).setRequired(true)
+ .setCallbacks("onAdded", "onRemoved"))
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
}
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Tue May 8 14:14:07 2012
@@ -168,9 +168,10 @@
+ ShindigRegistrationServiceImpl.GADGETS_RPC_BASE + "/.*)|("
+ ShindigRegistrationServiceImpl.GADGETS_RPC_BASE + "?.*)|("
+ ShindigRegistrationServiceImpl.REST_BASE + "/.*)");
- // 2000 to ensure we are invoked AFTER the
HostnameTenantResolverExtenderFilter. This is
- // required since our filter needs to set the tenant context to
PLATFORM.
- properties2.put(Constants.SERVICE_RANKING, 100);
+ // FIXME: Hack for AMDATU-669: set to 500 to ensure we are invoked
AFTER the
+ // HostnameTenantResolverExtenderFilter. This is required since our
filter needs to
+ // set the tenant context to PLATFORM.
+ properties2.put(Constants.SERVICE_RANKING, 500);
manager.add(
createComponent()
.setInterface(DispatchExtenderFilter.class.getName(),
properties2)
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigDispatchExtenderFilter.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigDispatchExtenderFilter.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigDispatchExtenderFilter.java
Tue May 8 14:14:07 2012
@@ -83,9 +83,15 @@
m_user.set(null);
}
+ // FIXME: this is a hack for AMDTU-669: set the Tenant to PLATFORM
+ //
request.setAttribute(org.amdatu.web.dispatcher.Constants.TENANT_REQUESTCONTEXT_KEY,
tenant);
+
request.setAttribute(org.amdatu.web.dispatcher.Constants.TENANTPID_REQUESTCONTEXT_KEY,
+ org.amdatu.tenant.Constants.PID_VALUE_PLATFORM);
+
chain.doFilter(request, response);
}
finally {
+
// Set the tenant to null
m_tenant.set(null);
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
