Author: [email protected]
Date: Wed Oct 12 13:55:47 2011
New Revision: 1493
Log:
AMDATU-434 now also stores the tenant id
Modified:
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
Modified:
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
(original)
+++
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/HostnameTenantResolverExtenderFilter.java
Wed Oct 12 13:55:47 2011
@@ -15,29 +15,27 @@
*/
package org.amdatu.web.tenantresolver.hostname.service;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.TenantEntity;
-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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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.TenantEntity;
+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 HostnameTenantResolverExtenderFilter implements
DispatchExtenderFilter {
-
- public final static String TENANT_REQUESTCONTEXT_KEY =
"org.amdatu.web.dispatcher.TENANT";
-
private volatile TenantManagementService m_tenantManagementService;
private volatile LogService m_logService;
@@ -51,10 +49,7 @@
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 serverName = httpServletRequest.getServerName();
if (serverName != null) {
@@ -64,10 +59,11 @@
List<TenantEntity> tenants =
m_tenantManagementService.getTenants(matchProperties);
if (tenants != null && tenants.size() > 0) {
if (tenants.size() > 1) {
- m_logService.log(LogService.LOG_WARNING,
- "Hostname resolved to multiple tenants..... using
first");
+ m_logService.log(LogService.LOG_WARNING, "Hostname
resolved to multiple tenants..... using first");
}
- servletRequest.setAttribute(TENANT_REQUESTCONTEXT_KEY,
tenants.get(0));
+ TenantEntity tenant = tenants.get(0);
+
servletRequest.setAttribute(DispatcherService.TENANT_REQUESTCONTEXT_KEY,
tenant);
+
servletRequest.setAttribute(DispatcherService.TENANTID_REQUESTCONTEXT_KEY,
tenant.getId());
}
}
catch (TenantException e) {}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
