Author: [email protected]
Date: Wed Oct 12 13:55:24 2011
New Revision: 1492
Log:
AMDATU-434 now also stores the tenant id
Modified:
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
Modified:
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
(original)
+++
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/ParameterTenantResolverExtenderFilter.java
Wed Oct 12 13:55:24 2011
@@ -15,24 +15,23 @@
*/
package org.amdatu.web.tenantresolver.parameter.service;
-import java.io.IOException;
-
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.amdatu.core.tenant.Tenant;
-import org.amdatu.core.tenant.TenantException;
-import org.amdatu.core.tenant.TenantManagementService;
-import org.amdatu.web.dispatcher.DispatchExtenderFilter;
-import org.osgi.service.log.LogService;
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import org.amdatu.core.tenant.Tenant;
+import org.amdatu.core.tenant.TenantException;
+import org.amdatu.core.tenant.TenantManagementService;
+import org.amdatu.web.dispatcher.DispatchExtenderFilter;
+import org.amdatu.web.dispatcher.DispatcherService;
+import org.osgi.service.log.LogService;
public final class ParameterTenantResolverExtenderFilter implements
DispatchExtenderFilter {
-
- public final static String TENANT_REQUESTCONTEXT_KEY =
"org.amdatu.web.dispatcher.TENANT";
public final static String TENANT_REQUEST_PARAMETER = "tenant";
private volatile TenantManagementService m_tenantManagementService;
@@ -48,21 +47,18 @@
public void destroy() {
}
- public void doFilter(ServletRequest servletRequest, ServletResponse
servletResponse, FilterChain filterChain)
- throws IOException,
- ServletException {
-
+ public void doFilter(ServletRequest servletRequest, ServletResponse
servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest httpServletRequest = (HttpServletRequest)
servletRequest;
String tenantId =
httpServletRequest.getParameter(TENANT_REQUEST_PARAMETER);
if (tenantId != null) {
try {
Tenant tenant =
m_tenantManagementService.getTenantById(tenantId);
if (tenant != null) {
- servletRequest.setAttribute(TENANT_REQUESTCONTEXT_KEY,
tenant);
+
servletRequest.setAttribute(DispatcherService.TENANT_REQUESTCONTEXT_KEY,
tenant);
+
servletRequest.setAttribute(DispatcherService.TENANTID_REQUESTCONTEXT_KEY,
tenantId);
}
else {
- m_logService.log(LogService.LOG_WARNING,
- "Tenant parameter did not resolve to a tenant..... " +
tenantId);
+ m_logService.log(LogService.LOG_WARNING, "Tenant parameter
did not resolve to a tenant: " + tenantId);
}
}
catch (TenantException e) {}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
