Author: [email protected]
Date: Tue Feb 7 18:03:23 2012
New Revision: 2070
Log:
AMDATU-554: rename Tenant#getId() to Tenant#getPID(). Updated constants and
related variable names as far as possible.
Modified:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleActivator.java
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/tenant/factory/TenantService.java
trunk/amdatu-core/tenant/src/main/java/org/amdatu/tenant/Tenant.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/DispatcherService.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/HostnameTenantResolverTest.java
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/ParameterTenantResolverTest.java
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/TenantRegistry.java
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/TenantRegistry.java
Modified:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleActivator.java
==============================================================================
---
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleActivator.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/MultiTenantBundleActivator.java
Tue Feb 7 18:03:23 2012
@@ -56,7 +56,7 @@
}
@Override
- protected String getTenantID() {
+ protected String getTenantPID() {
return PID_VALUE_PLATFORM;
}
})
Modified:
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
==============================================================================
---
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
(original)
+++
trunk/amdatu-core/tenant-adapter/src/main/java/org/amdatu/tenant/adapter/TenantAdapter.java
Tue Feb 7 18:03:23 2012
@@ -44,7 +44,7 @@
* Called by Felix dependency manager when this service adapter is started.
*/
public void start() {
- m_log.log(LogService.LOG_DEBUG, "[" + getTenantID() + "] Starting " +
getBundleHeader(Constants.BUNDLE_NAME));
+ m_log.log(LogService.LOG_DEBUG, "[" + getTenantPID() + "] Starting " +
getBundleHeader(Constants.BUNDLE_NAME));
m_bundleActivatorClass =
getBundleHeader(MULTITENANT_BUNDLE_ACTIVATOR_KEY);
if (m_bundleActivatorClass == null) {
@@ -57,12 +57,12 @@
(BundleActivator)
m_context.getBundle().loadClass(m_bundleActivatorClass).newInstance();
m_tenantAwareBundleContext =
- new TenantAwareBundleContext(m_context, getTenantID(),
getTenantFilter());
+ new TenantAwareBundleContext(m_context, getTenantPID(),
getTenantFilter());
m_tenantBundleActivator.start(m_tenantAwareBundleContext);
}
catch (Exception e) {
- m_log.log(LogService.LOG_ERROR, "Could not start activator for
tenant " + getTenantID(), e);
+ m_log.log(LogService.LOG_ERROR, "Could not start activator for
tenant " + getTenantPID(), e);
}
}
@@ -71,7 +71,7 @@
*/
public void stop() {
m_log
- .log(LogService.LOG_DEBUG, "[" + getTenantID() + "] Stopping " +
getBundleHeader(Constants.BUNDLE_NAME));
+ .log(LogService.LOG_DEBUG, "[" + getTenantPID() + "] Stopping " +
getBundleHeader(Constants.BUNDLE_NAME));
try {
if (m_tenantBundleActivator != null) {
@@ -79,7 +79,7 @@
}
}
catch (Exception e) {
- m_log.log(LogService.LOG_ERROR, "Could not stop activator for
tenant " + getTenantID(), e);
+ m_log.log(LogService.LOG_ERROR, "Could not stop activator for
tenant " + getTenantPID(), e);
}
}
@@ -89,14 +89,14 @@
protected String getTenantFilter() {
return "(|(objectClass=org.amdatu.web.rest.jaxrs.JaxRsSpi)"
+ "(objectClass=org.osgi.service.log.LogService)("
- + PID_KEY + "=" + getTenantID() + "))";
+ + PID_KEY + "=" + getTenantPID() + "))";
}
/**
* @return
*/
- protected String getTenantID() {
- return m_tenant.getId();
+ protected String getTenantPID() {
+ return m_tenant.getPID();
}
/**
Modified:
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/tenant/factory/TenantService.java
==============================================================================
---
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/tenant/factory/TenantService.java
(original)
+++
trunk/amdatu-core/tenant-factory/src/main/java/org/amdatu/tenant/factory/TenantService.java
Tue Feb 7 18:03:23 2012
@@ -34,7 +34,7 @@
m_name = name;
}
- public String getId() {
+ public String getPID() {
return m_id;
}
@@ -64,10 +64,10 @@
if (getClass() != obj.getClass())
return false;
TenantService other = (TenantService) obj;
- if (getId() == null && other.getId() != null)
+ if (getPID() == null && other.getPID() != null)
return false;
- if (getId() != null && other.getId() == null)
+ if (getPID() != null && other.getPID() == null)
return false;
- return getId().equals(other.getId());
+ return getPID().equals(other.getPID());
}
}
Modified: trunk/amdatu-core/tenant/src/main/java/org/amdatu/tenant/Tenant.java
==============================================================================
--- trunk/amdatu-core/tenant/src/main/java/org/amdatu/tenant/Tenant.java
(original)
+++ trunk/amdatu-core/tenant/src/main/java/org/amdatu/tenant/Tenant.java
Tue Feb 7 18:03:23 2012
@@ -16,19 +16,23 @@
package org.amdatu.tenant;
/**
- * This interface represents a tenant. A tenant has an PID that unqiely
identifies it and an optional name.
+ * This interface represents a tenant. A tenant has an PID that uniquely
identifies it and an optional name.
*
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
public interface Tenant {
/**
- * The unique PID for this tenant.
+ * The mandatory unique PID for this tenant.
+ *
+ * @return a persistent identifier, never <code>null</code>.
*/
- String getId();
+ String getPID();
/**
- * The name for this tenant.
+ * The optional name for this tenant.
+ *
+ * @return a name describing the tenant, can be <code>null</code>.
*/
String getName();
}
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/DispatcherService.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/DispatcherService.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/DispatcherService.java
Tue Feb 7 18:03:23 2012
@@ -60,9 +60,9 @@
/**
* <code>HttpServletRequest</code> attribute key where tenant resolving
extenders
- * must store the <code>Tenant</code> ID.
+ * must store the <code>Tenant</code> PID.
*/
- String TENANTID_REQUESTCONTEXT_KEY = "org.amdatu.web.dispatcher.TENANTID";
+ String TENANTPID_REQUESTCONTEXT_KEY =
"org.amdatu.web.dispatcher.TENANTPID";
/**
* <code>HttpServletRequest</code> attribute key where tenant resolving
extenders
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/FilterHandlerRegistry.java
Tue Feb 7 18:03:23 2012
@@ -46,7 +46,7 @@
* TODO add eager filter matching and optimize
*/
public final class FilterHandlerRegistry extends AbstractHandlerRegistry {
- private static final String MAGIC_NOTENANT_ID = "";
+ private static final String MAGIC_NOTENANT_PID = "";
private final ReentrantReadWriteLock m_extenderFilterHandlersLock = new
ReentrantReadWriteLock();
private final ReentrantReadWriteLock m_filterHandlersLock = new
ReentrantReadWriteLock();
private final Map<ServiceReference, FilterHandler> m_filterHandlers = new
HashMap<ServiceReference, FilterHandler>();
@@ -205,14 +205,14 @@
}
public FilterHandler[] getFilterHandlers(HttpServletRequest
httpServletRequest) {
- String tenantId = (String)
httpServletRequest.getAttribute(DispatcherService.TENANTID_REQUESTCONTEXT_KEY);
- if (tenantId == null) {
- tenantId = MAGIC_NOTENANT_ID;
+ String tenantPID = (String)
httpServletRequest.getAttribute(DispatcherService.TENANTPID_REQUESTCONTEXT_KEY);
+ if (tenantPID == null) {
+ tenantPID = MAGIC_NOTENANT_PID;
}
m_filterHandlersLock.readLock().lock();
try {
- FilterHandler[] handlerArray =
m_tenantFilterHandlerArrays.get(tenantId);
+ FilterHandler[] handlerArray =
m_tenantFilterHandlerArrays.get(tenantPID);
if (handlerArray != null) {
return handlerArray;
}
@@ -224,16 +224,16 @@
m_filterHandlersLock.writeLock().lock();
try {
// retry
- FilterHandler[] handlerArray =
m_tenantFilterHandlerArrays.get(tenantId);
+ FilterHandler[] handlerArray =
m_tenantFilterHandlerArrays.get(tenantPID);
if (handlerArray != null) {
return handlerArray;
}
// build
- if (tenantId.equals(MAGIC_NOTENANT_ID)) {
+ if (tenantPID.equals(MAGIC_NOTENANT_PID)) {
List<FilterHandler> filterHandlers = new
LinkedList<FilterHandler>();
for (FilterHandler filterHandler : m_filterHandlers.values()) {
- if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_ID) {
+ if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_PID) {
filterHandlers.add(filterHandler);
}
}
@@ -242,7 +242,7 @@
else {
List<FilterHandler> filterHandlers = new
LinkedList<FilterHandler>();
for (FilterHandler filterHandler : m_filterHandlers.values()) {
- if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_ID ||
filterHandler.getTenantId().equals(tenantId)) {
+ if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_PID ||
filterHandler.getTenantId().equals(tenantPID)) {
filterHandlers.add(filterHandler);
}
}
@@ -250,7 +250,7 @@
}
Arrays.sort(handlerArray);
- m_tenantFilterHandlerArrays.put(tenantId, handlerArray);
+ m_tenantFilterHandlerArrays.put(tenantPID, handlerArray);
return handlerArray;
}
finally {
Modified:
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
==============================================================================
---
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
(original)
+++
trunk/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/handler/ServletHandlerRegistry.java
Tue Feb 7 18:03:23 2012
@@ -45,7 +45,7 @@
* TODO consider caching for getServletHandler
*/
public final class ServletHandlerRegistry extends AbstractHandlerRegistry {
- private static final String MAGIC_NOTENANT_ID = "";
+ private static final String MAGIC_NOTENANT_PID = "";
private final ReentrantReadWriteLock m_servletHandlersLock = new
ReentrantReadWriteLock();
private final Map<ServiceReference, ServletHandler> m_servletHandlers =
new HashMap<ServiceReference, ServletHandler>();
private final Map<String, ServletHandler[]> m_tenantServletHandlerArrays =
new HashMap<String, ServletHandler[]>();
@@ -222,14 +222,14 @@
}
public ServletHandler[] getServletHandlers(HttpServletRequest
httpServletRequest) {
- String tenantId = (String)
httpServletRequest.getAttribute(DispatcherService.TENANTID_REQUESTCONTEXT_KEY);
- if (tenantId == null) {
- tenantId = MAGIC_NOTENANT_ID;
+ String tenantPID = (String)
httpServletRequest.getAttribute(DispatcherService.TENANTPID_REQUESTCONTEXT_KEY);
+ if (tenantPID == null) {
+ tenantPID = MAGIC_NOTENANT_PID;
}
m_servletHandlersLock.readLock().lock();
try {
- ServletHandler[] handlerArray =
m_tenantServletHandlerArrays.get(tenantId);
+ ServletHandler[] handlerArray =
m_tenantServletHandlerArrays.get(tenantPID);
if (handlerArray != null) {
return handlerArray;
}
@@ -241,16 +241,16 @@
m_servletHandlersLock.writeLock().lock();
try {
// retry
- ServletHandler[] handlerArray =
m_tenantServletHandlerArrays.get(tenantId);
+ ServletHandler[] handlerArray =
m_tenantServletHandlerArrays.get(tenantPID);
if (handlerArray != null) {
return handlerArray;
}
// build
- if (tenantId.equals(MAGIC_NOTENANT_ID)) {
+ if (tenantPID.equals(MAGIC_NOTENANT_PID)) {
List<ServletHandler> filterHandlers = new
LinkedList<ServletHandler>();
for (ServletHandler filterHandler :
m_servletHandlers.values()) {
- if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_ID) {
+ if (filterHandler.getTenantId() == null ||
filterHandler.getTenantId() == MAGIC_NOTENANT_PID) {
filterHandlers.add(filterHandler);
}
}
@@ -259,14 +259,14 @@
else {
List<ServletHandler> filterHandlers = new
LinkedList<ServletHandler>();
for (ServletHandler servletHandler :
m_servletHandlers.values()) {
- if (servletHandler.getTenantId() == null ||
servletHandler.getTenantId() == MAGIC_NOTENANT_ID ||
servletHandler.getTenantId().equals(tenantId)) {
+ if (servletHandler.getTenantId() == null ||
servletHandler.getTenantId() == MAGIC_NOTENANT_PID ||
servletHandler.getTenantId().equals(tenantPID)) {
filterHandlers.add(servletHandler);
}
}
handlerArray = filterHandlers.toArray(new
ServletHandler[filterHandlers.size()]);
}
Arrays.sort(handlerArray);
- m_tenantServletHandlerArrays.put(tenantId, handlerArray);
+ m_tenantServletHandlerArrays.put(tenantPID, handlerArray);
return handlerArray;
}
finally {
Modified:
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/HostnameTenantResolverTest.java
==============================================================================
---
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/HostnameTenantResolverTest.java
(original)
+++
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/HostnameTenantResolverTest.java
Tue Feb 7 18:03:23 2012
@@ -138,7 +138,7 @@
executeRequest("http://localhost:"; + m_port + SERV_PATH);
Assert.assertTrue("Expected tenant to resolve at localhost",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
executeRequest("http://127.0.0.1:"; + m_port + SERV_PATH);
Assert.assertTrue("Expected tenant not to resolve at 127.0.0.1",
@@ -156,7 +156,7 @@
executeRequest("http://127.0.0.1:"; + m_port + SERV_PATH);
Assert.assertTrue("Expected tenant to resolve at 127.0.0.1",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
// remove tenant mapping
configuration.delete();
@@ -193,11 +193,11 @@
executeRequest("http://localhost:"; + m_port + SERV_PATH);
Assert.assertTrue("Expected tenant1 to resolve at localhost",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
executeRequest("http://127.0.0.1:"; + m_port + SERV_PATH);
Assert.assertTrue("Expected tenant1 to resolve at 127.0.0.1",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
// configure a tenant2 mapped to localhost
Properties properties2 = new Properties();
@@ -210,11 +210,11 @@
executeRequest("http://localhost:"; + m_port + SERV_PATH);
Assert.assertTrue("Expected tenant2 to resolve at localhost",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant2"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant2"));
executeRequest("http://127.0.0.1:"; + m_port + SERV_PATH);
Assert.assertTrue("Expected tenant1 to resolve at 127.0.0.1",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
// remove tenant mappings
configuration1.delete();
Modified:
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/ParameterTenantResolverTest.java
==============================================================================
---
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/ParameterTenantResolverTest.java
(original)
+++
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/ParameterTenantResolverTest.java
Tue Feb 7 18:03:23 2012
@@ -136,7 +136,7 @@
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant1");
Assert.assertTrue("Expected tenant1 to resolve",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant2");
Assert.assertTrue("Expected tenant2 not to resolve",
m_tenantResolverServlet.getLastTenant() == null);
@@ -151,11 +151,11 @@
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant1");
Assert.assertTrue("Expected tenant1 to resolve",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant2");
Assert.assertTrue("Expected tenant2 to resolve",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant2"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant2"));
// update tenant1
Dictionary/* <String, Object> */dict = configuration1.getProperties();
@@ -165,11 +165,11 @@
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant1");
Assert.assertTrue("Expected tenant1 to resolve",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant2");
Assert.assertTrue("Expected tenant2 to resolve",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant2"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant2"));
// remove tenant2
configuration2.delete();
@@ -177,7 +177,7 @@
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant1");
Assert.assertTrue("Expected tenant1 to resolve",
m_tenantResolverServlet.getLastTenant() != null
- &&
m_tenantResolverServlet.getLastTenant().getId().equals("tenant1"));
+ &&
m_tenantResolverServlet.getLastTenant().getPID().equals("tenant1"));
executeRequest("http://"; + SERV_HOST + ":" + m_port + SERV_PATH +
"?tenant=" + "tenant2");
Assert.assertTrue("Expected tenant2 not to resolved",
m_tenantResolverServlet.getLastTenant() == null);
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
Tue Feb 7 18:03:23 2012
@@ -63,7 +63,7 @@
Tenant tenant = m_registry.getTenant(serverName);
if (tenant != null) {
servletRequest.setAttribute(DispatcherService.TENANT_REQUESTCONTEXT_KEY,
tenant);
-
servletRequest.setAttribute(DispatcherService.TENANTID_REQUESTCONTEXT_KEY,
tenant.getId());
+
servletRequest.setAttribute(DispatcherService.TENANTPID_REQUESTCONTEXT_KEY,
tenant.getPID());
}
else {
// No INF/WARN/ERR cause there may be multiple resolvers in play
Modified:
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/TenantRegistry.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/TenantRegistry.java
(original)
+++
trunk/amdatu-web/tenantresolver-hostname/src/main/java/org/amdatu/web/tenantresolver/hostname/service/TenantRegistry.java
Tue Feb 7 18:03:23 2012
@@ -96,16 +96,16 @@
for (String hostname : hostnames) {
hostname = hostname.trim();
if ("".equals(hostname)) {
- m_logService.log(LogService.LOG_WARNING, "Tenant " +
tenant.getId()
+ m_logService.log(LogService.LOG_WARNING, "Tenant " +
tenant.getPID()
+ " specifies illegal hostname mapping to " + hostname);
continue;
}
Tenant oldTenant = m_hostNameToTenantMapping.put(hostname, tenant);
if (oldTenant != null) {
- m_logService.log(LogService.LOG_WARNING, "Tenant " +
tenant.getId()
+ m_logService.log(LogService.LOG_WARNING, "Tenant " +
tenant.getPID()
+ " overwrites hostname mapping for " + hostname + "
previously mapped to "
- + oldTenant.getId());
+ + oldTenant.getPID());
}
}
}
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
Tue Feb 7 18:03:23 2012
@@ -64,7 +64,7 @@
Tenant tenant = m_registry.getTenant(tenantId);
if (tenant != null) {
servletRequest.setAttribute(DispatcherService.TENANT_REQUESTCONTEXT_KEY,
tenant);
-
servletRequest.setAttribute(DispatcherService.TENANTID_REQUESTCONTEXT_KEY,
tenant.getId());
+
servletRequest.setAttribute(DispatcherService.TENANTPID_REQUESTCONTEXT_KEY,
tenant.getPID());
}
else {
// No INF/WARN/ERR cause there may be multiple resolvers in
play
Modified:
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/TenantRegistry.java
==============================================================================
---
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/TenantRegistry.java
(original)
+++
trunk/amdatu-web/tenantresolver-parameter/src/main/java/org/amdatu/web/tenantresolver/parameter/service/TenantRegistry.java
Tue Feb 7 18:03:23 2012
@@ -28,17 +28,17 @@
*/
public final class TenantRegistry {
- private final Map<String, Tenant> m_idToTenant = new
ConcurrentHashMap<String, Tenant>();
+ private final Map<String, Tenant> m_pidToTenant = new
ConcurrentHashMap<String, Tenant>();
- public Tenant getTenant(String tenantId) {
- return m_idToTenant.get(tenantId);
+ public Tenant getTenant(String tenantPID) {
+ return m_pidToTenant.get(tenantPID);
}
public void removeTenant(Tenant tenant) {
- m_idToTenant.remove(tenant.getId());
+ m_pidToTenant.remove(tenant.getPID());
}
public void addTenant(Tenant tenant) {
- m_idToTenant.put(tenant.getId(), tenant);
+ m_pidToTenant.put(tenant.getPID(), tenant);
}
}
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
