Author: [email protected]
Date: Tue May 29 16:56:47 2012
New Revision: 2414
Log:
[AMDATUOPENSOCIAL-209] Removed hack for AMDATU-669 (not necessary anymore for
1.0.0-RC3)
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/service/ShindigDispatchExtenderFilter.java
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 29 16:56:47 2012
@@ -168,10 +168,7 @@
+ ShindigRegistrationServiceImpl.GADGETS_RPC_BASE + "/.*)|("
+ ShindigRegistrationServiceImpl.GADGETS_RPC_BASE + "?.*)|("
+ ShindigRegistrationServiceImpl.REST_BASE + "/.*)");
- // 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);
+ properties2.put(Constants.SERVICE_RANKING, 100);
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 29 16:56:47 2012
@@ -88,11 +88,6 @@
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 {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
